From f99f8421b5f0ffa8202c644b96dd7a81ef7214c4 Mon Sep 17 00:00:00 2001
From: richonguzman <richon2001@hotmail.com>
Date: Thu, 16 May 2024 12:48:37 -0400
Subject: [PATCH] T-deck cleanup

---
 platformio.ini      | 82 ++++++++++++++++++++++++---------------------
 src/boards_pinout.h | 52 +++++++++++++++-------------
 2 files changed, 71 insertions(+), 63 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 6ee20f6..07541ab 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -217,6 +217,7 @@ extends = env:esp32
 board = esp32-s3-devkitc-1
 board_build.mcu = esp32s3
 build_flags =
+	-Werror -Wall
     -DTTGO_T_Beam_S3_SUPREME_V3
     -DBOARD_HAS_PSRAM
 	-DHAS_SX1262
@@ -231,6 +232,48 @@ lib_deps =
 	adafruit/Adafruit SH110X@^2.1.8
 
 
+[env:ttgo_t_deck_GPS]
+extends = env:esp32
+board = esp32-s3-devkitc-1
+board_build.mcu = esp32s3
+build_flags =
+	-Werror -Wall
+	-DTTGO_T_DECK_GPS
+	-DHAS_SX1262
+	-DHAS_TFT
+	-DBOARD_HAS_PSRAM
+    -DUSER_SETUP_LOADED
+    -DST7789_DRIVER
+	-DTFT_WIDTH=240
+	-DTFT_HEIGHT=320
+    -DTFT_RGB_ORDER=TFT_BGR
+    -DTFT_INVERSION_ON
+    -DTFT_MISO=38
+    -DTFT_MOSI=41
+    -DTFT_SCLK=40
+    -DTFT_CS=12
+    -DTFT_DC=11
+    -DTFT_RST=-1
+	-DTFT_BUSY=-1
+	-DTFT_BL=42
+	-DTFT_BACKLIGHT_ON=1
+    -DTOUCH_CS=-1
+    -DLOAD_GLCD
+    -DLOAD_FONT2
+    -DLOAD_FONT4
+    -DLOAD_FONT6
+    -DLOAD_FONT7
+    -DLOAD_FONT8
+    -DSPI_FREQUENCY=40000000
+    -DSPI_READ_FREQUENCY=16000000
+	-DARDUINO_USB_MODE=1
+	-DARDUINO_USB_CDC_ON_BOOT=1
+lib_deps =
+	${common.lib_deps}
+	bodmer/TFT_eSPI@^2.5.43
+
+
+
 [env:ESP32_DIY_LoRa_GPS]
 extends = env:esp32
 board = esp32dev
@@ -305,42 +348,3 @@ lib_deps =
 
 
 
-[env:ttgo_t_deck_gps]
-extends = env:esp32
-board = esp32-s3-devkitc-1
-board_build.mcu = esp32s3
-build_flags =
-	-DTTGO_T_DECK_GPS
-	-DHAS_SX1262
-	-DHAS_TFT
-	-DBOARD_HAS_PSRAM
-    -DUSER_SETUP_LOADED
-    -DST7789_DRIVER
-	-DTFT_WIDTH=240
-	-DTFT_HEIGHT=320
-    -DTFT_RGB_ORDER=TFT_BGR
-    -DTFT_INVERSION_ON
-    -DTFT_MISO=38
-    -DTFT_MOSI=41
-    -DTFT_SCLK=40
-    -DTFT_CS=12
-    -DTFT_DC=11
-    -DTFT_RST=-1
-	-DTFT_BUSY=-1
-	-DTFT_BL=42
-	-DTFT_BACKLIGHT_ON=1
-    -DTOUCH_CS=-1
-    -DLOAD_GLCD
-    -DLOAD_FONT2
-    -DLOAD_FONT4
-    -DLOAD_FONT6
-    -DLOAD_FONT7
-    -DLOAD_FONT8
-    -DSPI_FREQUENCY=40000000
-    -DSPI_READ_FREQUENCY=16000000
-	-DARDUINO_USB_MODE=1
-	-DARDUINO_USB_CDC_ON_BOOT=1
-lib_deps =
-	${common.lib_deps}
-	jgromes/RadioLib @ 6.1.0
-	bodmer/TFT_eSPI@^2.5.43
\ No newline at end of file
diff --git a/src/boards_pinout.h b/src/boards_pinout.h
index 16422ff..66cc357 100644
--- a/src/boards_pinout.h
+++ b/src/boards_pinout.h
@@ -139,6 +139,33 @@
 #endif
 
 
+#ifdef TTGO_T_DECK_GPS
+    #define GPS_RX              43
+    #define GPS_TX              44
+    #define BOARD_POWERON       10
+    #define BOARD_SDCARD_CS     39
+    #define BATTERY_PIN         4
+    #define BOARD_I2C_SDA       18
+    #define BOARD_I2C_SCL       8
+    #define RADIO_SCLK_PIN      40
+    #define RADIO_MISO_PIN      38
+    #define RADIO_MOSI_PIN      41
+    #define RADIO_CS_PIN        9
+    #define RADIO_RST_PIN       17
+    #define RADIO_DIO1_PIN      45
+    #define RADIO_BUSY_PIN      13
+    #define TrackBallCenter     0
+    #define TrackBallUp         3   // G S1
+    #define TrackBallDown       15  // G S3
+    #define TrackBallLeft       1   // G S4
+    #define TrackBallRight      2   // G S2
+    /*#define BOARD_I2S_WS    5     // esto es para el audio!
+    #define BOARD_I2S_BCK   7
+    #define BOARD_I2S_DOUT  6*/
+#endif
+
+
+
 #ifdef ESP32_DIY_1W_LoRa_GPS
     #define OLED_SDA            21
     #define OLED_SCL            22
@@ -204,29 +231,6 @@
 
 
 
-#ifdef TTGO_T_DECK_GPS
-    #define GPS_RX              43
-    #define GPS_TX              44
-    #define BOARD_POWERON       10
-    #define BOARD_SDCARD_CS     39
-    #define BATTERY_PIN         4
-    #define BOARD_I2C_SDA       18
-    #define BOARD_I2C_SCL       8
-    #define RADIO_SCLK_PIN      40
-    #define RADIO_MISO_PIN      38
-    #define RADIO_MOSI_PIN      41
-    #define RADIO_CS_PIN        9
-    #define RADIO_RST_PIN       17
-    #define RADIO_DIO1_PIN      45
-    #define RADIO_BUSY_PIN      13
-    #define TrackBallCenter     0
-    #define TrackBallUp         3   // G S1
-    #define TrackBallDown       15  // G S3
-    #define TrackBallLeft       1   // G S4
-    #define TrackBallRight      2   // G S2
-    /*#define BOARD_I2S_WS    5     // esto es para el audio!
-    #define BOARD_I2S_BCK   7
-    #define BOARD_I2S_DOUT  6*/
-#endif
+
 
 #endif
\ No newline at end of file