PlatformIO fix 16MB boards bug

Author: ewoudwijma

boards/esp32_twilord.json boards/esp32_16MB.jsonboards/esp32_twilord.json renamed to boards/esp32_16MB.json

@@ -25,7 +25,7 @@
     "arduino",
     "espidf"
 ],
-"name": "TwilightLord-ESP32 16MB",
+"name": "ESP32 16MB",
 "upload": {
     "flash_size": "16MB",
     "maximum_ram_size": 327680,
@@ -34,5 +34,5 @@
     "speed": 2000000
 },
 "url": "https://en.wikipedia.org/wiki/ESP32",
-"vendor": "TwilightLord"
+"vendor": "Multiple"
 }

platformio.ini

@@ -689,9 +689,9 @@ build_flags =
   -D SR_DMTYPE=4 -D MCLK_PIN=0 -D I2S_SDPIN=25 -D I2S_WSPIN=15 -D I2S_CKPIN=14   ; for audio Line-In shield
   -D SR_SQUELCH=2 -D SR_GAIN=40 -D SR_FREQ_PROF=1                                ; CS5343 Line-In specific
 
-[Board_ESP32_16MB]
-board = esp32_twilord ; "TwilightLord" ESP32 with 16MB Flash
-board_build.partitions = tools/WLED_ESP32_16MB.csv ; for esp32_twilord with 16MB flash
+[Board_ESP32_16MB] ; ESP32 with 16MB Flash
+board = esp32_16MB 
+board_build.partitions = tools/WLED_ESP32_16MB.csv
 
 
 ; end of base entries
@@ -714,11 +714,13 @@ build_flags = ${esp32_4MB_max_base.build_flags}
   ; Flash: [========= ]  88.7% (used 1394813 bytes from 1572864 bytes)
 
 [env:esp32_16MB_max]
-extends = esp32_4MB_max_base, Board_ESP32_16MB
+extends = esp32_4MB_max_base
 build_flags = ${esp32_4MB_max_base.build_flags}
   -D WLED_RELEASE_NAME=esp32_16MB_max
-  ; RAM:   [==        ]  24.4% (used 79804 bytes from 327680 bytes)
-  ; Flash: [=======   ]  66.5% (used 1394813 bytes from 2097152 bytes)
+board = ${Board_ESP32_16MB.board}
+board_build.partitions = ${Board_ESP32_16MB.board_build.partitions}
+  ; RAM:   [==        ]  24.4% (used 79916 bytes from 327680 bytes)
+  ; Flash: [=======   ]  67.0% (used 1405701 bytes from 2097152 bytes)
 ;lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
 
 [env:esp8266_4MB_min]
@@ -783,11 +785,13 @@ build_flags = ${esp32_4MB_V4_max_base.build_flags}
 
 ; compiled with ESP-IDF 4.4.1
 [env:esp32_16MB_V4_max]
-extends = esp32_4MB_V4_max_base, Board_ESP32_16MB
+extends = esp32_4MB_V4_max_base
 build_flags = ${esp32_4MB_V4_max_base.build_flags}
   -D WLED_RELEASE_NAME=esp32_16MB_V4_max
   -D WLED_WATCHDOG_TIMEOUT=0 #-D WLED_DISABLE_BROWNOUT_DET
   -D ARDUINO_USB_CDC_ON_BOOT=0 ; needed for arduino-esp32 >=2.0.4; avoids errors on startup
+board = ${Board_ESP32_16MB.board}
+board_build.partitions = ${Board_ESP32_16MB.board_build.partitions}
   ; RAM:   [==        ]  24.8% (used 81316 bytes from 327680 bytes)
   ; Flash: [=======   ]  72.9% (used 1528253 bytes from 2097152 bytes)
 
@@ -911,30 +915,38 @@ build_flags = ${wemos_shield_esp32_4MB_max_base.build_flags} ${Shield_LineIn.bui
   -D WLED_RELEASE_NAME=wemos_shield_esp32_4MB_LineIn_max
 
 [env:wemos_shield_esp32_16MB_max]
-extends = wemos_shield_esp32_4MB_max_base, Board_ESP32_16MB
+extends = wemos_shield_esp32_4MB_max_base
 build_flags = ${wemos_shield_esp32_4MB_max_base.build_flags}
   -D WLED_RELEASE_NAME=wemos_shield_esp32_16MB_max
+board = ${Board_ESP32_16MB.board}
+board_build.partitions = ${Board_ESP32_16MB.board_build.partitions}
 ; RAM:   [==        ]  24.4% (used 79820 bytes from 327680 bytes)
 ; Flash: [=======   ]  66.4% (used 1393421 bytes from 2097152 bytes)
 
 [env:wemos_shield_esp32_16MB_ICS4343x_max]
-extends = wemos_shield_esp32_4MB_max_base, Board_ESP32_16MB
+extends = wemos_shield_esp32_4MB_max_base
 build_flags = ${wemos_shield_esp32_4MB_max_base.build_flags} ${Shield_ICS4343x.build_flags}
   -D WLED_RELEASE_NAME=wemos_shield_esp32_16MB_ICS4343x_max
+board = ${Board_ESP32_16MB.board}
+board_build.partitions = ${Board_ESP32_16MB.board_build.partitions}
 ; RAM:   [==        ]  24.4% (used 79820 bytes from 327680 bytes)
 ; Flash: [========= ]  88.6% (used 1393421 bytes from 1572864 bytes)
 
 [env:wemos_shield_esp32_16MB_SPM1423_max]
-extends = wemos_shield_esp32_4MB_max_base, Board_ESP32_16MB
+extends = wemos_shield_esp32_4MB_max_base
 build_flags = ${wemos_shield_esp32_4MB_max_base.build_flags} ${Shield_SPM1423.build_flags}
   -D WLED_RELEASE_NAME=wemos_shield_esp32_16MB_SPM1423_max
+board = ${Board_ESP32_16MB.board}
+board_build.partitions = ${Board_ESP32_16MB.board_build.partitions}
 ; RAM:   [==        ]  24.4% (used 79820 bytes from 327680 bytes)
 ; Flash: [========= ]  88.6% (used 1393421 bytes from 1572864 bytes)
 
 [env:wemos_shield_esp32_16MB_LineIn_max]
-extends = wemos_shield_esp32_4MB_max_base, Board_ESP32_16MB
+extends = wemos_shield_esp32_4MB_max_base
 build_flags = ${wemos_shield_esp32_4MB_max_base.build_flags} ${Shield_LineIn.build_flags}
   -D WLED_RELEASE_NAME=wemos_shield_esp32_16MB_LineIn_max
+board = ${Board_ESP32_16MB.board}
+board_build.partitions = ${Board_ESP32_16MB.board_build.partitions}
 
 ; ESP32 WLED pico board with builtin ICS-43432 microphpone
 [env:esp32_pico_4MB_max]

wled00/wled.h

@@ -8,7 +8,7 @@
  */
 
 // version code in format yymmddb (b = daily build)
-#define VERSION 2212160
+#define VERSION 2212190
 
 //uncomment this if you have a "my_config.h" file you'd like to use
 //#define WLED_USE_MY_CONFIG