From 6f4eeea7dce47da045fda8f08b21f541dcbff968 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 23 Feb 2023 20:28:44 +0100
Subject: [PATCH] buildenv corrections for -S3/-S2/-C3

* avoid mixing ESP32 "V4" and S3/S2/C3 specific build flags
* added missing flags in generic S3/S2/C3 sections
---
 platformio.ini | 19 ++++++++++++-------
 wled00/wled.h  |  2 +-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index bcdc3b87..1129d96f 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -286,9 +286,10 @@ lib_depsV4 =
 
 [esp32s2]
 build_flags = -g
-  -DARDUINO_ARCH_ESP32
+  -DARDUINO_ARCH_ESP32 -DESP32                     ;; WLEDMM
   -DARDUINO_ARCH_ESP32S2
   -DCONFIG_IDF_TARGET_ESP32S2
+  -DCONFIG_LITTLEFS_FOR_IDF_3_2 -DLFS_THREADSAFE   ;; WLEDMM
   -D CONFIG_ASYNC_TCP_USE_WDT=0
   -DCO
   -DARDUINO_USB_MODE=0 ;; this flag is mandatory for ESP32-S2 !
@@ -302,9 +303,10 @@ lib_deps =
 
 [esp32c3]
 build_flags = -g
-  -DARDUINO_ARCH_ESP32
+  -DARDUINO_ARCH_ESP32 -DESP32                     ;; WLEDMM
   -DARDUINO_ARCH_ESP32C3
   -DCONFIG_IDF_TARGET_ESP32C3
+  -DCONFIG_LITTLEFS_FOR_IDF_3_2 -DLFS_THREADSAFE   ;; WLEDMM
   -D CONFIG_ASYNC_TCP_USE_WDT=0
   -DCO
   -DARDUINO_USB_MODE=1 ;; this flag is mandatory for ESP32-C3
@@ -323,6 +325,7 @@ build_flags = -g
   -DARDUINO_ARCH_ESP32
   -DARDUINO_ARCH_ESP32S3
   -DCONFIG_IDF_TARGET_ESP32S3
+  -DCONFIG_LITTLEFS_FOR_IDF_3_2 -DLFS_THREADSAFE   ;; WLEDMM
   -D CONFIG_ASYNC_TCP_USE_WDT=0
   -DCO
   ;; please make sure that the following flags are properly set (to 0 or 1) by your board.json, or included in your custom platformio_override.ini entry:
@@ -1182,10 +1185,12 @@ build_unflags =
   -D USERMOD_ROTARY_ENCODER_UI ;; see above
   -D WLED_ENABLE_DMX ;; disabled because it does not work with ESP-IDF 4.4.x (buggy driver in SparkFunDMX)
 
-build_flags =  ${esp32_4MB_V4_M_base.build_flags} 
+build_flags = ${common.build_flags} ${esp32s3.build_flags} -Wno-misleading-indentation -Wno-format-truncation
+  ${common_mm.build_flags_S} ${common_mm.build_flags_M}
   -D WLED_RELEASE_NAME=esp32S3_8MB_M 
-  -D ARDUINO_USB_MODE=1 -D ARDUINO_USB_CDC_ON_BOOT=0 -D ARDUINO_USB_MSC_ON_BOOT=0 -D ARDUINO_USB_DFU_ON_BOOT=0
-  -D WLED_WATCHDOG_TIMEOUT=0 
+  -D ARDUINO_USB_MODE=1 -D ARDUINO_USB_CDC_ON_BOOT=0 -D ARDUINO_USB_MSC_ON_BOOT=0 -D ARDUINO_USB_DFU_ON_BOOT=0     ;; for Serial-to-USB chip
+  ;; -D ARDUINO_USB_MODE=1 -D ARDUINO_USB_CDC_ON_BOOT=1 -D ARDUINO_USB_MSC_ON_BOOT=0 -D ARDUINO_USB_DFU_ON_BOOT=0  ;; for Hardware-CDC USB mode
+  -D WLED_WATCHDOG_TIMEOUT=0 -D CONFIG_ASYNC_TCP_USE_WDT=0
   ; -D U8X8_HAVE_2ND_HW_I2C ;; experimental - tells U8g2 lib that a second HW I2C unit exists
   -D WLED_DISABLE_LOXONE ; FLASH 1272 bytes
   -D WLED_DISABLE_ALEXA ;  RAM 116 bytes; FLASH 13524 bytes
@@ -1236,7 +1241,7 @@ build_unflags = ${common.build_unflags}
   -D USERMOD_ROTARY_ENCODER_UI ;; see above
   -D WLED_ENABLE_DMX ;; disabled because it does not work with ESP-IDF 4.4.x (buggy driver in SparkFunDMX)
 
-build_flags = ${common.build_flags} ${esp32.build_flagsV4} ${esp32s2.build_flags} 
+build_flags = ${common.build_flags} ${esp32s2.build_flags} 
   -D WLED_WATCHDOG_TIMEOUT=0 -D CONFIG_ASYNC_TCP_USE_WDT=0
   ${common_mm.build_flags_S} ${common_mm.build_flags_M}
   -Wno-misleading-indentation -Wno-format-truncation
@@ -1292,7 +1297,7 @@ build_unflags = ${common.build_unflags}
   -D USERMOD_ROTARY_ENCODER_UI ;; see above
   -D WLED_ENABLE_DMX ;; disabled because it does not work with ESP-IDF 4.4.x (buggy driver in SparkFunDMX)
 
-build_flags = ${common.build_flags} ${esp32.build_flagsV4} ${esp32c3.build_flags} 
+build_flags = ${common.build_flags} ${esp32c3.build_flags} 
   -D WLED_WATCHDOG_TIMEOUT=0 -D CONFIG_ASYNC_TCP_USE_WDT=0
   ${common_mm.build_flags_S} ${common_mm.build_flags_M}
   -Wno-misleading-indentation -Wno-format-truncation
diff --git a/wled00/wled.h b/wled00/wled.h
index 3b0001f5..2419a544 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2302231
+#define VERSION 2302232
 
 //uncomment this if you have a "my_config.h" file you'd like to use
 //#define WLED_USE_MY_CONFIG