starred/OpenEPaperLink
1
0
Fork 0
mirror of https://github.com/OpenEPaperLink/OpenEPaperLink.git synced 2026-03-21 04:06:29 +01:00
Code Issues 708 Packages Projects Releases 10 Wiki Activity

Button 3 (#473)

Browse Source
This commit is contained in:
Vstudio LAB
2025-06-14 09:38:03 +02:00
committed by GitHub
parent f048cfb296
commit a143b49492
5 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
ESP32_AP-Flasher/data/www/main.css.gz
View File

Binary file not shown.

BIN
ESP32_AP-Flasher/data/www/main.js.gz
View File

Binary file not shown.

1
ESP32_AP-Flasher/include/system.h
View File

@@ -6,6 +6,7 @@
#define WAKEUP_REASON_NFC 3 #define WAKEUP_REASON_NFC 3
#define WAKEUP_REASON_BUTTON1 4 #define WAKEUP_REASON_BUTTON1 4
#define WAKEUP_REASON_BUTTON2 5 #define WAKEUP_REASON_BUTTON2 5
#define WAKEUP_REASON_BUTTON3 6
#define WAKEUP_REASON_FAILED_OTA_FW 0xE0 #define WAKEUP_REASON_FAILED_OTA_FW 0xE0
#define WAKEUP_REASON_FIRSTBOOT 0xFC #define WAKEUP_REASON_FIRSTBOOT 0xFC
#define WAKEUP_REASON_NETWORK_SCAN 0xFD #define WAKEUP_REASON_NETWORK_SCAN 0xFD

4
ESP32_AP-Flasher/src/contentmanager.cpp
View File

@@ -46,7 +46,7 @@
bool needRedraw(uint8_t contentMode, uint8_t wakeupReason) { bool needRedraw(uint8_t contentMode, uint8_t wakeupReason) {
// contentmode 26, timestamp // 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; 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("If-Modified-Since", formatHttpDate(fetched));
http.addHeader("X-ESL-MAC", MAC); http.addHeader("X-ESL-MAC", MAC);
http.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS); http.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
http.setTimeout(5000); http.setTimeout(20000);
const int httpCode = http.GET(); const int httpCode = http.GET();
if (httpCode == 200) { if (httpCode == 200) {
drawJsonStream(http.getStream(), filename, taginfo, imageParams); drawJsonStream(http.getStream(), filename, taginfo, imageParams);

7
ESP32_AP-Flasher/wwwroot/main.js
View File

@@ -6,6 +6,7 @@ const WAKEUP_REASON_GPIO = 2;
const WAKEUP_REASON_NFC = 3; const WAKEUP_REASON_NFC = 3;
const WAKEUP_REASON_BUTTON1 = 4; const WAKEUP_REASON_BUTTON1 = 4;
const WAKEUP_REASON_BUTTON2 = 5; const WAKEUP_REASON_BUTTON2 = 5;
const WAKEUP_REASON_BUTTON3 = 6;
const WAKEUP_REASON_FAILED_OTA_FW = 0xE0; const WAKEUP_REASON_FAILED_OTA_FW = 0xE0;
const WAKEUP_REASON_FIRSTBOOT = 0xFC; const WAKEUP_REASON_FIRSTBOOT = 0xFC;
const WAKEUP_REASON_NETWORK_SCAN = 0xFD; const WAKEUP_REASON_NETWORK_SCAN = 0xFD;
@@ -394,7 +395,9 @@ function processTags(tagArray) {
$('#tag' + tagmac + ' .warningicon').style.display = 'none'; $('#tag' + tagmac + ' .warningicon').style.display = 'none';
$('#tag' + tagmac).style.background = "#ffffff"; $('#tag' + tagmac).style.background = "#ffffff";
if (element.contentMode == 12 || element.nextcheckin == 3216153600) $('#tag' + tagmac).style.background = "#e4e4e0"; if (element.contentMode == 12 || element.nextcheckin == 3216153600) $('#tag' + tagmac).style.background = "#e4e4e0";
switch (parseInt(element.wakeupReason)) { switch (parseInt(element.wakeupReason)) {
case WAKEUP_REASON_TIMED: case WAKEUP_REASON_TIMED:
break; break;
case WAKEUP_REASON_BOOT: case WAKEUP_REASON_BOOT:
@@ -414,6 +417,10 @@ function processTags(tagArray) {
$('#tag' + tagmac + ' .nextcheckin').innerHTML = "Button 2 pressed" $('#tag' + tagmac + ' .nextcheckin').innerHTML = "Button 2 pressed"
$('#tag' + tagmac).style.background = "#c8f1bb"; $('#tag' + tagmac).style.background = "#c8f1bb";
break; break;
case WAKEUP_REASON_BUTTON3:
$('#tag' + tagmac + ' .nextcheckin').innerHTML = "Button 3 pressed"
$('#tag' + tagmac).style.background = "#c8f1bb";
break;
case WAKEUP_REASON_NFC: case WAKEUP_REASON_NFC:
$('#tag' + tagmac + ' .nextcheckin').innerHTML = "NFC wakeup" $('#tag' + tagmac + ' .nextcheckin').innerHTML = "NFC wakeup"
$('#tag' + tagmac).style.background = "#c8f1bb"; $('#tag' + tagmac).style.background = "#c8f1bb";