Merge branch 'master' into t-deck-pro

variants/diy/platformio.ini

@@ -1,47 +1,3 @@
-; Meshtastic DIY v1 by Nano VHF Schematic based on ESP32-WROOM-32 (38 pins) devkit & EBYTE E22 SX1262/SX1268 module
-[env:meshtastic-diy-v1]
-extends = esp32_base
-board = esp32doit-devkit-v1
-board_check = true
-build_flags =
-  ${esp32_base.build_flags}
-  -D DIY_V1
-  -D EBYTE_E22
-  -I variants/diy/v1
-
-; Meshtastic DIY v1.1 new schematic based on ESP32-WROOM-32 & SX1262/SX1268 modules
-[env:meshtastic-diy-v1_1]
-extends = esp32_base
-board = esp32doit-devkit-v1
-board_level = extra
-build_flags =
-  ${esp32_base.build_flags}
-  -D DIY_V1
-  -D EBYTE_E22
-  -I variants/diy/v1_1
-
-; Port to Disaster Radio's ESP32-v3 Dev Board
-[env:meshtastic-dr-dev]
-extends = esp32_base
-board = esp32doit-devkit-v1
-board_upload.maximum_size = 4194304
-board_upload.maximum_ram_size = 532480
-build_flags =
-  ${esp32_base.build_flags}
-  -D DR_DEV
-  -D EBYTE_E22
-  -I variants/diy/dr-dev
-
-; Hydra - Meshtastic DIY v1 hardware with some specific changes
-[env:hydra]
-extends = esp32_base
-board = esp32doit-devkit-v1
-build_flags =
-  ${esp32_base.build_flags}
-  -D DIY_V1
-  -I variants/diy/hydra
-
-
 ; Promicro + E22(0)-xxxMM / RA-01SH modules board variant - DIY - without TCXO
 [env:nrf52_promicro_diy_xtal]
 extends = nrf52840_base
@@ -122,35 +78,3 @@ build_src_filter = ${nrf52_base.build_src_filter} +<../variants/diy/seeed-xiao-n
 lib_deps =
   ${nrf52840_base.lib_deps}
 debug_tool = jlink
-
-; NanoVHF T-Energy-S3 + E22(0)-xxxM - DIY
-[env:t-energy-s3_e22]
-extends = esp32s3_base
-board = esp32-s3-devkitc-1
-board_build.partitions = default_16MB.csv
-board_level = extra
-board_upload.flash_size = 16MB ;Specify the FLASH capacity as 16MB
-board_build.arduino.memory_type = qio_opi ;Enable internal PSRAM
-build_unflags =
-  ${esp32s3_base.build_unflags}
-  -D ARDUINO_USB_MODE=1
-build_flags =
-  ${esp32s3_base.build_flags}
-  -D EBYTE_ESP32_S3
-  -D BOARD_HAS_PSRAM
-  -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/esp32/betafpv_2400_tx_micro/platformio.ini

@@ -8,11 +8,11 @@ build_flags =
   -D VTABLES_IN_FLASH=1
   -D CONFIG_DISABLE_HAL_LOCKS=1
   -O2
-  -I variants/betafpv_2400_tx_micro
+  -I variants/esp32/betafpv_2400_tx_micro
 board_build.f_cpu = 240000000L
 upload_protocol = esptool
 ;upload_port = /dev/ttyUSB0
 upload_speed = 460800
 lib_deps =
   ${esp32_base.lib_deps}
-  adafruit/Adafruit NeoPixel @ ^1.12.0
+  adafruit/Adafruit NeoPixel @ ^1.12.0

variants/esp32/betafpv_900_tx_nano/platformio.ini

@@ -8,10 +8,10 @@ build_flags =
   -D VTABLES_IN_FLASH=1
   -D CONFIG_DISABLE_HAL_LOCKS=1
   -O2
-  -I variants/betafpv_900_tx_nano
+  -I variants/esp32/betafpv_900_tx_nano
 board_build.f_cpu = 240000000L
 upload_protocol = esptool
 ;upload_port = /dev/ttyUSB0
 upload_speed = 460800
 lib_deps =
-  ${esp32_base.lib_deps}
+  ${esp32_base.lib_deps}

variants/esp32/chatter2/platformio.ini

@@ -5,7 +5,7 @@ board = esp32doit-devkit-v1
 build_flags =
   ${esp32_base.build_flags}
   -D CHATTER_2
-  -I variants/chatter2
+  -I variants/esp32/chatter2
   
 lib_deps =
   ${esp32_base.lib_deps}

