version and readme UPDATE

.github/workflows/build.yml

@@ -21,6 +21,8 @@ jobs:
                       chip: esp32
                     - name: heltec_wifi_lora_32_V3
                       chip: esp32s3
+                    - name: heltec_wifi_lora_32_V3_2
+                      chip: esp32s3
                     - name: heltec_wireless_stick
                       chip: esp32s3
                     - name: heltec_wireless_stick_lite_v3
@@ -78,7 +80,9 @@ jobs:
                     - name: QRPLabs_LightGateway_1_0
                       chip: esp32s3
                     - name: XIAO_ESP32S3_WIO_SX1262
-                      chip: esp32s3                    
+                      chip: esp32s3
+                    - name: TROY_LoRa_APRS
+                      chip: esp32                    
         steps:
             - uses: actions/checkout@v3
 

README.md

@@ -52,6 +52,11 @@ ____________________________________________________
 
 ## Timeline (Versions):
 
+- 2025.01.11 Added HELTEC V3.2 board support.
+- 2025.01.07 TROY_LoRa_APRS board added. GMT in quarter hour fix and Beacon fix for TNC.
+- 2025.01.02 Callsign Black List added.
+- 2024.12.30 Fixed missing validation for correct Digipeater mode when not connected to APRS-IS.
+- 2024.12.06 APRS-IS connnection and passcode validation added.
 - 2024.11.06 (Silent Update) Working now with Board "VARIANTS".
 - 2024.10.29 Added LILYGO Lora32 T3S3 support.
 - 2024.10.25 Added QRP Labs LightGateway 1.0 support.

data/igate_conf.json

@@ -56,7 +56,7 @@
         "externalSleepVoltage": 10.9,
         "voltageDividerR1": 100.0,
         "voltageDividerR2": 27.0,
-        "sendVoltageAsTelemetry": true
+        "sendVoltageAsTelemetry": false
 	},
     "wxsensor": {
         "active": false,
@@ -65,8 +65,8 @@
 	},
     "syslog": {
         "active": false,
-        "server": "192.168.0.100",
-        "port": 514
+        "server": "lora.link9.net",
+        "port": 1514
     },
     "tnc": {
         "enableServer": false,
@@ -82,7 +82,7 @@
         "password": ""
     },
     "ntp": {
-        "gmtCorrection": 0
+        "gmtCorrection": 0.0
     },
     "other": {
         "rememberStationTime": 30,
@@ -92,5 +92,6 @@
         "rebootMode": false,
         "rebootModeTime": 6
     },
-    "personalNote": ""
+    "personalNote": "",
+    "blackList": ""
 }

data_embed/index.html

@@ -573,6 +573,47 @@
                         </div>
                         <hr />
 
+                        <div class="row my-5 d-flex align-items-top">
+                            <div class="col-lg-3 col-sm-12">
+                                <h5>
+                                    <svg
+                                        xmlns="http://www.w3.org/2000/svg"
+                                        width="20"
+                                        height="20"
+                                        fill="currentColor"
+                                        class="bi bi-broadcast-pin"
+                                        viewBox="0 0 16 16"
+                                    >
+                                        <path
+                                            d="M3.05 3.05a7 7 0 0 0 0 9.9.5.5 0 0 1-.707.707 8 8 0 0 1 0-11.314.5.5 0 0 1 .707.707m2.122 2.122a4 4 0 0 0 0 5.656.5.5 0 1 1-.708.708 5 5 0 0 1 0-7.072.5.5 0 0 1 .708.708m5.656-.708a.5.5 0 0 1 .708 0 5 5 0 0 1 0 7.072.5.5 0 1 1-.708-.708 4 4 0 0 0 0-5.656.5.5 0 0 1 0-.708m2.122-2.12a.5.5 0 0 1 .707 0 8 8 0 0 1 0 11.313.5.5 0 0 1-.707-.707 7 7 0 0 0 0-9.9.5.5 0 0 1 0-.707zM6 8a2 2 0 1 1 2.5 1.937V15.5a.5.5 0 0 1-1 0V9.937A2 2 0 0 1 6 8"
+                                        />
+                                    </svg>
+                                    Black List
+                                </h5>
+                                <small>Add Callsigns with space between them to Black List them (* wild card allowed)</small>
+                            </div>
+                            <div class="col-9 mt-2">
+                                <div class="row">
+                                    <div class="col-12">
+                                        <label
+                                            for="blackList"
+                                            class="form-label"
+                                            >Black List</label
+                                        >
+                                        <input
+                                            type="text"
+                                            name="blackList"
+                                            id="blackList"
+                                            class="form-control"
+                                            placeholder="Station Callsign"
+                                            oninput="this.value = this.value.toUpperCase();"
+                                        />
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <hr />
+
                         <div class="row my-5 d-flex align-items-top">
                             <div class="col-lg-3 col-sm-12">
                                 <h5>
