ESP32c3: Migrate variants to new structure

variants/diy/platformio.ini

@@ -97,16 +97,3 @@ build_flags =
   -D ARDUINO_USB_MODE=0
   -D ARDUINO_USB_CDC_ON_BOOT=1
   -I variants/diy/t-energy-s3_e22
-
-; ESP32 C3 Super Mini Development Board
-; https://www.espboards.dev/esp32/esp32-c3-super-mini/
-[env:esp32c3_super_mini]
-extends = esp32c3_base
-board = esp32-c3-devkitm-1
-build_flags =
-  ${esp32_base.build_flags}
-  -D PRIVATE_HW
-  -I variants/diy/esp32c3_super_mini
-  -D ARDUINO_USB_MODE=1
-  -D ARDUINO_USB_CDC_ON_BOOT=1
-board_level = extra

variants/esp32c3/ai-c3/platformio.ini

@@ -2,7 +2,7 @@
 extends = esp32c3_base
 board = esp32-c3-devkitm-1
 board_level = extra
-build_flags = ${esp32c3_base.build_flags}
+build_flags = 
+  ${esp32c3_base.build_flags}
   -D PRIVATE_HW
-  -I variants/ai-c3
-
+  -I variants/esp32c3/ai-c3

variants/esp32c3/diy/esp32c3_super_mini/platformio.ini

@@ -0,0 +1,12 @@
+; ESP32 C3 Super Mini Development Board
+; https://www.espboards.dev/esp32/esp32-c3-super-mini/
+[env:esp32c3_super_mini]
+extends = esp32c3_base
+board = esp32-c3-devkitm-1
+build_flags =
+  ${esp32_base.build_flags}
+  -D PRIVATE_HW
+  -I variants/esp32c3/diy/esp32c3_super_mini
+  -D ARDUINO_USB_MODE=1
+  -D ARDUINO_USB_CDC_ON_BOOT=1
+board_level = extra

variants/esp32c3/hackerboxes_esp32c3_oled/platformio.ini

@@ -7,8 +7,8 @@ build_flags =
   -D PRIVATE_HW
   -D ARDUINO_USB_MODE=1
   -D ARDUINO_USB_CDC_ON_BOOT=1
-  -I variants/hackerboxes_esp32c3_oled
+  -I variants/esp32c3/hackerboxes_esp32c3_oled
 monitor_speed = 115200
 upload_protocol = esptool
 ;upload_port = /dev/ttyUSB0
-upload_speed = 921600
+upload_speed = 921600

variants/esp32c3/heltec_esp32c3/platformio.ini

@@ -4,8 +4,8 @@ board = esp32-c3-devkitm-1
 build_flags = 
   ${esp32_base.build_flags}
   -D HELTEC_HT62
-  -I variants/heltec_esp32c3
+  -I variants/esp32c3/heltec_esp32c3
 monitor_speed = 115200
 upload_protocol = esptool
 ;upload_port = /dev/ttyUSB0
-upload_speed = 921600
+upload_speed = 921600

variants/esp32c3/heltec_hru_3601/platformio.ini

@@ -4,6 +4,6 @@ board = adafruit_qtpy_esp32c3
 build_flags =
   ${esp32_base.build_flags}
   -D HELTEC_HRU_3601
-  -I variants/heltec_hru_3601
+  -I variants/esp32c3/heltec_hru_3601
 lib_deps = ${esp32c3_base.lib_deps}
   adafruit/Adafruit NeoPixel @ ^1.12.0

variants/esp32c3/m5stack-stamp-c3/platformio.ini

@@ -5,7 +5,7 @@ board_level = extra
 build_flags = 
   ${esp32_base.build_flags}
   -D PRIVATE_HW
-  -I variants/m5stack-stamp-c3
+  -I variants/esp32c3/m5stack-stamp-c3
 monitor_speed = 115200
 upload_protocol = esptool
 ;upload_port = /dev/ttyACM2

variants/esp32s2/nugget_s2_lora/platformio.ini

@@ -3,4 +3,6 @@ extends = esp32s2_base
 board = lolin_s2_mini
 board_level = extra
 build_flags = 
-  ${esp32s2_base.build_flags} -D PRIVATE_HW -I variants/nugget_s2_lora
+  ${esp32s2_base.build_flags}
+  -D PRIVATE_HW
+  -I variants/esp32s2/nugget_s2_lora