variants/esp32/diy/dr-dev/platformio.ini

@@ -0,0 +1,11 @@
+; Port to Disaster Radio's ESP32-v3 Dev Board
+[env:meshtastic-dr-dev]
+extends = esp32_base
+board = esp32doit-devkit-v1
+board_upload.maximum_size = 4194304
+board_upload.maximum_ram_size = 532480
+build_flags =
+  ${esp32_base.build_flags}
+  -D DR_DEV
+  -D EBYTE_E22
+  -I variants/esp32/diy/dr-dev

variants/esp32/diy/hydra/platformio.ini

@@ -0,0 +1,8 @@
+; Hydra - Meshtastic DIY v1 hardware with some specific changes
+[env:hydra]
+extends = esp32_base
+board = esp32doit-devkit-v1
+build_flags =
+  ${esp32_base.build_flags}
+  -D DIY_V1
+  -I variants/esp32/diy/hydra

variants/esp32/diy/v1/platformio.ini

@@ -0,0 +1,10 @@
+; Meshtastic DIY v1 by Nano VHF Schematic based on ESP32-WROOM-32 (38 pins) devkit & EBYTE E22 SX1262/SX1268 module
+[env:meshtastic-diy-v1]
+extends = esp32_base
+board = esp32doit-devkit-v1
+board_check = true
+build_flags =
+  ${esp32_base.build_flags}
+  -D DIY_V1
+  -D EBYTE_E22
+  -I variants/esp32/diy/v1

variants/esp32/diy/v1_1/platformio.ini

@@ -0,0 +1,10 @@
+; Meshtastic DIY v1.1 new schematic based on ESP32-WROOM-32 & SX1262/SX1268 modules
+[env:meshtastic-diy-v1_1]
+extends = esp32_base
+board = esp32doit-devkit-v1
+board_level = extra
+build_flags =
+  ${esp32_base.build_flags}
+  -D DIY_V1
+  -D EBYTE_E22
+  -I variants/esp32/diy/v1_1

variants/esp32/hackerboxes_esp32_io/platformio.ini

@@ -5,7 +5,7 @@ board_level = extra
 build_flags = 
   ${esp32_base.build_flags}
   -D PRIVATE_HW
-  -I variants/hackerboxes_esp32_io
+  -I variants/esp32/hackerboxes_esp32_io
 monitor_speed = 115200
 upload_protocol = esptool
 ;upload_port = /dev/ttyUSB0

variants/esp32/heltec_v1/platformio.ini

@@ -4,4 +4,6 @@ extends = esp32_base
 board_level = extra
 board = heltec_wifi_lora_32
 build_flags = 
-  ${esp32_base.build_flags} -D HELTEC_V1 -I variants/heltec_v1
+  ${esp32_base.build_flags}
+  -D HELTEC_V1
+  -I variants/esp32/heltec_v1

variants/esp32/heltec_v2.1/platformio.ini

@@ -4,5 +4,7 @@ board_level = extra
 extends = esp32_base
 board = heltec_wifi_lora_32_V2
 build_flags = 
-  ${esp32_base.build_flags} -D HELTEC_V2_1 -I variants/heltec_v2.1
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
+  ${esp32_base.build_flags}
+  -D HELTEC_V2_1
+  -I variants/esp32/heltec_v2.1
+  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.

variants/esp32/heltec_v2/platformio.ini

@@ -4,4 +4,6 @@ board_level = extra
 extends = esp32_base
 board = heltec_wifi_lora_32_V2
 build_flags = 
-  ${esp32_base.build_flags} -D HELTEC_V2_0 -I variants/heltec_v2
+  ${esp32_base.build_flags}
+  -D HELTEC_V2_0
+  -I variants/esp32/heltec_v2

variants/esp32/heltec_wireless_bridge/platformio.ini

@@ -4,7 +4,7 @@ extends = esp32_base
 board = heltec_wifi_lora_32
 build_flags = 
   ${esp32_base.build_flags}
-  -I variants/heltec_wireless_bridge
+  -I variants/esp32/heltec_wireless_bridge
   -D HELTEC_WIRELESS_BRIDGE
   -D BOARD_HAS_PSRAM
   -D RADIOLIB_EXCLUDE_LR11X0=1

variants/esp32/heltec_wsl_v2.1/platformio.ini

@@ -3,5 +3,7 @@ extends = esp32_base
 board = heltec_wireless_stick_lite
 board_level = extra
 build_flags =
