diff --git a/components/wifi-manager/CMakeLists.txt b/components/wifi-manager/CMakeLists.txt index b3cd1206..c5615014 100644 --- a/components/wifi-manager/CMakeLists.txt +++ b/components/wifi-manager/CMakeLists.txt @@ -2,7 +2,7 @@ idf_component_register(SRCS "dns_server.c" "http_server.c" "wifi_manager.c" INCLUDE_DIRS . REQUIRES esp_common PRIV_REQUIRES newlib freertos spi_flash nvs_flash mdns pthread wpa_supplicant cmd_system - EMBED_FILES style.css code.js index.html bootstrap.min.css.gz jquery.min.js.gz popper.min.js.gz bootstrap.min.js.gz battery-0.svg battery-1.svg battery-2.svg battery-3.svg battery-4.svg + EMBED_FILES style.css code.js index.html bootstrap.min.css.gz jquery.min.js.gz popper.min.js.gz bootstrap.min.js.gz battery0.svg battery1.svg battery2.svg battery3.svg battery4.svg ) diff --git a/components/wifi-manager/battery-0.svg b/components/wifi-manager/battery0.svg similarity index 100% rename from components/wifi-manager/battery-0.svg rename to components/wifi-manager/battery0.svg diff --git a/components/wifi-manager/battery-1.svg b/components/wifi-manager/battery1.svg similarity index 100% rename from components/wifi-manager/battery-1.svg rename to components/wifi-manager/battery1.svg diff --git a/components/wifi-manager/battery-2.svg b/components/wifi-manager/battery2.svg similarity index 100% rename from components/wifi-manager/battery-2.svg rename to components/wifi-manager/battery2.svg diff --git a/components/wifi-manager/battery-3.svg b/components/wifi-manager/battery3.svg similarity index 100% rename from components/wifi-manager/battery-3.svg rename to components/wifi-manager/battery3.svg diff --git a/components/wifi-manager/battery-4.svg b/components/wifi-manager/battery4.svg similarity index 100% rename from components/wifi-manager/battery-4.svg rename to components/wifi-manager/battery4.svg diff --git a/components/wifi-manager/code.js b/components/wifi-manager/code.js index b2617607..cb37d9e3 100644 --- a/components/wifi-manager/code.js +++ b/components/wifi-manager/code.js @@ -721,7 +721,7 @@ function checkStatus(){ } else { i = 4; } - $("#battery").html(''); + $("#battery").html(''); } } blockAjax = false; diff --git a/components/wifi-manager/component.mk b/components/wifi-manager/component.mk index ab0b7a49..52b44eed 100644 --- a/components/wifi-manager/component.mk +++ b/components/wifi-manager/component.mk @@ -6,7 +6,7 @@ # lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable, # please read the SDK documents if you need to do this. # -COMPONENT_EMBED_FILES := style.css code.js index.html bootstrap.min.css.gz jquery.min.js.gz popper.min.js.gz bootstrap.min.js.gz battery-0.svg battery-1.svg battery-2.svg battery-3.svg battery-4.svg +COMPONENT_EMBED_FILES := style.css code.js index.html bootstrap.min.css.gz jquery.min.js.gz popper.min.js.gz bootstrap.min.js.gz battery0.svg battery1.svg battery2.svg battery3.svg battery4.svg #CFLAGS += -D LOG_LOCAL_LEVEL=ESP_LOG_DEBUG CFLAGS += -D LOG_LOCAL_LEVEL=ESP_LOG_INFO \ diff --git a/components/wifi-manager/http_server.c b/components/wifi-manager/http_server.c index d9c50775..ab421aa2 100644 --- a/components/wifi-manager/http_server.c +++ b/components/wifi-manager/http_server.c @@ -77,16 +77,16 @@ extern const uint8_t code_js_start[] asm("_binary_code_js_start"); extern const uint8_t code_js_end[] asm("_binary_code_js_end"); extern const uint8_t index_html_start[] asm("_binary_index_html_start"); extern const uint8_t index_html_end[] asm("_binary_index_html_end"); -extern const uint8_t battery-0_svg_start[] asm("_binary_battery-0_svg_start"); -extern const uint8_t battery-0_svg_end[] asm("_binary_battery-0_svg_end"); -extern const uint8_t battery-1_svg_start[] asm("_binary_battery-1_svg_start"); -extern const uint8_t battery-1_svg_end[] asm("_binary_battery-1_svg_end"); -extern const uint8_t battery-2_svg_start[] asm("_binary_battery-2_svg_start"); -extern const uint8_t battery-2_svg_end[] asm("_binary_battery-2_svg_end"); -extern const uint8_t battery-3_svg_start[] asm("_binary_battery-3_svg_start"); -extern const uint8_t battery-3_svg_end[] asm("_binary_battery-3_svg_end"); -extern const uint8_t battery-4_svg_start[] asm("_binary_battery-4_svg_start"); -extern const uint8_t battery-4_svg_end[] asm("_binary_battery-4_svg_end"); +extern const uint8_t battery0_svg_start[] asm("_binary_battery0_svg_start"); +extern const uint8_t battery0_svg_end[] asm("_binary_battery0_svg_end"); +extern const uint8_t battery1_svg_start[] asm("_binary_battery1_svg_start"); +extern const uint8_t battery1_svg_end[] asm("_binary_battery1_svg_end"); +extern const uint8_t battery2_svg_start[] asm("_binary_battery2_svg_start"); +extern const uint8_t battery2_svg_end[] asm("_binary_battery2_svg_end"); +extern const uint8_t battery3_svg_start[] asm("_binary_battery3_svg_start"); +extern const uint8_t battery3_svg_end[] asm("_binary_battery3_svg_end"); +extern const uint8_t battery4_svg_start[] asm("_binary_battery4_svg_start"); +extern const uint8_t battery4_svg_end[] asm("_binary_battery4_svg_end"); /* const http headers stored in ROM */ @@ -404,25 +404,25 @@ void http_server_netconn_serve(struct netconn *conn) { else if(strstr(line, "GET /bootstrap.css ")) { http_server_send_resource_file(conn,bootstrap_css_gz_start, bootstrap_css_gz_end, "text/css", "gzip" ); } - else if(strstr(line, "GET /battery-0.svg ")) { + else if(strstr(line, "GET /battery0.svg ")) { netconn_write(conn, http_svg_hdr, sizeof(http_svg_hdr) - 1, NETCONN_NOCOPY); - netconn_write(conn, battery-0_svg_start, battery-0_svg_end - battery-0_svg_start, NETCONN_NOCOPY); + netconn_write(conn, battery0_svg_start, battery0_svg_end - battery0_svg_start, NETCONN_NOCOPY); } - else if(strstr(line, "GET /battery-1.svg ")) { + else if(strstr(line, "GET /battery1.svg ")) { netconn_write(conn, http_svg_hdr, sizeof(http_svg_hdr) - 1, NETCONN_NOCOPY); - netconn_write(conn, battery-1_svg_start, battery-1_svg_end - battery-1_svg_start, NETCONN_NOCOPY); + netconn_write(conn, battery1_svg_start, battery1_svg_end - battery1_svg_start, NETCONN_NOCOPY); } - else if(strstr(line, "GET /battery-2.svg ")) { + else if(strstr(line, "GET /battery2.svg ")) { netconn_write(conn, http_svg_hdr, sizeof(http_svg_hdr) - 1, NETCONN_NOCOPY); - netconn_write(conn, battery-2_svg_start, battery-2_svg_end - battery-2_svg_start, NETCONN_NOCOPY); + netconn_write(conn, battery2_svg_start, battery2_svg_end - battery2_svg_start, NETCONN_NOCOPY); } - else if(strstr(line, "GET /battery-3.svg ")) { + else if(strstr(line, "GET /battery3.svg ")) { netconn_write(conn, http_svg_hdr, sizeof(http_svg_hdr) - 1, NETCONN_NOCOPY); - netconn_write(conn, battery-3_svg_start, battery-3_svg_end - battery-3_svg_start, NETCONN_NOCOPY); + netconn_write(conn, battery3_svg_start, battery3_svg_end - battery3_svg_start, NETCONN_NOCOPY); } - else if(strstr(line, "GET /battery-4.svg ")) { + else if(strstr(line, "GET /battery4.svg ")) { netconn_write(conn, http_svg_hdr, sizeof(http_svg_hdr) - 1, NETCONN_NOCOPY); - netconn_write(conn, battery-4_svg_start, battery-4_svg_end - battery-4_svg_start, NETCONN_NOCOPY); + netconn_write(conn, battery4_svg_start, battery4_svg_end - battery4_svg_start, NETCONN_NOCOPY); } //dynamic stuff