Skip to content

Commit 03a909a

Browse files
committed
esp32_4MB_XL was over the limits (flash usage)
still only 256 bytes left for program
1 parent 80a9736 commit 03a909a

File tree

2 files changed

+36
-5
lines changed

2 files changed

+36
-5
lines changed

platformio.ini

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1185,13 +1185,16 @@ build_flags = ${esp32_4MB_M_base.build_flags}
11851185
extends = esp32_4MB_XL_base
11861186
build_flags = ${esp32_4MB_XL_base.build_flags}
11871187
-D WLED_RELEASE_NAME=esp32_4MB_XL
1188+
-D WLED_DISABLE_LOXONE ;; Over the limits
1189+
-D WLEDMM_SAVE_FLASH ;; a humble attempt to save a few extra bytes
11881190
build_unflags = ${esp32_4MB_XL_base.build_unflags}
1189-
-D USERMOD_ANIMARTRIX ;; Tips our memory usage over the limit
1191+
-D USERMOD_ANIMARTRIX ;; Tips our memory usage over the limit
1192+
-D WLEDMM_FASTPATH ;; Over the limits
11901193
; RAM: [== ] 24.4% (used 80060 bytes from 327680 bytes)
11911194
; Flash: [==========] 95.3% (used 1499037 bytes from 1572864 bytes)
1192-
; HELP !!!!! :
1193-
; RAM: [== ] 24.5% (used 80356 bytes from 327680 bytes)
1194-
; Flash: [==========] 99.9% (used 1571053 bytes from 1572864 bytes)
1195+
; !!! HELP !!!!! :
1196+
; RAM: [=== ] 26.2% (used 85756 bytes from 327680 bytes)
1197+
; Flash: [==========] 100.0% (used 1572553 bytes from 1572864 bytes)
11951198

11961199
;; standard framework build for 16MB flash, optimized for speed
11971200
[env:esp32_16MB_S]

wled00/json.cpp

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ void serializeState(JsonObject root, bool forPreset, bool includeBri, bool segme
686686
#endif
687687

688688
// WLEDMM print error message to netDebug - esp32 only, as 8266 flash is very limited
689-
#ifdef ARDUINO_ARCH_ESP32
689+
#if defined(ARDUINO_ARCH_ESP32) && !defined(WLEDMM_SAVE_FLASH)
690690
String errPrefix = F("\nWLED error: ");
691691
String warnPrefix = F("WLED warning: ");
692692
switch(errorFlag) {
@@ -824,6 +824,7 @@ esp_reset_reason_t getRestartReason() {
824824
}
825825
String restartCode2InfoLong(esp_reset_reason_t reason) {
826826
switch (reason) {
827+
#if !defined(WLEDMM_SAVE_FLASH)
827828
case ESP_RST_UNKNOWN: return(F("Reset reason can not be determined")); break;
828829
case ESP_RST_POWERON: return(F("Restart due to power-on event")); break;
829830
case ESP_RST_EXT: return(F("Reset by external pin (not applicable for ESP32)")); break;
@@ -835,11 +836,25 @@ String restartCode2InfoLong(esp_reset_reason_t reason) {
835836
case ESP_RST_DEEPSLEEP:return(F("Restart after exiting deep sleep mode")); break;
836837
case ESP_RST_BROWNOUT: return(F("Brownout Reset (software or hardware)")); break;
837838
case ESP_RST_SDIO: return(F("Reset over SDIO")); break;
839+
#else
840+
case ESP_RST_UNKNOWN: return(F("ESP_RST_UNKNOWN")); break;
841+
case ESP_RST_POWERON: return(F("ESP_RST_POWERON")); break;
842+
case ESP_RST_EXT: return(F("ESP_RST_EXT")); break;
843+
case ESP_RST_SW: return(F("esp_restart()")); break;
844+
case ESP_RST_PANIC: return(F("SW Panic or Exception")); break;
845+
case ESP_RST_INT_WDT: return(F("ESP_RST_INT_WDT")); break;
846+
case ESP_RST_TASK_WDT: return(F("ESP_RST_TASK_WDT")); break;
847+
case ESP_RST_WDT: return(F("ESP_RST_WDT")); break;
848+
case ESP_RST_DEEPSLEEP:return(F("ESP_RST_DEEPSLEEP")); break;
849+
case ESP_RST_BROWNOUT: return(F("Brownout Reset")); break;
850+
case ESP_RST_SDIO: return(F("ESP_RST_SDIO")); break;
851+
#endif
838852
}
839853
return(F("unknown"));
840854
}
841855
String restartCode2Info(esp_reset_reason_t reason) {
842856
switch (reason) {
857+
#if !defined(WLEDMM_SAVE_FLASH)
843858
case ESP_RST_UNKNOWN: return(F("unknown reason")); break;
844859
case ESP_RST_POWERON: return(F("power-on event")); break;
845860
case ESP_RST_EXT: return(F("external pin reset")); break;
@@ -851,6 +866,19 @@ String restartCode2Info(esp_reset_reason_t reason) {
851866
case ESP_RST_DEEPSLEEP:return(F("exit from deep sleep")); break;
852867
case ESP_RST_BROWNOUT: return(F("Brownout Reset")); break;
853868
case ESP_RST_SDIO: return(F("Reset over SDIO")); break;
869+
#else
870+
case ESP_RST_UNKNOWN: return(F("unknown")); break;
871+
case ESP_RST_POWERON: return(F("power-on")); break;
872+
case ESP_RST_EXT: return(F("ext. pin reset")); break;
873+
case ESP_RST_SW: return(F("SW restart")); break;
874+
case ESP_RST_PANIC: return(F("SW panic or exception")); break;
875+
case ESP_RST_INT_WDT: return(F("int. watchdog")); break;
876+
case ESP_RST_TASK_WDT: return(F("task watchdog")); break;
877+
case ESP_RST_WDT: return(F("other watchdog")); break;
878+
case ESP_RST_DEEPSLEEP:return(F("deep sleep")); break;
879+
case ESP_RST_BROWNOUT: return(F("Brownout")); break;
880+
case ESP_RST_SDIO: return(F("SDIO reset")); break;
881+
#endif
854882
}
855883
return(F("unknown"));
856884
}

0 commit comments

Comments
 (0)