diff --git a/ESP32_AP-Flasher/data/www/main.css.gz b/ESP32_AP-Flasher/data/www/main.css.gz index b445e024..17429326 100644 Binary files a/ESP32_AP-Flasher/data/www/main.css.gz and b/ESP32_AP-Flasher/data/www/main.css.gz differ diff --git a/ESP32_AP-Flasher/data/www/main.js.gz b/ESP32_AP-Flasher/data/www/main.js.gz index 40a0ce77..12b381cc 100644 Binary files a/ESP32_AP-Flasher/data/www/main.js.gz and b/ESP32_AP-Flasher/data/www/main.js.gz differ diff --git a/ESP32_AP-Flasher/include/system.h b/ESP32_AP-Flasher/include/system.h index b5862413..47d7da6b 100644 --- a/ESP32_AP-Flasher/include/system.h +++ b/ESP32_AP-Flasher/include/system.h @@ -6,6 +6,7 @@ #define WAKEUP_REASON_NFC 3 #define WAKEUP_REASON_BUTTON1 4 #define WAKEUP_REASON_BUTTON2 5 +#define WAKEUP_REASON_BUTTON3 6 #define WAKEUP_REASON_FAILED_OTA_FW 0xE0 #define WAKEUP_REASON_FIRSTBOOT 0xFC #define WAKEUP_REASON_NETWORK_SCAN 0xFD diff --git a/ESP32_AP-Flasher/src/contentmanager.cpp b/ESP32_AP-Flasher/src/contentmanager.cpp index a5578ed5..1701ef3d 100644 --- a/ESP32_AP-Flasher/src/contentmanager.cpp +++ b/ESP32_AP-Flasher/src/contentmanager.cpp @@ -46,7 +46,7 @@ bool needRedraw(uint8_t contentMode, uint8_t wakeupReason) { // contentmode 26, timestamp - if ((wakeupReason == WAKEUP_REASON_BUTTON1 || wakeupReason == WAKEUP_REASON_BUTTON2) && contentMode == 26) return true; + if ((wakeupReason == WAKEUP_REASON_BUTTON1 || wakeupReason == WAKEUP_REASON_BUTTON2 || wakeupReason == WAKEUP_REASON_BUTTON3) && contentMode == 26) return true; return false; } @@ -2264,7 +2264,7 @@ int getJsonTemplateUrl(String &filename, String URL, time_t fetched, String MAC, http.addHeader("If-Modified-Since", formatHttpDate(fetched)); http.addHeader("X-ESL-MAC", MAC); http.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS); - http.setTimeout(5000); + http.setTimeout(20000); const int httpCode = http.GET(); if (httpCode == 200) { drawJsonStream(http.getStream(), filename, taginfo, imageParams); diff --git a/ESP32_AP-Flasher/wwwroot/main.js b/ESP32_AP-Flasher/wwwroot/main.js index dd200f7f..66471bcb 100644 --- a/ESP32_AP-Flasher/wwwroot/main.js +++ b/ESP32_AP-Flasher/wwwroot/main.js @@ -6,6 +6,7 @@ const WAKEUP_REASON_GPIO = 2; const WAKEUP_REASON_NFC = 3; const WAKEUP_REASON_BUTTON1 = 4; const WAKEUP_REASON_BUTTON2 = 5; +const WAKEUP_REASON_BUTTON3 = 6; const WAKEUP_REASON_FAILED_OTA_FW = 0xE0; const WAKEUP_REASON_FIRSTBOOT = 0xFC; const WAKEUP_REASON_NETWORK_SCAN = 0xFD; @@ -394,7 +395,9 @@ function processTags(tagArray) { $('#tag' + tagmac + ' .warningicon').style.display = 'none'; $('#tag' + tagmac).style.background = "#ffffff"; if (element.contentMode == 12 || element.nextcheckin == 3216153600) $('#tag' + tagmac).style.background = "#e4e4e0"; + switch (parseInt(element.wakeupReason)) { + case WAKEUP_REASON_TIMED: break; case WAKEUP_REASON_BOOT: @@ -414,6 +417,10 @@ function processTags(tagArray) { $('#tag' + tagmac + ' .nextcheckin').innerHTML = "Button 2 pressed" $('#tag' + tagmac).style.background = "#c8f1bb"; break; + case WAKEUP_REASON_BUTTON3: + $('#tag' + tagmac + ' .nextcheckin').innerHTML = "Button 3 pressed" + $('#tag' + tagmac).style.background = "#c8f1bb"; + break; case WAKEUP_REASON_NFC: $('#tag' + tagmac + ' .nextcheckin').innerHTML = "NFC wakeup" $('#tag' + tagmac).style.background = "#c8f1bb";