Merge branch 'mdev' into flickerFixer_backport

2026-01-07 23:11:33 +01:00
parent dc10a76295 94ac42f445
commit 01331b205e
2 changed files with 13 additions and 13 deletions
--- a/platformio.ini
+++ b/platformio.ini
@@ -576,7 +576,7 @@ platform = ${common.platform_wled_default}
 platform_packages = ${common.platform_packages}
 board_build.ldscript = ${common.ldscript_4m1m}
 build_unflags = ${esp8266.build_unflags}
-build_flags = ${common.build_flags_esp8266} -D WLED_RELEASE_NAME=ESP8266 #-DWLED_DISABLE_2D
+build_flags = ${common.build_flags_esp8266} -D WLED_RELEASE_NAME=ESP_8266 #-DWLED_DISABLE_2D
 lib_deps = ${esp8266.lib_deps}
 lib_ignore = ${esp8266.lib_ignore}
 monitor_filters = esp8266_exception_decoder
@@ -584,7 +584,7 @@ monitor_filters = esp8266_exception_decoder
 [env:nodemcuv2_160]
 extends = env:nodemcuv2
 board_build.f_cpu = 160000000L
-build_flags = ${common.build_flags_esp8266} -D WLED_RELEASE_NAME=ESP8266_160 #-DWLED_DISABLE_2D
+build_flags = ${common.build_flags_esp8266} -D WLED_RELEASE_NAME=ESP_8266_160 #-DWLED_DISABLE_2D

 [env:esp8266_2m]
 board = esp_wroom_02
@@ -778,7 +778,7 @@ platform_packages = ${esp32c3.platform_packages}
 framework = arduino
 board = esp32-c3-devkitm-1
 board_build.partitions = ${esp32.default_partitions}
-build_flags = ${common.build_flags} ${esp32c3.build_flags} -D WLED_RELEASE_NAME=ESP32-C3
+build_flags = ${common.build_flags} ${esp32c3.build_flags} -D WLED_RELEASE_NAME=ESP32_C3
  -D WLED_WATCHDOG_TIMEOUT=0
  -DLOLIN_WIFI_FIX ; seems to work much better with this
  -DARDUINO_USB_CDC_ON_BOOT=1 ;; for virtual CDC USB
@@ -798,7 +798,7 @@ board_build.flash_mode = dio ;; some boards do not boot with the faster "qio" mo
 ;; platform_packages = ${esp32s3.platform_packages}
 ;; upload_speed = 921600 ; or  460800
 ;; build_unflags = ${common.build_unflags}
-;; build_flags = ${common.build_flags} ${esp32s3.build_flags} -D WLED_RELEASE_NAME=ESP32-S3_8MB
+;; build_flags = ${common.build_flags} ${esp32s3.build_flags} -D WLED_RELEASE_NAME=ESP32_S3_8MB
 ;;   -D CONFIG_LITTLEFS_FOR_IDF_3_2 -D WLED_WATCHDOG_TIMEOUT=0
 ;;   -D ARDUINO_USB_CDC_ON_BOOT=0  ;; -D ARDUINO_USB_MODE=1 ;; for boards with serial-to-USB chip
 ;;   ;-D ARDUINO_USB_CDC_ON_BOOT=1 ;; -D ARDUINO_USB_MODE=1 ;; for boards with USB-OTG connector only (USBCDC or "TinyUSB")
@@ -929,7 +929,7 @@ board_build.flash_mode = dio   ;; prevents build error:  sdkconfig.h: No such fi
 build_unflags = ${common.build_unflags} #-DARDUINO_USB_CDC_ON_BOOT=1
 ;; board_build.flash_mode = qio
 ;; board_build.f_flash = 80000000L
-build_flags = ${common.build_flags} ${esp32s2.build_flags} -D WLED_RELEASE_NAME=ESP32-S2
+build_flags = ${common.build_flags} ${esp32s2.build_flags} -D WLED_RELEASE_NAME=ESP32_S2
  -DBOARD_HAS_PSRAM
  -DARDUINO_USB_CDC_ON_BOOT=1 # try disabling and enabling unflag above in case of board-specific issues, will disable Serial
  -DARDUINO_USB_MSC_ON_BOOT=0
@@ -964,7 +964,7 @@ lib_deps = ${esp32s2.lib_deps}
 ;; platform = ${esp32c3.platform}
 ;; platform_packages = ${esp32c3.platform_packages}
 ;; board = esp32-c3-devkitm-1
-;; build_flags = ${common.build_flags} ${esp32c3.build_flags} #-D WLED_RELEASE_NAME=ESP32-C3
+;; build_flags = ${common.build_flags} ${esp32c3.build_flags} #-D WLED_RELEASE_NAME=ESP32_C3
 ;;   -D WLED_WATCHDOG_TIMEOUT=0
 ;;   -D WLED_DISABLE_OTA
 ;;   ; -DARDUINO_USB_CDC_ON_BOOT=1 ;; for virtual CDC USB
@@ -1034,7 +1034,7 @@ platform = ${common.platform_wled_default}
 platform_packages = ${common.platform_packages}
 board_build.ldscript = ${common.ldscript_2m512k}
 build_unflags = ${esp8266.build_unflags}
