Add more envs to root platformio (#4799)

platformio.ini

@@ -108,7 +108,6 @@ platform_packages =
     platformio/framework-arduinoespressif32@~3.20005.0
 
 framework = arduino
-board = nodemcu-32s
 lib_deps =
     ; order matters with lib-deps; some of the libs in common:arduino.lib_deps
     ; don't declare built-in libraries as dependencies, so they have to be declared first
@@ -168,6 +167,9 @@ build_flags =
     -DUSE_RP2040_FRAMEWORK_ARDUINO
 
 ; All the actual environments are defined below.
+
+;;;;;;;; ESP8266 ;;;;;;;;
+
 [env:esp8266-arduino]
 extends = common:esp8266-arduino
 board = nodemcuv2
@@ -182,6 +184,8 @@ build_flags =
     ${common:esp8266-arduino.build_flags}
     ${flags:clangtidy.build_flags}
 
+;;;;;;;; ESP32 ;;;;;;;;
+
 [env:esp32-arduino]
 extends = common:esp32-arduino
 board = esp32dev
@@ -189,6 +193,7 @@ board_build.partitions = huge_app.csv
 build_flags =
     ${common:esp32-arduino.build_flags}
     ${flags:runtime.build_flags}
+    -DUSE_ESP32_VARIANT_ESP32
 
 [env:esp32-arduino-tidy]
 extends = common:esp32-arduino
@@ -196,6 +201,7 @@ board = esp32dev
 build_flags =
     ${common:esp32-arduino.build_flags}
     ${flags:clangtidy.build_flags}
+    -DUSE_ESP32_VARIANT_ESP32
 
 [env:esp32-idf]
 extends = common:esp32-idf
@@ -204,6 +210,7 @@ board_build.esp-idf.sdkconfig_path = .temp/sdkconfig-esp32-idf
 build_flags =
     ${common:esp32-idf.build_flags}
     ${flags:runtime.build_flags}
+    -DUSE_ESP32_VARIANT_ESP32
 
 [env:esp32-idf-tidy]
 extends = common:esp32-idf
@@ -212,6 +219,25 @@ board_build.esp-idf.sdkconfig_path = .temp/sdkconfig-esp32-idf-tidy
 build_flags =
     ${common:esp32-idf.build_flags}
     ${flags:clangtidy.build_flags}
+    -DUSE_ESP32_VARIANT_ESP32
+
+;;;;;;;; ESP32-C3 ;;;;;;;;
+
+[env:esp32c3-arduino]
+extends = common:esp32-arduino
+board = esp32-c3-devkitm-1
+build_flags =
+    ${common:esp32-arduino.build_flags}
+    ${flags:runtime.build_flags}
+    -DUSE_ESP32_VARIANT_ESP32C3
+
+[env:esp32c3-arduino-tidy]
+extends = common:esp32-arduino
+board = esp32-c3-devkitm-1
+build_flags =
+    ${common:esp32-arduino.build_flags}
+    ${flags:clangtidy.build_flags}
+    -DUSE_ESP32_VARIANT_ESP32C3
 
 [env:esp32c3-idf]
 extends = common:esp32-idf
@@ -220,6 +246,7 @@ board_build.esp-idf.sdkconfig_path = .temp/sdkconfig-esp32c3-idf
 build_flags =
     ${common:esp32-idf.build_flags}
     ${flags:runtime.build_flags}
+    -DUSE_ESP32_VARIANT_ESP32C3
 
 [env:esp32c3-idf-tidy]
 extends = common:esp32-idf
@@ -228,6 +255,25 @@ board_build.esp-idf.sdkconfig_path = .temp/sdkconfig-esp32c3-idf-tidy
 build_flags =
     ${common:esp32-idf.build_flags}
     ${flags:clangtidy.build_flags}
+    -DUSE_ESP32_VARIANT_ESP32C3
+
+;;;;;;;; ESP32-S2 ;;;;;;;;
+
+[env:esp32s2-arduino]
+extends = common:esp32-arduino
+board = esp32-s2-kaluga-1
+build_flags =
+    ${common:esp32-arduino.build_flags}
+    ${flags:runtime.build_flags}
+    -DUSE_ESP32_VARIANT_ESP32S2
+
+[env:esp32s2-arduino-tidy]
+extends = common:esp32-arduino
+board = esp32-s2-kaluga-1
+build_flags =
+    ${common:esp32-arduino.build_flags}
+    ${flags:clangtidy.build_flags}
+    -DUSE_ESP32_VARIANT_ESP32S2
 
 [env:esp32s2-idf]
 extends = common:esp32-idf
@@ -236,6 +282,7 @@ board_build.esp-idf.sdkconfig_path = .temp/sdkconfig-esp32s2-idf
 build_flags =
     ${common:esp32-idf.build_flags}
     ${flags:runtime.build_flags}
+    -DUSE_ESP32_VARIANT_ESP32S2
 
 [env:esp32s2-idf-tidy]
 extends = common:esp32-idf
@@ -244,6 +291,45 @@ board_build.esp-idf.sdkconfig_path = .temp/sdkconfig-esp32s2-idf-tidy
 build_flags =
     ${common:esp32-idf.build_flags}
     ${flags:clangtidy.build_flags}
+    -DUSE_ESP32_VARIANT_ESP32S2
+
+;;;;;;;; ESP32-S3 ;;;;;;;;
+
+[env:esp32s3-arduino]
+extends = common:esp32-arduino
+board = esp32-s3-devkitc-1
+build_flags =
+    ${common:esp32-arduino.build_flags}
+    ${flags:runtime.build_flags}
+    -DUSE_ESP32_VARIANT_ESP32S3
+
+[env:esp32s3-arduino-tidy]
+extends = common:esp32-arduino
+board = esp32-s3-devkitc-1
+build_flags =
+    ${common:esp32-arduino.build_flags}
+    ${flags:clangtidy.build_flags}
+    -DUSE_ESP32_VARIANT_ESP32S3
+
+[env:esp32s3-idf]
+extends = common:esp32-idf
+board = esp32-s3-devkitc-1
+board_build.esp-idf.sdkconfig_path = .temp/sdkconfig-esp32s3-idf
+build_flags =
+    ${common:esp32-idf.build_flags}
+    ${flags:runtime.build_flags}
+    -DUSE_ESP32_VARIANT_ESP32S3
+
+[env:esp32s3-idf-tidy]
+extends = common:esp32-idf
+board = esp32-s3-devkitc-1
+board_build.esp-idf.sdkconfig_path = .temp/sdkconfig-esp32s3-idf-tidy
+build_flags =
+    ${common:esp32-idf.build_flags}
+    ${flags:clangtidy.build_flags}
+    -DUSE_ESP32_VARIANT_ESP32S3
+
+;;;;;;;; RP2040 ;;;;;;;;
 
 [env:rp2040-pico-arduino]
 extends = common:rp2040-arduino