From cc7f40bdf11d179149c410bfa3da71113ea7c214 Mon Sep 17 00:00:00 2001
From: vidplace7 <vidplace7@gmail.com>
Date: Mon, 21 Jul 2025 10:19:41 -0400
Subject: [PATCH] Migrate remaining variants to new dir structure

---
 platformio.ini                                           | 1 -
 variants/{ => esp32c6}/tlora_c6/platformio.ini           | 2 +-
 variants/{ => esp32c6}/tlora_c6/variant.h                | 0
 variants/{ => esp32s3}/mesh-tab/pins_arduino.h           | 0
 variants/{ => esp32s3}/mesh-tab/platformio.ini           | 2 +-
 variants/{ => esp32s3}/mesh-tab/variant.h                | 0
 variants/{ => native}/portduino-buildroot/platformio.ini | 2 +-
 variants/{ => native}/portduino-buildroot/variant.h      | 0
 variants/{ => native}/portduino/platformio.ini           | 2 +-
 variants/{ => native}/portduino/variant.h                | 0
 10 files changed, 4 insertions(+), 5 deletions(-)
 rename variants/{ => esp32c6}/tlora_c6/platformio.ini (85%)
 rename variants/{ => esp32c6}/tlora_c6/variant.h (100%)
 rename variants/{ => esp32s3}/mesh-tab/pins_arduino.h (100%)
 rename variants/{ => esp32s3}/mesh-tab/platformio.ini (99%)
 rename variants/{ => esp32s3}/mesh-tab/variant.h (100%)
 rename variants/{ => native}/portduino-buildroot/platformio.ini (75%)
 rename variants/{ => native}/portduino-buildroot/variant.h (100%)
 rename variants/{ => native}/portduino/platformio.ini (97%)
 rename variants/{ => native}/portduino/variant.h (100%)

diff --git a/platformio.ini b/platformio.ini
index c0eb6fedb..ad7100efd 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -6,7 +6,6 @@ default_envs = tbeam
 
 extra_configs =
 	arch/*/*.ini
-	variants/*/platformio.ini ; Remove when all variants migrated to new dir structure
 	variants/*/*/platformio.ini
 	variants/*/diy/*/platformio.ini
 	src/graphics/niche/InkHUD/PlatformioConfig.ini
diff --git a/variants/tlora_c6/platformio.ini b/variants/esp32c6/tlora_c6/platformio.ini
similarity index 85%
rename from variants/tlora_c6/platformio.ini
rename to variants/esp32c6/tlora_c6/platformio.ini
index 2da10138a..a06306add 100644
--- a/variants/tlora_c6/platformio.ini
+++ b/variants/esp32c6/tlora_c6/platformio.ini
@@ -4,6 +4,6 @@ board = esp32-c6-devkitm-1
 build_flags = 
   ${esp32c6_base.build_flags}
   -D TLORA_C6
-  -I variants/tlora_c6
+  -I variants/esp32c6/tlora_c6
   -DARDUINO_USB_CDC_ON_BOOT=1
   -DARDUINO_USB_MODE=1
diff --git a/variants/tlora_c6/variant.h b/variants/esp32c6/tlora_c6/variant.h
similarity index 100%
rename from variants/tlora_c6/variant.h
rename to variants/esp32c6/tlora_c6/variant.h
diff --git a/variants/mesh-tab/pins_arduino.h b/variants/esp32s3/mesh-tab/pins_arduino.h
similarity index 100%
rename from variants/mesh-tab/pins_arduino.h
rename to variants/esp32s3/mesh-tab/pins_arduino.h
diff --git a/variants/mesh-tab/platformio.ini b/variants/esp32s3/mesh-tab/platformio.ini
similarity index 99%
rename from variants/mesh-tab/platformio.ini
rename to variants/esp32s3/mesh-tab/platformio.ini
index 52f9fc13c..e21bc38e1 100644
--- a/variants/mesh-tab/platformio.ini
+++ b/variants/esp32s3/mesh-tab/platformio.ini
@@ -45,7 +45,7 @@ build_flags = ${esp32s3_base.build_flags}
   -D LGFX_TOUCH_INT=41
   -D VIEW_320x240
   -D USE_PACKET_API
-  -I variants/mesh-tab
+  -I variants/esp32s3/mesh-tab
 build_src_filter = ${esp32_base.build_src_filter}
 lib_deps =
   ${esp32_base.lib_deps}
diff --git a/variants/mesh-tab/variant.h b/variants/esp32s3/mesh-tab/variant.h
similarity index 100%
rename from variants/mesh-tab/variant.h
rename to variants/esp32s3/mesh-tab/variant.h
diff --git a/variants/portduino-buildroot/platformio.ini b/variants/native/portduino-buildroot/platformio.ini
similarity index 75%
rename from variants/portduino-buildroot/platformio.ini
rename to variants/native/portduino-buildroot/platformio.ini
index 3fbd26910..d1bd39e10 100644
--- a/variants/portduino-buildroot/platformio.ini
+++ b/variants/native/portduino-buildroot/platformio.ini
@@ -2,7 +2,7 @@
 extends = portduino_base
 ; Optional libraries should be appended to `PLATFORMIO_BUILD_FLAGS`
 ; environment variable in the buildroot environment.
-build_flags = ${portduino_base.build_flags} -O0 -I variants/portduino-buildroot
+build_flags = ${portduino_base.build_flags} -O0 -I variants/native/portduino-buildroot
 board = buildroot
 lib_deps = ${portduino_base.lib_deps}
 build_src_filter = ${portduino_base.build_src_filter}
\ No newline at end of file
diff --git a/variants/portduino-buildroot/variant.h b/variants/native/portduino-buildroot/variant.h
similarity index 100%
rename from variants/portduino-buildroot/variant.h
rename to variants/native/portduino-buildroot/variant.h
diff --git a/variants/portduino/platformio.ini b/variants/native/portduino/platformio.ini
similarity index 97%
rename from variants/portduino/platformio.ini
rename to variants/native/portduino/platformio.ini
index 5293b12b9..732b2a1d4 100644
--- a/variants/portduino/platformio.ini
+++ b/variants/native/portduino/platformio.ini
@@ -1,6 +1,6 @@
 [native_base]
 extends = portduino_base
-build_flags = ${portduino_base.build_flags} -I variants/portduino
+build_flags = ${portduino_base.build_flags} -I variants/native/portduino
   -D ARCH_PORTDUINO
   -I /usr/include
 board = cross_platform
diff --git a/variants/portduino/variant.h b/variants/native/portduino/variant.h
similarity index 100%
rename from variants/portduino/variant.h
rename to variants/native/portduino/variant.h