-build_flags = ${common.build_flags_esp8266} -D WLED_RELEASE_NAME=ESP8266 -D BTNPIN=-1 -D RLYPIN=-1 -D DATA_PINS=4,12,14,13,5
+build_flags = ${common.build_flags_esp8266} -D WLED_RELEASE_NAME=ESP_8266 -D BTNPIN=-1 -D RLYPIN=-1 -D DATA_PINS=4,12,14,13,5
                                            -D DEFAULT_LED_TYPE=TYPE_ANALOG_5CH -D WLED_DISABLE_INFRARED -D WLED_MAX_CCT_BLEND=0
 lib_deps = ${esp8266.lib_deps}
 lib_ignore = ${esp8266.lib_ignore}
@@ -1046,7 +1046,7 @@ platform = ${common.platform_wled_default}
 platform_packages = ${common.platform_packages}
 board_build.ldscript = ${common.ldscript_2m512k}
 build_unflags = ${esp8266.build_unflags}
-build_flags = ${common.build_flags_esp8266} -D WLED_RELEASE_NAME=ESP8266 -D BTNPIN=-1 -D RLYPIN=-1 -D DATA_PINS=4,12,14,5,13
+build_flags = ${common.build_flags_esp8266} -D WLED_RELEASE_NAME=ESP_8266 -D BTNPIN=-1 -D RLYPIN=-1 -D DATA_PINS=4,12,14,5,13
                                            -D DEFAULT_LED_TYPE=TYPE_ANALOG_5CH -D WLED_DISABLE_INFRARED -D WLED_MAX_CCT_BLEND=0 -D WLED_USE_IC_CCT
 lib_deps = ${esp8266.lib_deps}
 lib_ignore = ${esp8266.lib_ignore}
@@ -1058,7 +1058,7 @@ platform = ${common.platform_wled_default}
 platform_packages = ${common.platform_packages}
 board_build.ldscript = ${common.ldscript_2m512k}
 build_unflags = ${esp8266.build_unflags}
-build_flags = ${common.build_flags_esp8266} -D WLED_RELEASE_NAME=ESP8266 -D BTNPIN=0 -D RLYPIN=-1 -D LEDPIN=1 -D WLED_DISABLE_INFRARED
+build_flags = ${common.build_flags_esp8266} -D WLED_RELEASE_NAME=ESP_8266 -D BTNPIN=0 -D RLYPIN=-1 -D LEDPIN=1 -D WLED_DISABLE_INFRARED
 lib_deps = ${esp8266.lib_deps}
 lib_ignore = ${esp8266.lib_ignore}

@@ -1069,7 +1069,7 @@ platform = ${common.platform_wled_default}
 platform_packages = ${common.platform_packages}
 board_build.ldscript = ${common.ldscript_2m512k}
 build_unflags = ${esp8266.build_unflags}
-build_flags = ${common.build_flags_esp8266} -D WLED_RELEASE_NAME=ESP8266 -D BTNPIN=0 -D RLYPIN=12 -D LEDPIN=1 -D WLED_DISABLE_INFRARED
+build_flags = ${common.build_flags_esp8266} -D WLED_RELEASE_NAME=ESP_8266 -D BTNPIN=0 -D RLYPIN=12 -D LEDPIN=1 -D WLED_DISABLE_INFRARED
 lib_deps = ${esp8266.lib_deps}
 lib_ignore = ${esp8266.lib_ignore}

@@ -1080,7 +1080,7 @@ platform = ${common.platform_wled_default}
 platform_packages = ${common.platform_packages}
 board_build.ldscript = ${common.ldscript_2m512k}
 build_unflags = ${esp8266.build_unflags}
-build_flags = ${common.build_flags_esp8266} -D WLED_RELEASE_NAME=ESP8266 -D BTNPIN=0 -D RLYPIN=-1 DATA_PINS=4,12,14,13 -D WLED_DISABLE_INFRARED
+build_flags = ${common.build_flags_esp8266} -D WLED_RELEASE_NAME=ESP_8266 -D BTNPIN=0 -D RLYPIN=-1 DATA_PINS=4,12,14,13 -D WLED_DISABLE_INFRARED
 lib_deps = ${esp8266.lib_deps}
 lib_ignore = ${esp8266.lib_ignore}

@@ -1673,7 +1673,7 @@ lib_ignore = ${esp8266.lib_ignore}
 [env:d1_mini_temp]
 extends = env:d1_mini
 board_build.filesystem = littlefs
-build_flags = ${common.build_flags_esp8266} -D WLED_RELEASE_NAME=ESP8266
+build_flags = ${common.build_flags_esp8266} -D WLED_RELEASE_NAME=ESP_8266
  -D WLED_DISABLE_ALEXA
  -D WLED_DISABLE_HUESYNC
  -D WLED_DISABLE_LOXONE
--- a/wled00/wled.cpp
+++ b/wled00/wled.cpp
@@ -690,7 +690,7 @@ void WLED::setup()
 #if defined(ALL_JSON_TO_PSRAM) && defined(BOARD_HAS_PSRAM) && (defined(WLED_USE_PSRAM_JSON) || defined(WLED_USE_PSRAM))
  if (psramFound()) {
    DEBUG_PRINT(F("\nfree heap ")); DEBUG_PRINTLN(ESP.getFreeHeap());
-    USER_PRINTLN(F("JSON gabage collection (initial)."));
+    USER_PRINTLN(F("JSON garbage collection (initial)."));
    doc.garbageCollect();   // WLEDMM experimental - this seems to move the complete doc[] into PSRAM
 	  USER_PRINT(F("PSRAM in use:")); USER_PRINT(int(ESP.getPsramSize() - ESP.getFreePsram())); USER_PRINTLN(F(" Bytes."));
    DEBUG_PRINT(F("free heap ")); DEBUG_PRINTLN(ESP.getFreeHeap());