From 57f337ce22318a636be0c6a230f4c530122a10c6 Mon Sep 17 00:00:00 2001
From: MichaelDvP <github@mdvp.de>
Date: Fri, 11 Oct 2024 15:50:45 +0200
Subject: [PATCH] fix board_build.extra_flags, (for serial USB) #2082

---
 platformio.ini | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 45f4bc6ab..eebfa7aab 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -109,7 +109,10 @@ extra_scripts = scripts/rename_fw.py
 board = esp32dev
 board_upload.flash_size = 16MB
 board_build.partitions = esp32_partition_16M.csv
-board_build.extra_flags = -DBOARD_HAS_PSRAM
+board_build.extra_flags =
+  -DARDUINO_ESP32_DEV
+  -DBOARD_HAS_PSRAM
+
 
 [env:ci_s3_16M_P]
 ; 16MB ESP32-S3 - with PSRAM - like BBQKees S3
@@ -119,7 +122,6 @@ board = lolin_s3
 board_build.f_cpu = 240000000L
 board_upload.flash_size = 16MB
 board_build.partitions = esp32_partition_16M.csv
-board_build.extra_flags = -DBOARD_HAS_PSRAM
 
 ;
 ; Direct builds
@@ -144,14 +146,15 @@ extends = espressif32_base
 board = esp32dev
 board_upload.flash_size = 16MB
 board_build.partitions = esp32_partition_16M.csv
-board_build.extra_flags = -DBOARD_HAS_PSRAM
+board_build.extra_flags =
+  -DARDUINO_ESP32_DEV
+  -DBOARD_HAS_PSRAM
 
 [env:c3_mini_4M]
 extends = espressif32_base_tasmota
 board = lolin_c3_mini
 board_upload.flash_size = 4MB
 board_build.partitions = esp32_partition_4M.csv
-board_build.extra_flags = '-DEMSESP_DEFAULT_BOARD_PROFILE="C3MINI"'
 
 ; lolin C3 mini v1 needs special wifi init.
 ; https://www.wemos.cc/en/latest/c3/c3_mini_1_0_0.html#about-wifi
@@ -160,14 +163,15 @@ extends = espressif32_base_tasmota
 board = lolin_c3_mini
 board_upload.flash_size = 4MB
 board_build.partitions = esp32_partition_4M.csv
-board_build.extra_flags = -DBOARD_C3_MINI_V1 '-DEMSESP_DEFAULT_BOARD_PROFILE="C3MINI"'
+build_flags =
+  ${common.build_flags}
+  -DBOARD_C3_MINI_V1
 
 [env:s2_4M]
 extends = espressif32_base_tasmota
 board = lolin_s2_mini
 board_upload.flash_size = 4MB
 board_build.partitions = esp32_partition_4M.csv
-board_build.extra_flags = '-DEMSESP_DEFAULT_BOARD_PROFILE="S2MINI"'
 
 ; https://github.com/platformio/platform-espressif32/blob/master/boards/lolin_s3.json
 [env:s3_16M_P]
@@ -177,7 +181,6 @@ board_upload.use_1200bps_touch = false
 board_upload.wait_for_upload_port = false
 board_upload.flash_size = 16MB
 board_build.partitions = esp32_partition_16M.csv
-board_build.extra_flags = -DBOARD_HAS_PSRAM
 
 [env:s3_32M_P]
 extends = espressif32_base
@@ -186,7 +189,6 @@ board_build.arduino.memory_type: opi_opi
 board_build.flash_mode = opi
 board_upload.flash_size = 32MB
 board_build.partitions = esp32_partition_32M.csv
-board_build.extra_flags = -DBOARD_HAS_PSRAM
 
 ; 
 ; Building and testing natively, standalone without an ESP32.