-  ${esp32_base.build_flags} -D PRIVATE_HW -I variants/heltec_wsl_v2.1
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
+  ${esp32_base.build_flags}
+  -D PRIVATE_HW
+  -I variants/esp32/heltec_wsl_v2.1
+  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.

variants/esp32/m5stack_core/platformio.ini

@@ -5,7 +5,8 @@ monitor_filters = esp32_exception_decoder
 build_src_filter = 
   ${esp32_base.build_src_filter}
 build_flags = 
-  ${esp32_base.build_flags} -I variants/m5stack_core
+  ${esp32_base.build_flags}
+  -I variants/esp32/m5stack_core
   -DILI9341_DRIVER
   -DM5STACK
   -DUSER_SETUP_LOADED

variants/esp32/m5stack_coreink/platformio.ini

@@ -5,7 +5,8 @@ board_check = true
 build_src_filter = 
   ${esp32_base.build_src_filter}
 build_flags = 
-  ${esp32_base.build_flags} -I variants/m5stack_coreink
+  ${esp32_base.build_flags}
+  -I variants/esp32/m5stack_coreink
   ;-D RADIOLIB_VERBOSE
   -Ofast
   -D__MCUXPRESSO

variants/esp32/nano-g1-explorer/platformio.ini

@@ -5,4 +5,6 @@ board = ttgo-t-beam
 lib_deps =
   ${esp32_base.lib_deps}
 build_flags = 
-  ${esp32_base.build_flags} -D NANO_G1_EXPLORER  -I variants/nano-g1-explorer
+  ${esp32_base.build_flags}
+  -D NANO_G1_EXPLORER
+  -I variants/esp32/nano-g1-explorer

variants/esp32/nano-g1/platformio.ini

@@ -5,4 +5,6 @@ board = ttgo-t-beam
 lib_deps =
   ${esp32_base.lib_deps}
 build_flags = 
-  ${esp32_base.build_flags} -D NANO_G1  -I variants/nano-g1
+  ${esp32_base.build_flags}
+  -D NANO_G1
+  -I variants/esp32/nano-g1

variants/esp32/radiomaster_900_bandit/platformio.ini

@@ -8,7 +8,7 @@ build_flags =
   -DCONFIG_DISABLE_HAL_LOCKS=1
   -DHAS_STK8XXX=1
   -O2
-  -Ivariants/radiomaster_900_bandit
+  -I variants/esp32/radiomaster_900_bandit
 board_build.f_cpu = 240000000L
 upload_protocol = esptool
 lib_deps =

variants/esp32/radiomaster_900_bandit_micro/platformio.ini

@@ -12,8 +12,8 @@ build_flags =
   -DVTABLES_IN_FLASH=1
   -DCONFIG_DISABLE_HAL_LOCKS=1
   -O2
-  -Ivariants/radiomaster_900_bandit_nano
+  -I variants/esp32/radiomaster_900_bandit_nano
 board_build.f_cpu = 240000000L
 upload_protocol = esptool
 lib_deps =
-  ${esp32_base.lib_deps}
+  ${esp32_base.lib_deps}

variants/esp32/radiomaster_900_bandit_nano/platformio.ini

@@ -7,8 +7,8 @@ build_flags =
   -DVTABLES_IN_FLASH=1
   -DCONFIG_DISABLE_HAL_LOCKS=1
   -O2
-  -Ivariants/radiomaster_900_bandit_nano
+  -I variants/esp32/radiomaster_900_bandit_nano
 board_build.f_cpu = 240000000L
 upload_protocol = esptool
 lib_deps =
-  ${esp32_base.lib_deps}
+  ${esp32_base.lib_deps}

variants/esp32/rak11200/platformio.ini

@@ -3,5 +3,7 @@ extends = esp32_base
 board = wiscore_rak11200
 board_check = true
 build_flags = 
-  ${esp32_base.build_flags} -D RAK_11200 -I variants/rak11200
-upload_speed = 115200
+  ${esp32_base.build_flags}
+  -D RAK_11200
+  -I variants/esp32/rak11200
+upload_speed = 115200

variants/esp32/station-g1/platformio.ini

@@ -5,4 +5,6 @@ board = ttgo-t-beam
 lib_deps =
   ${esp32_base.lib_deps}
 build_flags = 
-  ${esp32_base.build_flags} -D STATION_G1  -I variants/station-g1
+  ${esp32_base.build_flags}
+  -D STATION_G1
+  -I variants/esp32/station-g1

