Clean up

Author: brentru

examples/Wippersnapper_demo/Wippersnapper_demo.ino

@@ -26,7 +26,6 @@ void setup() {
   Serial.begin(115200);
   //while (!Serial) delay(10);
 
-  WS_DEBUG_HEAP("boot");
 
   wipper.connect();
 

platformio.ini

@@ -508,39 +508,11 @@ build_flags =
     -DSSL_ALL
     -DMMU_3232
     -DNON32XFER_FAST
-    -DDEBUG_DISABLED
-    -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
-
-; 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
-    -DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
-    -DVTABLES_IN_FLASH
-    -DNO_EXCEPTIONS
-    -DNO_STACK_SMASH_PROTECTION
-    -DSSL_ALL
-    -DMMU_4816
-    -DNON32XFER_FAST
     -DDEBUG_ENABLED
-    -DDEBUG_LEVEL_NONE
-    -DPIO_FRAMEWORK_ARDUINO_MMU_CACHE16_IRAM48_SECHEAP_SHARED ; 16KB cache + 48KB IRAM + 2nd heap (shared)
+    -DDEBUG_LEVEL_CORE
+    -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
-monitor_filters = esp8266_exception_decoder
 
 ; SAMD51 Boards ;
 

src/Wippersnapper.cpp

@@ -95,8 +95,6 @@ Wippersnapper::~Wippersnapper() {
 */
 /**************************************************************************/
 void Wippersnapper::provision() {
-  // Note: Serial not initialized yet, cannot use WS_DEBUG_HEAP here
-
   // Obtain device's MAC address
   getMacAddr();
 
@@ -118,11 +116,12 @@ void Wippersnapper::provision() {
 #else
   set_user_key(); // non-fs-backed, sets global credentials within network iface
 #endif
+
   // Set the status pixel's brightness
   setStatusLEDBrightness(WS._config.status_pixel_brightness);
+
   // Set device's wireless credentials
   set_ssid_pass();
-  // Note: Serial not initialized yet, cannot use WS_DEBUG_HEAP here
 }
 
 /**************************************************************************/
@@ -2791,7 +2790,6 @@ void printDeviceInfo() {
 */
 /**************************************************************************/
 void Wippersnapper::connect() {
-  WS_DEBUG_HEAP("connect-start");
   WS_DEBUG_PRINTLN("Adafruit.io WipperSnapper");
 
   // Dump device info to the serial monitor
@@ -2845,7 +2843,6 @@ void Wippersnapper::connect() {
   statusLEDFade(GREEN, 3);
   WS_DEBUG_PRINTLN(
       "Registration and configuration complete!\nRunning application...");
-  WS_DEBUG_HEAP("connect-end");
 }
 
 /**************************************************************************/
@@ -2893,8 +2890,6 @@ void Wippersnapper::publishPinConfigComplete() {
 */
 /**************************************************************************/
 ws_status_t Wippersnapper::run() {
-  WS_DEBUG_HEAP("loop");
-
   // Check networking
   runNetFSM();
   WS.feedWDT();

src/Wippersnapper.h

@@ -74,29 +74,6 @@
 #define WS_DEBUG_PRINTHEX(...)                                                 \
   { WS_PRINTER.print(__VA_ARGS__, HEX); } ///< Prints in hexadecimal
 
-// ESP8266 heap monitoring macro
-#ifdef ARDUINO_ARCH_ESP8266
-#define WS_HEAP_TOTAL 81920 ///< ESP8266 total heap size in bytes
-#define WS_DEBUG_HEAP(label)                                                   \
-  {                                                                            \
-    uint32_t freeHeap = ESP.getFreeHeap();                                     \
-    uint8_t freePct = (freeHeap * 100) / WS_HEAP_TOTAL;                        \
-    WS_DEBUG_PRINT("[HEAP] ");                                                 \
-    WS_DEBUG_PRINT(label);                                                     \
-    WS_DEBUG_PRINT(": ");                                                      \
-    WS_DEBUG_PRINTVAR(freeHeap);                                               \
-    WS_DEBUG_PRINT("B (");                                                     \
-    WS_DEBUG_PRINTVAR(freePct);                                                \
-    WS_DEBUG_PRINT("%) frag=");                                                \
-    WS_DEBUG_PRINTVAR(ESP.getHeapFragmentation());                             \
-    WS_DEBUG_PRINT("% maxblk=");                                               \
-    WS_DEBUG_PRINTLNVAR(ESP.getMaxFreeBlockSize());                            \
-  }
-#else
-#define WS_DEBUG_HEAP(label)                                                   \
-  {} ///< No-op for non-ESP8266 platforms
-#endif
-
 #else
 #define WS_DEBUG_PRINT(...)                                                    \
   {} ///< Disabled debug output