v1.5, limit 4-press AP-reset to once per powercycle

VonSzarvas · Oct 24, 2022 · 1a5cf60 · 1a5cf60
1 parent 325298a
commit 1a5cf60
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 3 deletions.
diff --git a/libesphttpd/espfs/mkespfsimage/heatshrink_encoder.o b/libesphttpd/espfs/mkespfsimage/heatshrink_encoder.o
diff --git a/libesphttpd/espfs/mkespfsimage/main.o b/libesphttpd/espfs/mkespfsimage/main.o
diff --git a/libesphttpd/espfs/mkespfsimage/mkespfsimage b/libesphttpd/espfs/mkespfsimage/mkespfsimage
diff --git a/libesphttpd/libesphttpd.a b/libesphttpd/libesphttpd.a
diff --git a/libesphttpd/libwebpages-espfs.a b/libesphttpd/libwebpages-espfs.a
diff --git a/libesphttpd/webpages.espfs b/libesphttpd/webpages.espfs
diff --git a/parallax/cgiprop.c b/parallax/cgiprop.c
@@ -41,6 +41,7 @@ void ICACHE_FLASH_ATTR httpdSendResponse(HttpdConnData *connData, int code, char
 static ETSTimer resetButtonTimer;
 static int resetButtonState;
 static int resetButtonCount;
+static int resetFourPressFired;
 
 static void wifiLoadCompletionCB(PropellerConnection *connection, LoadStatus status);
 static void loadCompletionCB(PropellerConnection *connection, LoadStatus status);
@@ -813,9 +814,24 @@ static void ICACHE_FLASH_ATTR resetButtonTimerCallback(void *data)
 
 
                     else if (++buttonPressCount == RESET_BUTTON_PRESS_COUNT) {
-                        os_printf("Entering STA+AP mode\n");
-                        wifi_set_opmode(STATIONAP_MODE);
-                        buttonPressCount = 0;
+
+                        // - Update 2022.Oct.24.
+                        // - Only allow Reset Button recovery once after each power-cycle
+                        // - Note: Could disarm the timer after first call, but for customer remote debugging add a debuglog
+                        // -   message to represent if multiple attempts being made, and only disarm after the 2nd attempt.
+
+                        if (resetFourPressFired == 0) {
+                            os_printf("Entering STA+AP mode\n");
+                            wifi_set_opmode(STATIONAP_MODE);
+                            resetFourPressFired = 1;
+                            buttonPressCount = 0;
+
+                        } else {
+                            os_printf("Ignore 4-press recovery request. Powercycle required.\n");
+                            os_timer_disarm(&resetButtonTimer);
+                            buttonPressCount = 0;
+                        }
+
                     }