From 06a60ad9ccef9406cc764ad43eec4f3758eb31c2 Mon Sep 17 00:00:00 2001
From: richonguzman <richon2001@hotmail.com>
Date: Thu, 16 May 2024 12:35:21 -0400
Subject: [PATCH] tbeam supreme cleanup

---
 platformio.ini      | 38 ++++++++++++++++++++------------------
 src/boards_pinout.h | 35 +++++++++++++++++++----------------
 2 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 76ad692..6ee20f6 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -212,6 +212,25 @@ lib_deps =
 	bodmer/TFT_eSPI@^2.5.43
 
 
+[env:ttgo_t_beam_s3_SUPREME_v3]
+extends = env:esp32
+board = esp32-s3-devkitc-1
+board_build.mcu = esp32s3
+build_flags =
+    -DTTGO_T_Beam_S3_SUPREME_V3
+    -DBOARD_HAS_PSRAM
+	-DHAS_SX1262
+	-DHAS_AXP2101
+	-DARDUINO_USB_MODE=1
+    -DARDUINO_USB_CDC_ON_BOOT=1
+lib_deps =
+  	${common.lib_deps}
+  	lewisxhe/XPowersLib@^0.1.8
+	adafruit/Adafruit GFX Library @ 1.11.7
+	adafruit/Adafruit SSD1306 @ 2.5.7
+	adafruit/Adafruit SH110X@^2.1.8
+
+
 [env:ESP32_DIY_LoRa_GPS]
 extends = env:esp32
 board = esp32dev
@@ -246,24 +265,7 @@ lib_deps =
 	adafruit/Adafruit SH110X@^2.1.8
 
 
-[env:ttgo_t_beam_S3_SUPREME_V3]
-extends = env:esp32
-board = esp32-s3-devkitc-1
-board_build.mcu = esp32s3
-build_flags =
-    -DTTGO_T_Beam_S3_SUPREME_V3
-    -DBOARD_HAS_PSRAM
-	-DHAS_SX1262
-	-DHAS_AXP2101
-	-DARDUINO_USB_MODE=1
-    -DARDUINO_USB_CDC_ON_BOOT=1
-lib_deps =
-  	${common.lib_deps}
-  	lewisxhe/XPowersLib@^0.1.8
-  	jgromes/RadioLib @ 6.1.0
-	adafruit/Adafruit GFX Library @ 1.11.7
-	adafruit/Adafruit SSD1306 @ 2.5.7
-	adafruit/Adafruit SH110X@^2.1.8
+
 
 
 [env:OE5HWN_MeshCom]
diff --git a/src/boards_pinout.h b/src/boards_pinout.h
index f268b8e..16422ff 100644
--- a/src/boards_pinout.h
+++ b/src/boards_pinout.h
@@ -121,6 +121,24 @@
 #endif
 
 
+#ifdef TTGO_T_Beam_S3_SUPREME_V3
+    #define OLED_SDA            17
+    #define OLED_SCL            18
+    #define OLED_RST            16
+    #define GPS_RX              8
+    #define GPS_TX              9
+    #define BUTTON_PIN          0
+    #define RADIO_SCLK_PIN      12
+    #define RADIO_MISO_PIN      13
+    #define RADIO_MOSI_PIN      11
+    #define RADIO_CS_PIN        10
+    #define RADIO_DIO0_PIN      -1
+    #define RADIO_RST_PIN       5
+    #define RADIO_DIO1_PIN      1
+    #define RADIO_BUSY_PIN      4
+#endif
+
+
 #ifdef ESP32_DIY_1W_LoRa_GPS
     #define OLED_SDA            21
     #define OLED_SCL            22
@@ -141,22 +159,7 @@
 #endif
 
 
-#ifdef TTGO_T_Beam_S3_SUPREME_V3
-    #define OLED_SDA            17
-    #define OLED_SCL            18
-    #define OLED_RST            16
-    #define GPS_RX              8
-    #define GPS_TX              9
-    #define BUTTON_PIN          0
-    #define RADIO_SCLK_PIN      12
-    #define RADIO_MISO_PIN      13
-    #define RADIO_MOSI_PIN      11
-    #define RADIO_CS_PIN        10
-    #define RADIO_DIO0_PIN      -1
-    #define RADIO_RST_PIN       5
-    #define RADIO_DIO1_PIN      1
-    #define RADIO_BUSY_PIN      4
-#endif
+
 
 
 #ifdef OE5HWN_MeshCom