variants/esp32/tbeam/platformio.ini

@@ -6,8 +6,10 @@ board_check = true
 lib_deps =
   ${esp32_base.lib_deps}
 build_flags = 
-  ${esp32_base.build_flags} -D TBEAM_V10  -I variants/tbeam
+  ${esp32_base.build_flags}
+  -D TBEAM_V10
+  -I variants/esp32/tbeam
   -DGPS_POWER_TOGGLE ; comment this line to disable double press function on the user button to turn off gps entirely.
   -DBOARD_HAS_PSRAM
   -mfix-esp32-psram-cache-issue
-upload_speed = 921600
+upload_speed = 921600

variants/esp32/tbeam_v07/platformio.ini

@@ -4,4 +4,6 @@ board_level = extra
 extends = esp32_base
 board = ttgo-t-beam
 build_flags = 
-  ${esp32_base.build_flags} -D TBEAM_V07 -I variants/tbeam_v07
+  ${esp32_base.build_flags}
+  -D TBEAM_V07
+  -I variants/esp32/tbeam_v07

variants/esp32/tlora_v1/platformio.ini

@@ -3,5 +3,7 @@ board_level = extra
 extends = esp32_base
 board = ttgo-lora32-v1
 build_flags = 
-  ${esp32_base.build_flags} -D TLORA_V1 -I variants/tlora_v1
-upload_speed = 115200
+  ${esp32_base.build_flags}
+  -D TLORA_V1
+  -I variants/esp32/tlora_v1
+upload_speed = 115200

variants/esp32/tlora_v1_3/platformio.ini

@@ -3,5 +3,5 @@ board_level = extra
 extends = esp32_base
 board = ttgo-lora32-v1
 build_flags = 
-  ${esp32_base.build_flags} -D TLORA_V1_3 -I variants/tlora_v1_3
-upload_speed = 115200
+  ${esp32_base.build_flags} -D TLORA_V1_3 -I variants/esp32/tlora_v1_3
+upload_speed = 115200

variants/esp32/tlora_v2/platformio.ini

@@ -3,4 +3,6 @@ board_level = extra
 extends = esp32_base
 board = ttgo-lora32-v1
 build_flags = 
-  ${esp32_base.build_flags} -D TLORA_V2 -I variants/tlora_v2
+  ${esp32_base.build_flags}
+  -D TLORA_V2
+  -I variants/esp32/tlora_v2

variants/esp32/tlora_v2_1_16/platformio.ini

@@ -3,6 +3,6 @@ extends = esp32_base
 board = ttgo-lora32-v21
 board_check = true
 build_flags = 
-  ${esp32_base.build_flags} -D TLORA_V2_1_16 -I variants/tlora_v2_1_16
+  ${esp32_base.build_flags} -D TLORA_V2_1_16 -I variants/esp32/tlora_v2_1_16
   -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
-upload_speed = 115200
+upload_speed = 115200

variants/esp32/tlora_v2_1_16_tcxo/platformio.ini

@@ -5,7 +5,7 @@ board = ttgo-lora32-v21
 build_flags = 
   ${esp32_base.build_flags}
   -D TLORA_V2_1_16
-  -I variants/tlora_v2_1_16
+  -I variants/esp32/tlora_v2_1_16
   -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -D LORA_TCXO_GPIO=33
 upload_speed = 115200

variants/esp32/tlora_v2_1_18/platformio.ini

@@ -4,4 +4,6 @@ board_level = extra
 board = ttgo-lora32-v21
 
 build_flags = 
-  ${esp32_base.build_flags} -D TLORA_V2_1_18 -I variants/tlora_v2_1_18
+  ${esp32_base.build_flags}
+  -D TLORA_V2_1_18
+  -I variants/esp32/tlora_v2_1_18

variants/esp32/tlora_v3_3_0_tcxo/platformio.ini

@@ -4,7 +4,7 @@ board = ttgo-lora32-v21
 build_flags = 
   ${esp32_base.build_flags}
   -D TLORA_V2_1_16
-  -I variants/tlora_v2_1_16
+  -I variants/esp32/tlora_v2_1_16
   -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -D LORA_TCXO_GPIO=12
   -D BUTTON_PIN=0

variants/esp32/trackerd/platformio.ini

@@ -4,5 +4,5 @@ board = pico32
 board_build.f_flash = 80000000L
 
 build_flags = 
