From 371317c35211f74ae6bf5530ffaa60a15e3bcc2c Mon Sep 17 00:00:00 2001
From: richonguzman <richon2001@hotmail.com>
Date: Tue, 7 Jan 2025 16:33:18 -0300
Subject: [PATCH] troy board added

---
 .github/workflows/build.yml |  2 ++
 README.md                   |  1 +
 src/LoRa_APRS_Tracker.cpp   |  2 +-
 src/display.cpp             | 14 ++++++--------
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f610c62..c342b8b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -77,6 +77,8 @@ jobs:
                       chip: esp32c3
                     - name: QRPLabs_LightTracker_Plus_1_0
                       chip: esp32s3
+                    - name: TROY_LoRa_APRS
+                      chip: esp32
         steps:
             - uses: actions/checkout@v3
 
diff --git a/README.md b/README.md
index 8a78d59..4c22be9 100644
--- a/README.md
+++ b/README.md
@@ -53,6 +53,7 @@ ____________________________________________________
 ____________________________________________________
 ## Timeline (Versions):
 
+- 2025.01.07 TROY_LoRa_APRS board added.
 - 2025.01.02 Buttons added for DIY Boards and Boards without buttons.
 - 2024.11.13 Added Heltec Wireless Stick Lite V3 + GPS + Oled Display support for another DIY ESP32 Tracker.
 - 2024.11.13 T-Deck Joystick and Button Pressing Fix for smother operation.
diff --git a/src/LoRa_APRS_Tracker.cpp b/src/LoRa_APRS_Tracker.cpp
index 7dfa0bf..11c97d8 100644
--- a/src/LoRa_APRS_Tracker.cpp
+++ b/src/LoRa_APRS_Tracker.cpp
@@ -57,7 +57,7 @@ TinyGPSPlus                         gps;
     BluetoothSerial                 SerialBT;
 #endif
 
-String      versionDate             = "2025.01.06";
+String      versionDate             = "2025.01.07";
 
 uint8_t     myBeaconsIndex          = 0;
 int         myBeaconsSize           = Config.beacons.size();
diff --git a/src/display.cpp b/src/display.cpp
index b14b041..7d38f26 100644
--- a/src/display.cpp
+++ b/src/display.cpp
@@ -88,7 +88,7 @@ bool        symbolAvailable         = true;
 extern logging::Logger logger;
 
 
-#if defined(HAS_TFT) && (defined(TTGO_T_DECK_PLUS) || defined(TTGO_T_DECK_GPS))
+#if defined(HAS_TFT) && (defined(TTGO_T_DECK_GPS) || defined(TTGO_T_DECK_PLUS))
     void drawButton(int xPos, int yPos, int wide, int height, String buttonText, int color) {
         uint16_t baseColor, lightColor, darkColor;
         switch (color) {
@@ -323,7 +323,7 @@ void displaySetup() {
         //analogWrite(BOARD_BL_PIN, brightnessValues[tftBrightness]);
         tft.setTextFont(0);
         tft.fillScreen(TFT_BLACK);
-        #if defined(TTGO_T_DECK_PLUS) || defined(TTGO_T_DECK_GPS)
+        #if defined(TTGO_T_DECK_GPS) || defined(TTGO_T_DECK_PLUS)
             sprite.createSprite(320,240);
         #else
             sprite.createSprite(160,80);
@@ -345,14 +345,12 @@ void displaySetup() {
         #ifdef ssd1306
             if (!display.begin(SSD1306_SWITCHCAPVCC, 0x3c, false, false)) {
                 logger.log(logging::LoggerLevel::LOGGER_LEVEL_ERROR, "SSD1306", "allocation failed!");
-                while (true) {
-                }
+                while (true) {}
             }
         #else
             if (!display.begin(0x3c, false)) {
                 logger.log(logging::LoggerLevel::LOGGER_LEVEL_ERROR, "SH1106", "allocation failed!");
-                while (true) {
-                }
+                while (true) {}
             }
         #endif
         if (Config.display.turn180) display.setRotation(2);
@@ -400,7 +398,7 @@ void displayToggle(bool toggle) {
 
 void displayShow(const String& header, const String& line1, const String& line2, int wait) {
     #ifdef HAS_TFT
-        #if defined(TTGO_T_DECK_PLUS) || defined(TTGO_T_DECK_GPS)
+        #if defined(TTGO_T_DECK_GPS) || defined(TTGO_T_DECK_PLUS)
             draw_T_DECK_Top();
             String tftLine1, tftLine2, tftLine3, tftLine4;
             if (line1.length() > 22 && line2.length() > 22) {
@@ -492,7 +490,7 @@ void drawSymbol(int symbolIndex, bool bluetoothActive) {
 void displayShow(const String& header, const String& line1, const String& line2, const String& line3, const String& line4, const String& line5, int wait) {
     #ifdef HAS_TFT
         #if defined(TTGO_T_DECK_GPS) || defined(TTGO_T_DECK_PLUS)
-            draw_T_DECK_Top();//header, line1, line2);
+            draw_T_DECK_Top();
             draw_T_DECK_Body(header, line1, line2, line3, line4, line5);
         #endif
         #if defined(HELTEC_WIRELESS_TRACKER)