wip: huzzah tweaks n map files

Author: tyeth

examples/Wippersnapper_demo/Wippersnapper_demo.ino

@@ -12,6 +12,7 @@
 // Brent Rubell for Adafruit Industries, 2021-2022
 //
 // All text above must be included in any redistribution.
+#include <GDBStub.h> // Include GDB Stub for debugging esp8266
 
 #include "Wippersnapper_Networking.h"
 Wippersnapper_WiFi wipper;
@@ -20,13 +21,25 @@ Wippersnapper_WiFi wipper;
 #define WS_DEBUG
 
 void setup() {
+  pinMode(LED_BUILTIN, OUTPUT);
+  digitalWrite(LED_BUILTIN, HIGH);  // Turn off the built-in LED
+  delay(500);
+  digitalWrite(LED_BUILTIN, LOW);   // Turn on the built-in LED
   // Provisioning must occur prior to serial init.
   wipper.provision();
-
+  digitalWrite(LED_BUILTIN, LOW);   // Turn on the built-in LED
   Serial.begin(115200);
-  //while (!Serial) delay(10);
+  digitalWrite(LED_BUILTIN, HIGH);  // Turn off the built-in LED
+  delay(1000);
+  digitalWrite(LED_BUILTIN, LOW);   // Turn on the built-in LED
+  WS_DEBUG_PRINTLN("WipperSnapper Demo Starting...");
+  delay(500);
+  digitalWrite(LED_BUILTIN, HIGH);  // Turn off the built-in LED
+  // while (!Serial) delay(10);
+  gdbstub_init();
 
   wipper.connect();
+  digitalWrite(LED_BUILTIN, LOW);   // Turn on the built-in LED
 
 }
 

output.map

@@ -6,7 +6,7 @@
 ; PlatformIO Defaults
 [platformio]
 description = "Adafruit.IO WipperSnapper Firmware"
-default_envs = adafruit_feather_esp32s3_tft, adafruit_magtag29_esp32s2, adafruit_feather_esp32s3, featheresp32s2, adafruit_feather_esp32s2_reversetft, adafruit_metro_esp32s2, adafruit_qtpy_esp32s2, adafruit_feather_esp32s3_reversetft, adafruit_feather_esp32s3_nopsram, adafruit_feather_esp32s2_tft, adafruit_qtpy_esp32, adafruit_qtpy_esp32c3, featheresp32, adafruit_qtpy_esp32s3_nopsram, featheresp32v2, huzzah, adafruit_pyportal_m4, adafruit_pyportal_m4_titano, dfrobot_beetle_esp32c3
+default_envs = adafruit_feather_esp32s3_tft, adafruit_magtag29_esp32s2, adafruit_feather_esp32s3, featheresp32s2, adafruit_feather_esp32s2_reversetft, adafruit_metro_esp32s2, adafruit_qtpy_esp32s2, adafruit_feather_esp32s3_reversetft, adafruit_feather_esp32s3_nopsram, adafruit_feather_esp32s2_tft, adafruit_qtpy_esp32, adafruit_qtpy_esp32c3, featheresp32, adafruit_qtpy_esp32s3_nopsram, featheresp32v2, huzzah_esp8266, adafruit_pyportal_m4, adafruit_pyportal_m4_titano, dfrobot_beetle_esp32c3
 
 
 ; Common Build Environment
@@ -490,29 +490,61 @@ extra_scripts = pre:rename_usb_config.py
 ; ESP8266 Boards
 
 ; Adafruit Feather HUZZAH ESP8266
-[env:huzzah]
+[env:huzzah_esp8266]
 extends=common:esp8266
 board = huzzah
 board_build.f_cpu = 80000000L
 ; Arduino CLI uses this from adafruit_ci#ci-wippersnapper
 ; esp8266:esp8266:huzzah:xtal=80,vt=flash,exception=disabled,stacksmash=disabled,ssl=all,mmu=3232,non32xfer=fast,eesz=4M2M,ip=lm2f,dbg=Disabled,lvl=None____,wipe=none,baud=115200
 build_flags =
     -Wl,--gc-sections