-  ${esp32_base.build_flags} -D PRIVATE_HW -I variants/trackerd -D BSFILE=\"boards/dragino_lbt2.h\"
+  ${esp32_base.build_flags} -D PRIVATE_HW -I variants/esp32/trackerd -D BSFILE=\"boards/dragino_lbt2.h\"
 ;board_build.partitions = no_ota.csv

variants/esp32/wiphone/platformio.ini

@@ -5,7 +5,9 @@ board_level = extra
 monitor_filters = esp32_exception_decoder
 board_build.partitions = default_16MB.csv
 build_flags = 
-  ${esp32_base.build_flags} -D WIPHONE -I variants/wiphone
+  ${esp32_base.build_flags}
+  -D WIPHONE
+  -I variants/esp32/wiphone
 lib_deps = 
   ${esp32_base.lib_deps}
   lovyan03/LovyanGFX@^1.2.0

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

variants/esp32s3/CDEBYTE_EoRa-S3/platformio.ini

@@ -4,5 +4,5 @@ board = CDEBYTE_EoRa-S3
 build_flags =
   ${esp32s3_base.build_flags}
   -D CDEBYTE_EORA_S3
-  -I variants/CDEBYTE_EoRa-S3
-  -D GPS_POWER_TOGGLE
+  -I variants/esp32s3/CDEBYTE_EoRa-S3
+  -D GPS_POWER_TOGGLE

variants/esp32s3/EBYTE_ESP32-S3/platformio.ini

@@ -6,4 +6,4 @@ board_level = extra
 build_flags =
   ${esp32s3_base.build_flags}
   -D EBYTE_ESP32_S3
-  -I variants/EBYTE_ESP32-S3
+  -I variants/esp32s3/EBYTE_ESP32-S3

variants/esp32s3/ELECROW-ThinkNode-M2/platformio.ini

@@ -4,4 +4,4 @@ board = ESP32-S3-WROOM-1-N4
 build_flags =
   ${esp32s3_base.build_flags}
   -D ELECROW_ThinkNode_M2
-  -I variants/ELECROW-ThinkNode-M2
+  -I variants/esp32s3/ELECROW-ThinkNode-M2

variants/esp32s3/bpi_picow_esp32_s3/platformio.ini

@@ -11,4 +11,6 @@ lib_deps =
   ${esp32_base.lib_deps}
   caveman99/ESP32 Codec2@^1.0.1
 build_flags = 
-  ${esp32_base.build_flags} -D PRIVATE_HW -I variants/bpi_picow_esp32_s3
+  ${esp32_base.build_flags}
+  -D PRIVATE_HW
+  -I variants/esp32s3/bpi_picow_esp32_s3

variants/esp32s3/crowpanel-esp32s3-5-epaper/platformio.ini

@@ -11,7 +11,9 @@ board = esp32-s3-devkitc-1
 board_level = extra
 upload_protocol = esptool
 build_flags = 
-  ${esp32s3_base.build_flags} -D CROWPANEL_ESP32S3_5_EPAPER -I variants/crowpanel-esp32s3-5-epaper
+  ${esp32s3_base.build_flags}
+  -D CROWPANEL_ESP32S3_5_EPAPER
+  -I variants/esp32s3/crowpanel-esp32s3-5-epaper
   -D PRIVATE_HW
   -DBOARD_HAS_PSRAM
   -DGPS_POWER_TOGGLE
@@ -39,7 +41,9 @@ board = esp32-s3-devkitc-1
 board_level = extra
 upload_protocol = esptool
 build_flags = 
-  ${esp32s3_base.build_flags} -D CROWPANEL_ESP32S3_4_EPAPER -I variants/crowpanel-esp32s3-5-epaper
+  ${esp32s3_base.build_flags}
+  -D CROWPANEL_ESP32S3_4_EPAPER
+  -I variants/esp32s3/crowpanel-esp32s3-5-epaper
   -D PRIVATE_HW
   -DBOARD_HAS_PSRAM
   -DGPS_POWER_TOGGLE
@@ -67,7 +71,9 @@ board = esp32-s3-devkitc-1
 board_level = extra
 upload_protocol = esptool
 build_flags = 
-  ${esp32s3_base.build_flags} -D CROWPANEL_ESP32S3_2_EPAPER -I variants/crowpanel-esp32s3-5-epaper
+  ${esp32s3_base.build_flags}
+  -D CROWPANEL_ESP32S3_2_EPAPER
+  -I variants/esp32s3/crowpanel-esp32s3-5-epaper
   -D PRIVATE_HW
   -DBOARD_HAS_PSRAM
   -DGPS_POWER_TOGGLE