diff --git a/BOARDS.md b/BOARDS.md index b98f831..3d01799 100644 --- a/BOARDS.md +++ b/BOARDS.md @@ -1,4 +1,4 @@ -Boards with ESP-Link +Boards with esp-link ==================== This readme provides instructions for PCBs that I've made that are designed for esp-link. diff --git a/Makefile b/Makefile index 27fd4cd..1b2820b 100644 --- a/Makefile +++ b/Makefile @@ -189,7 +189,7 @@ $1/%.o: %.c $(Q) $(CC) $(INCDIR) $(MODULE_INCDIR) $(EXTRA_INCDIR) $(SDK_INCDIR) $(CFLAGS) -c $$< -o $$@ endef -.PHONY: all checkdirs clean webpages.espfs +.PHONY: all checkdirs clean webpages.espfs wiflash all: echo_version checkdirs $(FW_BASE) firmware/user1.bin firmware/user2.bin @@ -199,7 +199,8 @@ echo_version: $(TARGET_OUT): $(APP_AR) $(LD_SCRIPT) $(vecho) "LD $@" $(Q) $(LD) -L$(SDK_LIBDIR) -T$(LD_SCRIPT) $(LDFLAGS) -Wl,--start-group $(LIBS) $(APP_AR) -Wl,--end-group -o $@ - $(OBJDP) -x $(TARGET_OUT) | egrep '(espfs_img)' + @echo Dump: $(OBJDP) -x $(TARGET_OUT) +# $(OBJDP) -x $(TARGET_OUT) | egrep '(espfs_img)' $(USER1_OUT): $(APP_AR) $(LD_SCRIPT1) $(vecho) "LD $@" @@ -269,6 +270,7 @@ ifeq ("$(COMPRESS_W_YUI)","yes") $(Q) cd html_compressed; find | ../espfs/mkespfsimage/mkespfsimage > ../build/espfs.img; cd ..; else $(Q) cd html; find . \! -name \*- | ../espfs/mkespfsimage/mkespfsimage > ../build/espfs.img; cd .. + $(Q) ls -sl build/espfs.img endif $(Q) cd build; $(OBJCP) -I binary -O elf32-xtensa-le -B xtensa --rename-section .data=.espfs \ espfs.img espfs_img.o; cd .. diff --git a/espfs/mkespfsimage/main.c b/espfs/mkespfsimage/main.c index 64187ff..7c2d958 100644 --- a/espfs/mkespfsimage/main.c +++ b/espfs/mkespfsimage/main.c @@ -20,7 +20,7 @@ //Gzip #ifdef ESPFS_GZIP -// If compiler complains about missing header, try running "sudo apt-get install zlib1g-dev" +// If compiler complains about missing header, try running "sudo apt-get install zlib1g-dev" // to install missing package. #include #endif @@ -229,7 +229,7 @@ int handleFile(int f, char *name, int compression, int level, char **compName) { h.nameLen=htoxs(h.nameLen); h.fileLenComp=htoxl(csize); h.fileLenDecomp=htoxl(size); - + write(1, &h, sizeof(EspFsHeader)); write(1, name, nameLen); while (nameLen&3) { @@ -309,7 +309,7 @@ int main(int argc, char **argv) { #ifdef ESPFS_GZIP if (gzipExtensions == NULL) { - parseGzipExtensions(strdup("html,css,js")); + parseGzipExtensions(strdup("html,css,js,ico")); } #endif diff --git a/html/console.tpl b/html/console.tpl index e45bb63..395b6d1 100644 --- a/html/console.tpl +++ b/html/console.tpl @@ -1,6 +1,6 @@
-

esp link - Microcontroller Console

+

Microcontroller Console

diff --git a/html/head.tpl b/html/head.tpl index 17de31f..f7ceaf9 100644 --- a/html/head.tpl +++ b/html/head.tpl @@ -1,6 +1,6 @@ - ESP Link + esp-link @@ -18,7 +18,8 @@ diff --git a/html/help.tpl b/html/help.tpl deleted file mode 100644 index e022025..0000000 --- a/html/help.tpl +++ /dev/null @@ -1,17 +0,0 @@ -
-
-

esp link - Help

-
- -
- -

Please refer to -the online README -for up-to-date help.

- -
-
-
- - - diff --git a/html/home.tpl b/html/home.tpl index 73bb10a..e9c1e22 100644 --- a/html/home.tpl +++ b/html/home.tpl @@ -1,15 +1,28 @@
-

esp link

+
+

esp-link

-

The ESP Link bridges the ESP8266 serial port to Wifi and it can +

The JeeLabs esp-link firmware bridges the ESP8266 serial port to Wifi and can program microcontrollers over the serial port, in particular Arduinos, AVRs, and - NXP's LPC800-series ARM processors.

+ NXP's LPC800 and other ARM processors.

+

Program an Arduino/AVR using avrdude using a command + line similar to: +

/home/arduino-1.0.5/hardware/tools/avrdude \
+   -DV -patmega328p -Pnet:esp-link.local:23 -carduino -b115200 -U \
+   -C /home/arduino-1.0.5/hardware/tools/avrdude.conf flash:w:my_sketch.hex:i +
+ where -Pnet:esp-link.local:23 tells avrdude to connect to port 23 of esp-link. + You can substitute the IP address of your esp-link for esp-link.local if necessary.

+