-    -Wl,-Map=output.map
+    -Wl,-Map=output_8266.map
+    -DARDUINO_ESP8266_ADAFRUIT_HUZZAH
+    ; -DDEBUG_ESP_PORT=None
+    -DVTABLES_IN_FLASH
+    -DNO_EXCEPTIONS
+    -DNO_STACK_SMASH_PROTECTION
+    -DSSL_BASIC
+    ; -DSSL_ALL
+    -DMMU_4816
+    -DNON32XFER_FAST
+    -DDEBUG_DISABLED
+    -DDEBUG_LEVEL_NONE
+    -DNDEBUG
+    -DPIO_FRAMEWORK_ARDUINO_MMU_CACHE16_IRAM48 ; avoid section `.text1' will not fit in region `iram1_0_seg'
+board_build.eesz=4M2M
+board_build.filesystem = littlefs
+upload_port = COM29
+monitor_filters = esp8266_exception_decoder
+
+
+; Adafruit Feather HUZZAH ESP8266 Debug
+[env:huzzah_esp8266_debug]
+extends=common:esp8266
+board = huzzah
+board_build.f_cpu = 80000000L
+build_type = debug
+; Arduino CLI uses this from adafruit_ci#ci-wippersnapper
+; esp8266:esp8266:huzzah:xtal=80,vt=flash,exception=disabled,stacksmash=disabled,ssl=all,mmu=4816,non32xfer=fast,eesz=4M2M,ip=lm2f,dbg=Disabled,lvl=None____,wipe=none,baud=115200
+build_flags =
+    -Wl,--gc-sections
+    -Wl,-Map=output_8266_debug.map
     -DARDUINO_ESP8266_ADAFRUIT_HUZZAH
     -DDEBUG_ESP_PORT=Serial
     -DVTABLES_IN_FLASH
     -DNO_EXCEPTIONS
     -DNO_STACK_SMASH_PROTECTION
     -DSSL_ALL
-    -DMMU_3232
+    -DMMU_4816
     -DNON32XFER_FAST
-    -DDEBUG_DISABLED
+    -DDEBUG_ENABLED
     -DDEBUG_LEVEL_NONE
     -DPIO_FRAMEWORK_ARDUINO_MMU_CACHE16_IRAM48 ; avoid section `.text1' will not fit in region `iram1_0_seg'
 board_build.eesz=4M2M
 board_build.filesystem = littlefs
-upload_port = COM19
+upload_port = COM29
+monitor_filters = esp8266_exception_decoder
+
 
 ; SAMD51 Boards ;
 

output_8266.map

@@ -113,6 +113,11 @@ void Wippersnapper::provision() {
   _fileSystem->parseSecrets();
 #elif defined(USE_LITTLEFS)
   _littleFS->parseSecrets();
+
+  // ESP8266 stability: ensure LittleFS is fully unmounted and not referenced
+  // during WiFi/MQTT connect (flash operations can interfere with WiFi).
+  delete _littleFS;
+  _littleFS = NULL;
 #else
   set_user_key(); // non-fs-backed, sets global credentials within network iface
 #endif
@@ -2338,17 +2343,17 @@ bool Wippersnapper::generateWSTopics() {
              WS._config.aio_user, _device_uid, TOPIC_SIGNALS, TOPIC_DISPLAY);
   } else {
     WS_DEBUG_PRINTLN(
-        "FATAL ERROR: Failed to allocate memory for DISPLAY topic!");
+        "FATAL ERROR: Failed to allocate memory for b2d DISPLAY topic!");
     return false;
   }
 
   // Subscribe to signal's DISPLAY sub-topic and set callback
   _topic_signal_display_sub =
       new Adafruit_MQTT_Subscribe(WS._mqtt, WS._topic_signal_display_brkr, 1);
-  WS_DEBUG_PRINTLN("Subscribing to DISPLAY topic: ");
+  WS_DEBUG_PRINTLN("Subscribing to b2d DISPLAY topic: ");
   WS_DEBUG_PRINTLN(WS._topic_signal_display_brkr);
   WS._mqtt->subscribe(_topic_signal_display_sub);
-  WS_DEBUG_PRINTLN("Subscribed to DISPLAY topic!");
+  WS_DEBUG_PRINTLN("Subscribed to b2d DISPLAY topic!");
   _topic_signal_display_sub->setCallback(cbDisplayMessage);
 
   // Calculate length of the topic for device-to-broker DISPLAY topic
@@ -2370,7 +2375,7 @@ bool Wippersnapper::generateWSTopics() {
              TOPIC_SIGNALS, TOPIC_DISPLAY);
   } else {
     WS_DEBUG_PRINTLN(
-        "FATAL ERROR: Failed to allocate memory for DISPLAY topic!");
+        "FATAL ERROR: Failed to allocate memory for d2b DISPLAY topic!");
     return false;
   }
 
@@ -2553,6 +2558,11 @@ void Wippersnapper::haltError(String error, ws_led_status_t ledStatusColor,
       WS.feedWDT(); // feed the WDT for the first X-5 seconds
     } else if (i == seconds_until_reboot) {
       WS.enableWDT(wdt_timeout_ms);
+#ifdef ARDUINO_ARCH_ESP8266
+      // On ESP8266, explicitly restart as well. In some configurations the WDT
+      // may not reliably trigger if other system timers keep feeding it.
+      ESP.restart();
+#endif
     }
   }
 }
@@ -2771,6 +2781,15 @@ void printDeviceInfo() {
           WS._macAddr[2], WS._macAddr[3], WS._macAddr[4], WS._macAddr[5]);
   WS_DEBUG_PRINT("MAC Address: ");
   WS_DEBUG_PRINTLN(sMAC);
