From f3fe029705647e9bbcfcb76b56c97a6affb7b8cf Mon Sep 17 00:00:00 2001 From: Thorsten von Eicken Date: Mon, 18 May 2015 23:57:28 -0700 Subject: [PATCH] wifi improvements --- espfs/espfs.c | 12 ++--- html/wifi/connecting.html | 2 +- html/wifi/wifi.tpl | 5 +- httpd/httpd.c | 28 +++++----- serial/uart.h | 2 + user/cgiflash.c | 4 +- user/cgiwifi.c | 106 ++++++++++++++++++++++++++------------ user/cgiwifi.h | 3 +- user/console.c | 2 + user/status.c | 42 +++++++++++++-- user/user_main.c | 3 +- wiflash | 4 +- 12 files changed, 149 insertions(+), 64 deletions(-) diff --git a/espfs/espfs.c b/espfs/espfs.c index b14a589..82ba88f 100644 --- a/espfs/espfs.c +++ b/espfs/espfs.c @@ -7,9 +7,9 @@ It's written for use with httpd, but doesn't need to be used as such. /* * ---------------------------------------------------------------------------- * "THE BEER-WARE LICENSE" (Revision 42): - * Jeroen Domburg wrote this file. As long as you retain - * this notice you can do whatever you want with this stuff. If we meet some day, - * and you think this stuff is worth it, you can buy me a beer in return. + * Jeroen Domburg wrote this file. As long as you retain + * this notice you can do whatever you want with this stuff. If we meet some day, + * and you think this stuff is worth it, you can buy me a beer in return. * ---------------------------------------------------------------------------- */ @@ -151,9 +151,9 @@ EspFsFile ICACHE_FLASH_ATTR *espFsOpen(char *fileName) { return NULL; } //Grab the name of the file. - p+=sizeof(EspFsHeader); + p+=sizeof(EspFsHeader); os_memcpy(namebuf, p, sizeof(namebuf)); -// os_printf("Found file '%s'. Namelen=%x fileLenComp=%x, compr=%d flags=%d\n", +// os_printf("Found file '%s'. Namelen=%x fileLenComp=%x, compr=%d flags=%d\n", // namebuf, (unsigned int)h.nameLen, (unsigned int)h.fileLenComp, h.compression, h.flags); if (os_strcmp(namebuf, fileName)==0) { //Yay, this is the file we need! @@ -176,7 +176,7 @@ EspFsFile ICACHE_FLASH_ATTR *espFsOpen(char *fileName) { //Decoder params are stored in 1st byte. memcpyAligned(&parm, r->posComp, 1); r->posComp++; - os_printf("Heatshrink compressed file; decode parms = %x\n", parm); + //os_printf("Heatshrink compressed file; decode parms = %x\n", parm); dec=heatshrink_decoder_alloc(16, (parm>>4)&0xf, parm&0xf); r->decompData=dec; #endif diff --git a/html/wifi/connecting.html b/html/wifi/connecting.html index 47190d6..230b26f 100644 --- a/html/wifi/connecting.html +++ b/html/wifi/connecting.html @@ -1,5 +1,5 @@ Connecting... - ESP Link - +