Please refer to + the online README + for up-to-date help and to the forthcoming + JeeLabs blog for an intro to the codebase.

diff --git a/html/jl-200x55.png b/html/jl-200x55.png new file mode 100755 index 0000000..3bc4a42 Binary files /dev/null and b/html/jl-200x55.png differ diff --git a/html/jl-400x110.png- b/html/jl-400x110.png- new file mode 100755 index 0000000..92d2d9e Binary files /dev/null and b/html/jl-400x110.png- differ diff --git a/html/log.tpl b/html/log.tpl index 3003168..70e5f2b 100644 --- a/html/log.tpl +++ b/html/log.tpl @@ -1,6 +1,6 @@
-

esp link - Debug Log

+

Debug Log

diff --git a/html/style.css b/html/style.css index 78efb8c..034d2c3 100644 --- a/html/style.css +++ b/html/style.css @@ -6,6 +6,12 @@ html, button, input, select, textarea, .pure-g [class *= "pure-u"] { body { color: #777; } +a:visited, a:link { + color: #009; +} +a:hover { + color: #00c; +} .card { background-color: #eee; @@ -74,6 +80,16 @@ fieldset fields { left: 150px; } +div.tt { + font-family: monospace; + font-size: 120%; + color: #390; + background-color: #ddd; + padding: 2px; + margin: 2px 0; + line-height: 100%; +} + /* The content `
` */ .content { margin: 0 auto; @@ -133,59 +149,57 @@ pre.console a { display: inline-block; } -/* The `#menu` `
` is the parent `
` that contains the `.pure-menu` that - * appears on the left side of the page */ #menu { - margin-left: -150px; /* "#menu" width */ + margin-left: -150px; width: 150px; position: fixed; top: 0; left: 0; bottom: 0; - z-index: 1000; /* so the menu or its navicon stays above all content */ + z-index: 1000; background: #191818; overflow-y: auto; -webkit-overflow-scrolling: touch; } -/* All anchors inside the menu should be styled like this */ #menu a { color: #999; border: none; padding: 0.6em 0 0.6em 0.6em; } -/* Remove all background/borders, since we are applying them to #menu */ #menu .pure-menu, #menu .pure-menu ul { border: none; background: transparent; } -/* Add that light border to separate items into groups */ #menu .pure-menu ul, #menu .pure-menu .menu-item-divided { border-top: 1px solid #333; } -/* Change color of the anchor links on hover/focus */ #menu .pure-menu li a:hover, #menu .pure-menu li a:focus { background: #333; } -/* This styles the selected menu item `
  • ` */ #menu .pure-menu-selected, #menu .pure-menu-heading { - background: #c60; + background: #9d1414; } -/* This styles a link within a selected menu item `
  • ` */ #menu .pure-menu-selected a { color: #fff; } -/* This styles the menu heading */ #menu .pure-menu-heading { font-size: 110%; color: #fff; margin: 0; + text-transform: none; +} + +#menu .pure-menu-heading img { + vertical-align: middle; + top: -1px; + position: relative; } #menu .pure-menu-item { @@ -194,15 +208,14 @@ pre.console a { /* -- Dynamic Button For Responsive Menu -------------------------------------*/ -/* `.menu-link` represents the responsive menu toggle that shows/hides on small screens */ .menu-link { position: fixed; - display: block; /* show this only on small screens */ + display: block; top: 0; - left: 0; /* "#menu width" */ + left: 0; background: #000; background: rgba(0,0,0,0.7); - font-size: 10px; /* change this value to increase/decrease button size */ + font-size: 10px; z-index: 10; width: 2em; height: auto; @@ -236,7 +249,6 @@ pre.console a { /* -- Responsive Styles (Media Queries) ------------------------------------- */ -/* Hides the menu at `48em`, but modify this based on your app's needs */ @media (min-width: 48em) { .header, .content { padding-left: 2em; @@ -244,7 +256,7 @@ pre.console a { } #layout { - padding-left: 150px; /* left col width "#menu" */ + padding-left: 150px; left: 0; } #menu { @@ -263,12 +275,6 @@ pre.console a { } @media (max-width: 48em) { - /* Only apply this when the window is small. Otherwise, the following - case results in extra padding on the left: - * Make the window small. - * Tap the menu to trigger the active state. - * Make the window large again. - */ #layout.active { position: relative; left: 150px; diff --git a/html/wifi/wifi.tpl b/html/wifi/wifi.tpl index 946c59d..a83ad3f 100644 --- a/html/wifi/wifi.tpl +++ b/html/wifi/wifi.tpl @@ -1,6 +1,6 @@
    -

    esp link - Wifi Configuration

    +

    Wifi Configuration

    @@ -147,7 +147,7 @@ function getStatus() { showWifiInfo(data); blockScan = 0; - var txt2 = "ESP Link will switch to STA-only mode in a few seconds"; + var txt2 = "esp-link will switch to STA-only mode in a few seconds"; window.setTimeout(function() { showNotification(txt2); }, 4000); $("#reconnect").removeAttribute("hidden"); diff --git a/user/cgi.c b/user/cgi.c index ec55dfe..35e0080 100644 --- a/user/cgi.c +++ b/user/cgi.c @@ -54,8 +54,7 @@ void ICACHE_FLASH_ATTR printGlobalJSON(HttpdConnData *connData) { httpdSend(connData, "