+
+#ifdef ARDUINO_ARCH_ESP8266
+  WS_DEBUG_PRINT("Free heap: ");
+  WS_DEBUG_PRINTLN(ESP.getFreeHeap());
+  WS_DEBUG_PRINT("Max free block: ");
+  WS_DEBUG_PRINTLN(ESP.getMaxFreeBlockSize());
+  WS_DEBUG_PRINT("Heap fragmentation (%): ");
+  WS_DEBUG_PRINTLN(ESP.getHeapFragmentation());
+#endif
   WS_DEBUG_PRINTLN("-------------------------------");
 
 // (ESP32-Only) Print reason why device was reset
@@ -2798,6 +2817,62 @@ void Wippersnapper::connect() {
     haltError("Unable to generate Device UID");
   }
 
+#ifdef ARDUINO_ARCH_ESP8266
+  // ESP8266 has very limited heap and WiFi scans/connect need a large
+  // contiguous block. Connect WiFi first before allocating MQTT topics.
+  WS_DEBUG_PRINTLN("Running WiFi connect (ESP8266 pre-MQTT)...");
+  WS_DEBUG_PRINT("Free heap before WiFi connect: ");
+  WS_DEBUG_PRINTLN(ESP.getFreeHeap());
+  WS_DEBUG_PRINT("Max free block before WiFi connect: ");
+  WS_DEBUG_PRINTLN(ESP.getMaxFreeBlockSize());
+  WS_DEBUG_PRINT("Heap fragmentation before WiFi connect (%): ");
+  WS_DEBUG_PRINTLN(ESP.getHeapFragmentation());
+
+#if defined(USE_LITTLEFS)
+  // Extra safety: ensure LittleFS is not mounted during WiFi/MQTT connect.
+  LittleFS.end();
+#endif
+
+  if (networkStatus() != WS_NET_CONNECTED) {
+    WS_DEBUG_PRINTLN("Establishing network connection...");
+    WS_PRINTER.flush();
+    WS_DEBUG_PRINT("Performing a WiFi scan for SSID...");
+    if (!check_valid_ssid()) {
+      haltError("ERROR: Unable to find WiFi network, rebooting soon...",
+                WS_LED_STATUS_WIFI_CONNECTING);
+    }
+
+    int maxAttempts = 5;
+    while (maxAttempts > 0) {
+      statusLEDBlink(WS_LED_STATUS_WIFI_CONNECTING);
+      feedWDT();
+      WS_DEBUG_PRINT("Connecting to WiFi (attempt #");
+      WS_DEBUG_PRINT(5 - maxAttempts);
+      WS_DEBUG_PRINTLN(")");
+      WS_PRINTER.flush();
+      feedWDT();
+      _connect();
+      feedWDT();
+      if (networkStatus() == WS_NET_CONNECTED)
+        break;
+      maxAttempts--;
+    }
+
+    if (networkStatus() != WS_NET_CONNECTED) {
+      WS_DEBUG_PRINTLN("ERROR: Unable to connect to WiFi!");
+      haltError("ERROR: Unable to connect to WiFi, rebooting soon...",
+                WS_LED_STATUS_WIFI_CONNECTING);
+    }
+  }
+
+  WS_DEBUG_PRINT("Free heap after WiFi connect: ");
+  WS_DEBUG_PRINTLN(ESP.getFreeHeap());
+  WS_DEBUG_PRINT("Max free block after WiFi connect: ");
+  WS_DEBUG_PRINTLN(ESP.getMaxFreeBlockSize());
+  WS_DEBUG_PRINT("Heap fragmentation after WiFi connect (%): ");
+  WS_DEBUG_PRINTLN(ESP.getHeapFragmentation());
+#endif
+
   // Initialize MQTT client with device identifier
   setupMQTTClient(_device_uid);
 
@@ -2810,9 +2885,17 @@ void Wippersnapper::connect() {
     haltError("Unable to allocate space for MQTT error topics");
   }
 
-  // Connect to Network
+#ifdef ARDUINO_ARCH_ESP8266
+  WS_DEBUG_PRINT("Heap after topic allocation: ");
+  WS_DEBUG_PRINTLN(ESP.getFreeHeap());
+  WS_DEBUG_PRINT("Max free block after topic allocation: ");
+  WS_DEBUG_PRINTLN(ESP.getMaxFreeBlockSize());
+  WS_DEBUG_PRINT("Heap fragmentation after topic allocation (%): ");
+  WS_DEBUG_PRINTLN(ESP.getHeapFragmentation());
+#endif
+
+  // Connect to Network + MQTT
   WS_DEBUG_PRINTLN("Running Network FSM...");
-  // Run the network fsm
   runNetFSM();
 
   // Enable WDT after wifi connection as wifiMulti doesnt feed WDT

output_8266_debug.map

@@ -12,7 +12,7 @@
 // Brent Rubell for Adafruit Industries, 2021-2022
 //
 // All text above must be included in any redistribution.
-
+// #include <GDBStub.h> // Include GDB Stub for debugging esp8266
 #include "Wippersnapper_Networking.h"
 Wippersnapper_WiFi wipper;
 
@@ -25,6 +25,7 @@ void setup() {
 
   Serial.begin(115200);
   // while (!Serial) delay(10);
+  // gdbstub_init();
 
   wipper.connect();