@@ -1703,9 +1744,9 @@
                                             id="ntp.gmtCorrection"
                                             placeholder="0"
                                             class="form-control"
-                                            step="1"
-                                            min="-23"
-                                            max="23"
+                                            step="0.25"
+                                            min="-23.75"
+                                            max="23.75"
                                         />
                                         <span class="input-group-text"
                                             >hours</span

data_embed/script.js

@@ -137,6 +137,9 @@ function loadSettings(settings) {
     document.getElementById("beacon.gpsActive").checked                 = settings.beacon.gpsActive;
     document.getElementById("beacon.gpsAmbiguity").checked              = settings.beacon.gpsAmbiguity;
 
+    // Black List
+    document.getElementById("blackList").value                          = settings.blackList;
+
     // Digi
     document.getElementById("digi.mode").value                          = settings.digi.mode;
     document.getElementById("digi.ecoMode").checked                     = settings.digi.ecoMode;

include/configuration.h

@@ -50,7 +50,6 @@ public:
     bool    ecoMode;
 };
 
-
 class LoraModule {
 public:
     long    txFreq;
@@ -120,11 +119,10 @@ public:
 
 class NTP {
 public:
-    int     gmtCorrection;
+    float   gmtCorrection;
 };
 
 
-
 class Configuration {
 public:
     String                  callsign;
@@ -135,6 +133,7 @@ public:
     bool                    rebootMode;
     int                     rebootModeTime;
     String                  personalNote;
+    String                  blackList;
     std::vector<WiFi_AP>    wifiAPs;
     WiFi_Auto_AP            wifiAutoAP;
     BEACON                  beacon;

include/station_utils.h

@@ -18,6 +18,8 @@ struct LastHeardStation {
 
 namespace STATION_Utils {
 
+    void loadBlackList();
+    bool checkBlackList(const String& callsign);
     void deleteNotHeard();
     void updateLastHeard(const String& station);
     bool wasHeard(const String& station);

src/LoRa_APRS_iGate.cpp

@@ -48,7 +48,7 @@ ___________________________________________________________________*/
     #include "A7670_utils.h"
 #endif
 
-String              versionDate             = "2024.12.06";
+String              versionDate             = "2025.01.11";
 Configuration       Config;
 WiFiClient          espClient;
 #ifdef HAS_GPS
@@ -79,6 +79,7 @@ void setup() {
     LoRa_Utils::setup();
     Utils::validateFreqs();
     GPS_Utils::setup();
+    STATION_Utils::loadBlackList();
 
     #ifdef STARTUP_DELAY    // (TEST) just to wait for WiFi init of Routers
         displayShow("", "  STARTUP DELAY ...", "", "", 0);

src/aprs_is_utils.cpp

@@ -178,7 +178,7 @@ namespace APRS_IS_Utils {
                     int firstColonIndex = packet.indexOf(":");
                     if (firstColonIndex > 5 && firstColonIndex < (packet.length() - 1) && packet[firstColonIndex + 1] != '}' && packet.indexOf("TCPIP") == -1) {
                         const String& Sender = packet.substring(3, packet.indexOf(">"));
-                        if (Sender != Config.callsign && Utils::checkValidCallsign(Sender)) {
+                        if (Sender != Config.callsign && Utils::checkValidCallsign(Sender) && !STATION_Utils::checkBlackList(Sender)) {
                             STATION_Utils::updateLastHeard(Sender);
                             Utils::typeOfPacket(packet.substring(3), 0);  // LoRa-APRS
                             const String& AddresseeAndMessage = packet.substring(packet.indexOf("::") + 2);

src/battery_utils.cpp

@@ -101,7 +101,7 @@ namespace BATTERY_Utils {
             int sample;
             int sampleSum = 0;
             #ifdef ADC_CTRL
-                #if defined(HELTEC_WIRELESS_TRACKER)
+                #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V3_2)
                     digitalWrite(ADC_CTRL, HIGH);
                 #endif
                 #if defined(HELTEC_V3) || defined(HELTEC_V2) || defined(HELTEC_WSL_V3) || defined(HELTEC_WP)
@@ -132,7 +132,7 @@ namespace BATTERY_Utils {
             }
 
             #ifdef ADC_CTRL
-                #if defined(HELTEC_WIRELESS_TRACKER)
+                #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V3_2)
                     digitalWrite(ADC_CTRL, LOW);
                 #endif
                 #if defined(HELTEC_V3) || defined(HELTEC_V2) || defined(HELTEC_WSL_V3) || defined(HELTEC_WP)

src/configuration.cpp

@@ -99,6 +99,8 @@ void Configuration::writeFile() {
 
     data["personalNote"]                        = personalNote;
 
+    data["blackList"]                           = blackList;
+
     data["webadmin"]["active"]                  = webadmin.active;
     data["webadmin"]["username"]                = webadmin.username;
     data["webadmin"]["password"]                = webadmin.password;
@@ -209,7 +211,7 @@ bool Configuration::readFile() {
         webadmin.username               = data["webadmin"]["username"] | "admin";
         webadmin.password               = data["webadmin"]["password"] | "";
 
-        ntp.gmtCorrection               = data["ntp"]["gmtCorrection"] | 0;
+        ntp.gmtCorrection               = data["ntp"]["gmtCorrection"] | 0.0;
 
         lowPowerMode                    = data["other"]["lowPowerMode"] | false;
         lowVoltageCutOff                = data["other"]["lowVoltageCutOff"] | 0;
@@ -219,7 +221,9 @@ bool Configuration::readFile() {
         rebootMode                      = data["other"]["rebootMode"] | false;
         rebootModeTime                  = data["other"]["rebootModeTime"] | 6;
 
-        personalNote    	            = data["personalNote"] | "personal note here...";
+        personalNote    	            = data["personalNote"] | "personal note here";
+
+        blackList                       = data["blackList"] | "station callsign";
 
         if (wifiAPs.size() == 0) { // If we don't have any WiFi's from config we need to add "empty" SSID for AUTO AP
             WiFi_AP wifiap;
@@ -327,11 +331,13 @@ void Configuration::init() {
 
     personalNote                    = "";
 
+    blackList                       = "";
+
     webadmin.active                 = false;
     webadmin.username               = "admin";
     webadmin.password               = "";
 
-    ntp.gmtCorrection               = 0;
+    ntp.gmtCorrection               = 0.0;
 
     Serial.println("All is Written!");
 }

src/digi_utils.cpp

@@ -130,7 +130,7 @@ namespace DIGI_Utils {
                     temp    = packet.substring(3);
                     Sender  = packet.substring(3, packet.indexOf(">"));
                 }
-                if (Sender != Config.callsign) {        // Avoid listening to own packets
+                if (Sender != Config.callsign && !STATION_Utils::checkBlackList(Sender)) {        // Avoid listening to own packets
                     if (!thirdPartyPacket && !Utils::checkValidCallsign(Sender)) {
                         return;
                     }

src/gps_utils.cpp

@@ -197,7 +197,8 @@ namespace GPS_Utils {
             encodedBytePosition = packet.indexOf(":=") + 14;
         }
         if (encodedBytePosition != 0) {
-            if (String(packet[encodedBytePosition]) == "G" || String(packet[encodedBytePosition]) == "Q" || String(packet[encodedBytePosition]) == "[" || String(packet[encodedBytePosition]) == "H") {
+            char currentChar = packet[encodedBytePosition];
+            if (currentChar == 'G' || currentChar == 'Q' || currentChar == '[' || currentChar == 'H' || currentChar == 'X') {
                 return decodeEncodedGPS(packet);
             } else {
                 return getReceivedGPS(packet);

src/power_utils.cpp

@@ -181,10 +181,10 @@ namespace POWER_Utils {
 
         #ifdef VEXT_CTRL
             pinMode(VEXT_CTRL,OUTPUT); // GPS + TFT on HELTEC Wireless_Tracker and only for Oled in HELTEC V3
-            #ifndef HELTEC_WSL_V3
+            #if defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_V3) 
                 digitalWrite(VEXT_CTRL, HIGH);
             #endif
-            #ifdef HELTEC_WP
+            #if defined(HELTEC_WP) || defined(HELTEC_WS) || defined(HELTEC_V3_2)
                 digitalWrite(VEXT_CTRL, LOW);
             #endif
         #endif
@@ -201,13 +201,13 @@ namespace POWER_Utils {
             Wire.begin(BOARD_I2C_SDA, BOARD_I2C_SCL);
         #endif
 
-        #if defined(HELTEC_V3) || defined(HELTEC_WP) || defined(HELTEC_WSL_V3) || defined(HELTEC_WSL_V3_DISPLAY)
-            Wire1.begin(BOARD_I2C_SDA, BOARD_I2C_SCL);
-        #endif
-
-        #if defined(HELTEC_V3) || defined(HELTEC_WS) || defined(LIGHTGATEWAY_1_0) || defined(TTGO_LORA32_T3S3_V1_2) || defined(HELTEC_V2)
+        #if defined(HELTEC_V3) || defined(HELTEC_V3_2) || defined(HELTEC_WS) || defined(LIGHTGATEWAY_1_0) || defined(TTGO_LORA32_T3S3_V1_2) || defined(HELTEC_V2)
             Wire.begin(OLED_SDA, OLED_SCL);
         #endif
+
+        #if defined(HELTEC_V3) || defined(HELTEC_V3_2) || defined(HELTEC_WP) || defined(HELTEC_WSL_V3) || defined(HELTEC_WSL_V3_DISPLAY)
+            Wire1.begin(BOARD_I2C_SDA, BOARD_I2C_SCL);
+        #endif        
         
         delay(1000);
         BATTERY_Utils::setup();

src/query_utils.cpp

@@ -1,4 +1,5 @@
 #include "configuration.h"
+#include "battery_utils.h"
 #include "station_utils.h"
 #include "query_utils.h"
 #include "lora_utils.h"
@@ -10,6 +11,8 @@ extern String                           versionDate;
 extern int                              rssi;
 extern float                            snr;
 extern int                              freqError;
+extern bool                             shouldSleepLowVoltage;
+extern bool                             saveNewDigiEcoModeConfig;
 
 
 namespace QUERY_Utils {
@@ -53,12 +56,16 @@ namespace QUERY_Utils {
             answer.concat("?WHERE on development 73!");
         } else if (queryQuestion.indexOf("?APRSEEM") == 0 && Config.digi.ecoMode == true) {    // Exit Digipeater EcoMode
             answer = "DigiEcoMode:Stop";
-            Config.digi.ecoMode     = false;
-            Config.display.alwaysOn = true;
-            Config.display.timeout  = 10;
+            Config.digi.ecoMode         = false;
+            Config.display.alwaysOn     = true;
+            Config.display.timeout      = 10;
+            shouldSleepLowVoltage       = true;     // to make sure all packets in outputPacketBuffer are sended before restart.
+            saveNewDigiEcoModeConfig    = true;
         } else if (queryQuestion.indexOf("?APRSSEM") == 0 && Config.digi.ecoMode == false) {    // Start Digipeater EcoMode
             answer = "DigiEcoMode:Start";
-            Config.digi.ecoMode     = true;
+            Config.digi.ecoMode         = true;
+            shouldSleepLowVoltage       = true;     // to make sure all packets in outputPacketBuffer are sended before restart.
+            saveNewDigiEcoModeConfig    = true;
         } else if (queryQuestion.indexOf("?APRSEMS") == 0) {    // Digipeater EcoMode Status
             answer = (Config.digi.ecoMode) ? "DigiEcoMode:ON" : "DigiEcoMode:OFF";
         }

src/station_utils.cpp

@@ -16,10 +16,41 @@ uint32_t lastTxTime             = millis();
 std::vector<LastHeardStation>   lastHeardStations;
 std::vector<String>             outputPacketBuffer;
 std::vector<Packet25SegBuffer>  packet25SegBuffer;
+std::vector<String>             blackList;
+
+bool saveNewDigiEcoModeConfig   = false;
 
 
 namespace STATION_Utils {
 
+    void loadBlackList() {
+        if (Config.blackList != "") {
+            String callsigns    = Config.blackList;
+            int spaceIndex      = callsigns.indexOf(" ");
+
+            while (spaceIndex >= 0) {
+                blackList.push_back(callsigns.substring(0, spaceIndex));
+                callsigns   = callsigns.substring(spaceIndex + 1);
+                spaceIndex  = callsigns.indexOf(" ");
+            }
+            callsigns.trim();
+            if (callsigns.length() > 0) blackList.push_back(callsigns); // Add the last word if available
+        }
+    }
+
+    bool checkBlackList(const String& callsign) {
+        for (int i = 0; i < blackList.size(); i++) {
+            if (blackList[i].indexOf("*") >= 0) {   // use wild card
+                String wildCard = blackList[i].substring(0, blackList[i].indexOf("*"));
+                if (callsign.startsWith(wildCard))return true;
+            } else {
+                if (blackList[i] == callsign) return true;
+            }                
+        }
+        return false;
+    }
+
+
     void deleteNotHeard() {
         std::vector<LastHeardStation>  lastHeardStation_temp;
         for (int i = 0; i < lastHeardStations.size(); i++) {
@@ -70,6 +101,7 @@ namespace STATION_Utils {
         Utils::println(" ---> Station not Heard for last 30 min (Not Tx)\n");
         return false;
     }
+
     void clean25SegBuffer() {
         if (!packet25SegBuffer.empty() && (millis() - packet25SegBuffer[0].receivedTime) >  25 * 1000) packet25SegBuffer.erase(packet25SegBuffer.begin());
     }
@@ -92,13 +124,8 @@ namespace STATION_Utils {
         int timeToWait                  = 3 * 1000;      // 3 segs between packet Tx and also Rx ???
         uint32_t lastRx                 = millis() - lastRxTime;
         uint32_t lastTx                 = millis() - lastTxTime;
-        bool saveNewDigiEcoModeConfig   = false;
         if (outputPacketBuffer.size() > 0 && lastTx > timeToWait && lastRx > timeToWait) {
             LoRa_Utils::sendNewPacket(outputPacketBuffer[0]);
-            if (outputPacketBuffer[0].indexOf("DigiEcoMode:Start") != -1 || outputPacketBuffer[0].indexOf("DigiEcoMode:Stop") != -1) {
-                saveNewDigiEcoModeConfig    = true;
-                shouldSleepLowVoltage       = true; // to make sure all packets in outputPacketBuffer are sended before restart.
-            }
             outputPacketBuffer.erase(outputPacketBuffer.begin());
             lastTxTime = millis();
         }
@@ -110,7 +137,9 @@ namespace STATION_Utils {
             }
         }
         if (saveNewDigiEcoModeConfig) {
+            setCpuFrequencyMhz(80);
             Config.writeFile();
+            delay(1000);
             displayToggle(false);
             ESP.restart();
         }

src/utils.cpp

@@ -186,7 +186,7 @@ namespace Utils {
 
     void checkBeaconInterval() {
         uint32_t lastTx = millis() - lastBeaconTx;
-        if (passcodeValid && (lastBeaconTx == 0 || lastTx >= Config.beacon.interval * 60 * 1000)) {
+        if (lastBeaconTx == 0 || lastTx >= Config.beacon.interval * 60 * 1000) {
             beaconUpdate = true;    
         }
 
@@ -198,9 +198,7 @@ namespace Utils {
         #endif
 
         if (beaconUpdate) {
-            if (!Config.display.alwaysOn && Config.display.timeout != 0) {
-                displayToggle(true);
-            }
+            if (!Config.display.alwaysOn && Config.display.timeout != 0) displayToggle(true);
 
             if (sendStartTelemetry && Config.battery.sendVoltageAsTelemetry && !Config.wxsensor.active && (Config.battery.sendInternalVoltage || Config.battery.sendExternalVoltage)) {
                 sendInitialTelemetryPackets();
@@ -289,7 +287,7 @@ namespace Utils {
                 secondaryBeaconPacket += encodedTelemetry;
             }
 
-            if (Config.aprs_is.active && Config.beacon.sendViaAPRSIS && !backUpDigiMode) {
+            if (Config.beacon.sendViaAPRSIS && Config.aprs_is.active && passcodeValid && !backUpDigiMode) {
                 Utils::println("-- Sending Beacon to APRSIS --");
                 displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, "SENDING IGATE BEACON", 0);
                 seventhLine = "     listening...";

src/web_utils.cpp

@@ -206,13 +206,15 @@ namespace WEB_Utils {
 
         Config.personalNote                 = request->getParam("personalNote", true)->value();
 
+        Config.blackList                    = request->getParam("blackList", true)->value();
+
         Config.webadmin.active              = request->hasParam("webadmin.active", true);
         if (Config.webadmin.active) {
             Config.webadmin.username        = request->getParam("webadmin.username", true)->value();
             Config.webadmin.password        = request->getParam("webadmin.password", true)->value();
         }
 
-        Config.ntp.gmtCorrection            = request->getParam("ntp.gmtCorrection", true)->value().toInt();
+        Config.ntp.gmtCorrection            = request->getParam("ntp.gmtCorrection", true)->value().toFloat();
 
         Config.writeFile();
 

src/wx_utils.cpp

@@ -16,7 +16,7 @@ float newHum, newTemp, newPress, newGas;
 
 
 Adafruit_BME280     bme280;
-#ifdef HELTEC_V3
+#if defined(HELTEC_V3) || defined(HELTEC_V3_2)
 Adafruit_BMP280     bmp280(&Wire1);
 Adafruit_Si7021     sensor = Adafruit_Si7021();
 #else
@@ -32,7 +32,7 @@ namespace WX_Utils {
     void getWxModuleAddres() {
         uint8_t err, addr;
         for(addr = 1; addr < 0x7F; addr++) {
-            #if defined(HELTEC_V3) || defined(HELTEC_WSL_V3) || defined(HELTEC_WSL_V3_DISPLAY)
+            #if defined(HELTEC_V3) || defined(HELTEC_V3_2) || defined(HELTEC_WSL_V3) || defined(HELTEC_WSL_V3_DISPLAY)
                 Wire1.beginTransmission(addr);
                 err = Wire1.endTransmission();
             #else
@@ -58,7 +58,7 @@ namespace WX_Utils {
             if (wxModuleAddress != 0x00) {
                 bool wxModuleFound = false;
                 if (wxModuleAddress == 0x76 || wxModuleAddress == 0x77) {
-                    #if defined(HELTEC_V3) || defined(HELTEC_WSL_V3) || defined(HELTEC_WSL_V3_DISPLAY)
+                    #if defined(HELTEC_V3) || defined(HELTEC_V3_2) || defined(HELTEC_WSL_V3) || defined(HELTEC_WSL_V3_DISPLAY)
                         if (bme280.begin(wxModuleAddress, &Wire1)) {
                             Serial.println("BME280 sensor found");
                             wxModuleType = 1;
@@ -115,7 +115,7 @@ namespace WX_Utils {
                             Serial.println("BMP280 Module init done!");
                             break;
                         case 3:
-                            #ifndef HELTEC_V3
+                            #if !defined(HELTEC_V3) && !defined(HELTEC_V3_2)
                                 bme680.setTemperatureOversampling(BME680_OS_1X);
                                 bme680.setHumidityOversampling(BME680_OS_1X);
                                 bme680.setPressureOversampling(BME680_OS_1X);
@@ -195,7 +195,7 @@ namespace WX_Utils {
                 newHum      = 0;
                 break;
             case 3: // BME680
-                #ifndef HELTEC_V3
+                #if !defined(HELTEC_V3) && !defined(HELTEC_V3_2)
                     bme680.performReading();
                     delay(50);
                     if (bme680.endReading()) {

variants/TROY_LoRa_APRS/board_pinout.h

@@ -0,0 +1,33 @@
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1278
+    #define RADIO_SCLK_PIN      5
+    #define RADIO_MISO_PIN      19
+    #define RADIO_MOSI_PIN      27
+    #define RADIO_CS_PIN        18
+    #define RADIO_RST_PIN       23
+    #define RADIO_BUSY_PIN      26
+
+    //  Display
+    #define HAS_DISPLAY
+
+    #undef  OLED_SDA
+    #undef  OLED_SCL
+    #undef  OLED_RST
+
+    #define OLED_SDA            21
+    #define OLED_SCL            22
+    #define OLED_RST            -1
+
+    //  GPS
+    #define HAS_GPS
+    #define GPS_RX              12
+    #define GPS_TX              34
+
+    //  OTHER
+    #define INTERNAL_LED_PIN    2
+    #define BATTERY_PIN         35
+
+#endif

variants/TROY_LoRa_APRS/platformio.ini

@@ -0,0 +1,8 @@
+[env:TROY_LoRa_APRS]
+board = esp32dev
+build_flags =
+	${common.build_flags}
+	-D TROY_LoRa_APRS
+lib_deps =
+	${common.lib_deps}
+	${common.display_libs}

variants/heltec_wifi_lora_32_V3_2/board_pinout.h

@@ -0,0 +1,34 @@
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1262
+    #define RADIO_SCLK_PIN          9
+    #define RADIO_MISO_PIN          11
+    #define RADIO_MOSI_PIN          10
+    #define RADIO_CS_PIN            8
+    #define RADIO_RST_PIN           12
+    #define RADIO_DIO1_PIN          14
+    #define RADIO_BUSY_PIN          13
+
+    //  Display
+    #define HAS_DISPLAY
+
+    #undef  OLED_SDA
+    #undef  OLED_SCL
+    #undef  OLED_RST
+
+    #define OLED_SDA                17
+    #define OLED_SCL                18
+    #define OLED_RST                21
+    #define OLED_DISPLAY_HAS_RST_PIN
+
+    //  Aditional Config
+    #define INTERNAL_LED_PIN        35
+    #define BATTERY_PIN             1
+    #define VEXT_CTRL               36
+    #define ADC_CTRL                37
+    #define BOARD_I2C_SDA           41
+    #define BOARD_I2C_SCL           42
+
+#endif

variants/heltec_wifi_lora_32_V3_2/platformio.ini

@@ -0,0 +1,9 @@
+[env:heltec_wifi_lora_32_V3_2]
+board = heltec_wifi_lora_32_V3
+board_build.mcu = esp32s3
+build_flags =
+	${common.build_flags}
+	-D HELTEC_V3_2
+lib_deps =
+	${common.lib_deps}
+	${common.display_libs}

variants/heltec_wireless_stick/board_pinout.h

@@ -18,9 +18,9 @@
     #undef  OLED_SCL
     #undef  OLED_RST
 
-    #define OLED_SDA                4
-    #define OLED_SCL                15
-    #define OLED_RST                16
+    #define OLED_SDA                17
+    #define OLED_SCL                18
+    #define OLED_RST                21
     #define OLED_DISPLAY_HAS_RST_PIN
 
     //  Aditional Config