not working

data/igate_conf.json

@@ -84,10 +84,6 @@
     "ntp": {
         "gmtCorrection": 0.0
     },
-    "remoteManagement": {
-        "managers": "",
-        "rfOnly": true
-    },        
     "other": {
         "rememberStationTime": 30,
         "lowPowerMode": false,
@@ -97,5 +93,5 @@
         "rebootModeTime": 6
     },
     "personalNote": "",
-    "blacklist": ""
+    "blackList": ""
 }

data_embed/index.html

@@ -590,20 +590,20 @@
                                     </svg>
                                     Black List
                                 </h5>
-                                <small>Add Callsigns with space between them to Blacklist them (* wild card allowed)</small>
+                                <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"
+                                            for="blackList"
                                             class="form-label"
-                                            >Blacklist</label
+                                            >Black List</label
                                         >
                                         <input
                                             type="text"
-                                            name="blacklist"
+                                            name="blackList"
-                                            id="blacklist"
+                                            id="blackList"
                                             class="form-control"
                                             placeholder="Station Callsign"
                                             oninput="this.value = this.value.toUpperCase();"
@@ -1708,65 +1708,6 @@
                         </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-cloud-upload-fill"
-                                        viewBox="0 0 16 16"
-                                    >
-                                        <path
-                                            fill-rule="evenodd"
-                                            d="M8 0a5.53 5.53 0 0 0-3.594 1.342c-.766.66-1.321 1.52-1.464 2.383C1.266 4.095 0 5.555 0 7.318 0 9.366 1.708 11 3.781 11H7.5V5.707L5.354 7.854a.5.5 0 1 1-.708-.708l3-3a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1-.708.708L8.5 5.707V11h4.188C14.502 11 16 9.57 16 7.773c0-1.636-1.242-2.969-2.834-3.194C12.923 1.999 10.69 0 8 0m-.5 14.5V11h1v3.5a.5.5 0 0 1-1 0"
-                                        />
-                                    </svg>
-                                    Remote Management
-                                </h5>
-                                <small
-                                    >Manage Station via APRS Messages. Leave empty to disable!
-                                </small>
-                            </div>
-                            <div class="col-lg-9 col-sm-12">
-                                <div class="col-12">
-                                    <label
-                                        for="remoteManagement.managers"
-                                        class="form-label"
-                                        >Callsign-SSID of Managers, space separated, trailing * wildcard allowed</label
-                                    >
-                                    <div class="input-group">
-                                        <input
-                                            type="text"
-                                            name="remoteManagement.managers"
-                                            id="remoteManagement.managers"
-                                            class="form-control"
-                                        />
-                                    </div>
-                                </div>
-                                <div class="row">
-                                    <div class="col-12">
-                                        <div class="form-check form-switch">
-                                            <input
-                                                type="checkbox"
-                                                name="remoteManagement.rfOnly"
-                                                id="remoteManagement.rfOnly"
-                                                class="form-check-input"
-                                            />
-                                            <label
-                                                for="remoteManagement.rfOnly"
-                                                class="form-label"
-                                                >Managers commands only via RF (not APRS-IS)</label
-                                            >
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <hr />
-
                         <div class="row my-5 d-flex align-items-top">
                             <div class="col-lg-3 col-sm-12">
                                 <h5>

data_embed/script.js

@@ -138,7 +138,7 @@ function loadSettings(settings) {
     document.getElementById("beacon.gpsAmbiguity").checked              = settings.beacon.gpsAmbiguity;
 
     // Black List
-    document.getElementById("blacklist").value                          = settings.blacklist;
+    document.getElementById("blackList").value                          = settings.blackList;
 
     // Digi
     document.getElementById("digi.mode").value                          = settings.digi.mode;
@@ -223,10 +223,6 @@ function loadSettings(settings) {
     document.getElementById("other.lowPowerMode").checked               = settings.other.lowPowerMode;
     document.getElementById("other.lowVoltageCutOff").value             = settings.other.lowVoltageCutOff || 0
 
-    // Management over APRS
-    document.getElementById("remoteManagement.managers").value          = settings.remoteManagement.managers;
-    document.getElementById("remoteManagement.rfOnly").checked          = settings.remoteManagement.rfOnly;
-
     updateImage();
     refreshSpeedStandard();
     toggleFields();

include/configuration.h

@@ -122,11 +122,6 @@ public:
     float   gmtCorrection;
 };
 
-class REMOTE_MANAGEMENT {
-public:
-    String  managers;
-    bool    rfOnly;
-};
 
 class Configuration {
 public:
@@ -138,7 +133,7 @@ public:
     bool                    rebootMode;
     int                     rebootModeTime;
     String                  personalNote;
-    String                  blacklist;
+    String                  blackList;
     std::vector<WiFi_AP>    wifiAPs;
     WiFi_Auto_AP            wifiAutoAP;
     BEACON                  beacon;
@@ -152,8 +147,7 @@ public:
     TNC                     tnc;  
     OTA                     ota;
     WEBADMIN                webadmin;
-    NTP                     ntp;    
+    NTP                     ntp;
-    REMOTE_MANAGEMENT       remoteManagement;
   
     void init();
     void writeFile();

include/ethernet_utils.h

@@ -0,0 +1,13 @@
+#ifndef ETHERNET_UTILS_H_
+#define ETHERNET_UTILS_H_
+
+#include <Arduino.h>
+
+
+namespace ETHERNET_Utils {
+
+    void setup();
+
+}
+
+#endif

include/station_utils.h

@@ -18,10 +18,8 @@ struct LastHeardStation {
 
 namespace STATION_Utils {
 
-    void loadBlacklist();
+    void loadBlackList();
-    void loadManagers();
+    bool checkBlackList(const String& callsign);
-    bool isBlacklisted(const String& callsign);
-    bool isManager(const String& callsign);
     bool checkObjectTime(const String& packet);
     void deleteNotHeard();
     void updateLastHeard(const String& station);

src/A7670_utils.cpp

@@ -6,7 +6,6 @@
 #include "display.h"
 #include "utils.h"
 
-
 #ifdef HAS_A7670
     #define TINY_GSM_MODEM_SIM7600      //The AT instruction of A7670 is compatible with SIM7600 
     #define TINY_GSM_RX_BUFFER 1024     // Set RX buffer to 1Kb

src/LoRa_APRS_iGate.cpp

@@ -23,17 +23,24 @@ ___________________________________________________________________*/
 #include <ElegantOTA.h>
 #include <TinyGPS++.h>
 #include <Arduino.h>
-#include <WiFi.h>
 #include <vector>
 #include "configuration.h"
+#include "battery_utils.h"
 #include "aprs_is_utils.h"
 #include "station_utils.h"
 #include "battery_utils.h"
 #include "board_pinout.h"
 #include "syslog_utils.h"
+#include "query_utils.h"
 #include "power_utils.h"
 #include "lora_utils.h"
-#include "wifi_utils.h"
+#ifdef HAS_ETHERNET
+    #include <Ethernet.h>
+    #include "ethernet_utils.h"
+#else
+    #include <WiFi.h>
+    #include "wifi_utils.h"
+#endif
 #include "digi_utils.h"
 #include "gps_utils.h"
 #include "web_utils.h"
@@ -46,10 +53,15 @@ ___________________________________________________________________*/
     #include "A7670_utils.h"
 #endif
 
-
+String              versionDate             = "2025.03.06";
-String              versionDate             = "2025.03.20";
 Configuration       Config;
-WiFiClient          espClient;
+
+#ifdef HAS_ETHERNET
+    EthernetClient      espClient;
+#else
+    WiFiClient          espClient;
+#endif
+
 #ifdef HAS_GPS
     HardwareSerial  gpsSerial(1);
     TinyGPSPlus     gps;
@@ -77,16 +89,15 @@ std::vector<ReceivedPacket> receivedPackets;
 String firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine;
 //#define STARTUP_DELAY 5 //min
 
-
 void setup() {
     Serial.begin(115200);
+    delay(5000);
     POWER_Utils::setup();
     Utils::setupDisplay();
-    LoRa_Utils::setup();
+    //LoRa_Utils::setup();
     Utils::validateFreqs();
     GPS_Utils::setup();
-    STATION_Utils::loadBlacklist();
+    STATION_Utils::loadBlackList();
-    STATION_Utils::loadManagers();
 
     #ifdef STARTUP_DELAY    // (TEST) just to wait for WiFi init of Routers
         displayShow("", "  STARTUP DELAY ...", "", "", 0);
@@ -134,7 +145,12 @@ void setup() {
         }
     #endif
     DIGI_Utils::checkEcoMode();
-    WIFI_Utils::setup();
+    #ifdef HAS_ETHERNET
+        ETHERNET_Utils::setup();
+    #else
+        WIFI_Utils::setup();
+    #endif
+    LoRa_Utils::setup();
     NTP_Utils::setup();
     SYSLOG_Utils::setup();
     WX_Utils::setup();
@@ -148,14 +164,16 @@ void setup() {
 }
 
 void loop() {
-    WIFI_Utils::checkAutoAPTimeout();
+    #ifndef HAS_ETHERNET
+        WIFI_Utils::checkAutoAPTimeout();
+    #endif
 
-    if (isUpdatingOTA) {
+    /*if (isUpdatingOTA) {
         ElegantOTA.loop();
         return; // Don't process IGate and Digi during OTA update
-    }
+    }*/
 
-    if (Config.lowVoltageCutOff > 0) {
+    /*if (Config.lowVoltageCutOff > 0) {
         BATTERY_Utils::checkIfShouldSleep();
     }
     
@@ -183,8 +201,12 @@ void loop() {
     #ifdef HAS_A7670
         if (Config.aprs_is.active && !modemLoggedToAPRSIS) A7670_Utils::APRS_IS_connect();
     #else
-        WIFI_Utils::checkWiFi();
+        #ifdef HAS_ETHERNET
-        if (Config.aprs_is.active && (WiFi.status() == WL_CONNECTED) && !espClient.connected()) APRS_IS_Utils::connect();
+        if (Config.aprs_is.active && !espClient.connected()) APRS_IS_Utils::connect();
+        #else
+            WIFI_Utils::checkWiFi();
+            if (Config.aprs_is.active && (WiFi.status() == WL_CONNECTED) && !espClient.connected()) APRS_IS_Utils::connect();
+        #endif
     #endif
 
     NTP_Utils::update();
@@ -238,5 +260,5 @@ void loop() {
     #endif
 
     Utils::checkRebootTime();
-    Utils::checkSleepByLowBatteryVoltage(1);
+    Utils::checkSleepByLowBatteryVoltage(1);*/
 }

src/aprs_is_utils.cpp

@@ -1,7 +1,7 @@
-#include <WiFi.h>
 #include "configuration.h"
 #include "aprs_is_utils.h"
 #include "station_utils.h"
+#include "board_pinout.h"
 #include "syslog_utils.h"
 #include "query_utils.h"
 #include "A7670_utils.h"
@@ -9,9 +9,16 @@
 #include "display.h"
 #include "utils.h"
 
-
 extern Configuration        Config;
-extern WiFiClient           espClient;
+
+#ifdef HAS_ETHERNET
+    #include <Ethernet.h>
+    extern EthernetClient       espClient;
+#else
+    #include <WiFi.h>
+    extern WiFiClient           espClient;
+#endif
+
 extern uint32_t             lastScreenOn;
 extern String               firstLine;
 extern String               secondLine;
@@ -59,7 +66,7 @@ namespace APRS_IS_Utils {
             aprsAuth += Config.callsign;
             aprsAuth += " pass ";
             aprsAuth += Config.aprs_is.passcode;
-            aprsAuth += " vers CA2RXU_iGate 2.3 filter ";
+            aprsAuth += " vers CA2RXU_LoRa_iGate 2.1 filter ";
             aprsAuth += Config.aprs_is.filter;
             upload(aprsAuth);
         }
@@ -67,8 +74,14 @@ namespace APRS_IS_Utils {
 
     void checkStatus() {
         String wifiState, aprsisState;
-        if (WiFi.status() == WL_CONNECTED) {
+        if (true) {
-            wifiState = "OK";
+        /*#ifdef HAS_ETHERNET
+            if (Ethernet.linkStatus() == LinkON) {
+                wifiState = "ET";
+        #else
+            if (WiFi.status() == WL_CONNECTED) {
+                wifiState = "OK";
+        #endif*/
         } else {
             if (backUpDigiMode || Config.digi.ecoMode) {
                 wifiState = "--";
@@ -298,7 +311,6 @@ namespace APRS_IS_Utils {
                     }
                     if (receivedMessage.indexOf("?") == 0) {
                         Utils::println("Rx Query (APRS-IS)  : " + packet);
-                        Sender.trim();
                         String queryAnswer = QUERY_Utils::process(receivedMessage, Sender, true, false);
                         //Serial.println("---> QUERY Answer : " + queryAnswer.substring(0,queryAnswer.indexOf("\n")));
                         if (!Config.display.alwaysOn && Config.display.timeout != 0) {
@@ -364,7 +376,12 @@ namespace APRS_IS_Utils {
     }
 
     void firstConnection() {
-        if (Config.aprs_is.active && (WiFi.status() == WL_CONNECTED) && !espClient.connected()) {
+
+        //#ifdef HAS_ETHERNET
+        if (Config.aprs_is.active && !espClient.connected()) {
+        //#else
+        //    if (Config.aprs_is.active && (WiFi.status() == WL_CONNECTED) && !espClient.connected()) {
+        //#endif       
             connect();
             while (!passcodeValid) {
                 listenAPRSIS();

src/battery_utils.cpp

@@ -5,7 +5,6 @@
 #include "power_utils.h"
 #include "utils.h"
 
-
 extern  Configuration                   Config;
 extern  uint32_t                        lastBatteryCheck;
 

src/configuration.cpp

@@ -99,7 +99,7 @@ void Configuration::writeFile() {
 
     data["personalNote"]                        = personalNote;
 
-    data["blacklist"]                           = blacklist;
+    data["blackList"]                           = blackList;
 
     data["webadmin"]["active"]                  = webadmin.active;
     data["webadmin"]["username"]                = webadmin.username;
@@ -107,9 +107,6 @@ void Configuration::writeFile() {
 
     data["ntp"]["gmtCorrection"]                = ntp.gmtCorrection;
 
-    data["remoteManagement"]["managers"]        = remoteManagement.managers;
-    data["remoteManagement"]["rfOnly"]          = remoteManagement.rfOnly;
-
     serializeJson(data, configFile);
 
     configFile.close();
@@ -226,10 +223,7 @@ bool Configuration::readFile() {
 
         personalNote    	            = data["personalNote"] | "personal note here";
 
-        blacklist                       = data["blacklist"] | "station callsign";
+        blackList                       = data["blackList"] | "station callsign";
-
-        remoteManagement.managers       = data["remoteManagement"]["managers"] | "";
-        remoteManagement.rfOnly         = data["remoteManagement"]["rfOnly"] | true;
 
         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;
@@ -337,7 +331,7 @@ void Configuration::init() {
 
     personalNote                    = "";
 
-    blacklist                       = "";
+    blackList                       = "";
 
     webadmin.active                 = false;
     webadmin.username               = "admin";
@@ -345,9 +339,6 @@ void Configuration::init() {
 
     ntp.gmtCorrection               = 0.0;
 
-    remoteManagement.managers       = "";
-    remoteManagement.rfOnly         = true;
-
     Serial.println("All is Written!");
 }
 

src/digi_utils.cpp

@@ -2,6 +2,7 @@
 #include "configuration.h"
 #include "station_utils.h"
 #include "aprs_is_utils.h"
+#include "query_utils.h"
 #include "digi_utils.h"
 #include "wifi_utils.h"
 #include "lora_utils.h"
@@ -9,7 +10,6 @@
 #include "display.h"
 #include "utils.h"
 
-
 extern Configuration    Config;
 extern uint32_t         lastScreenOn;
 extern String           iGateBeaconPacket;

src/ethernet_utils.cpp

@@ -0,0 +1,62 @@
+/*#include <WiFi.h>
+#include "configuration.h"
+#include "station_utils.h"
+#include "aprs_is_utils.h"
+#include "query_utils.h"
+#include "digi_utils.h"
+#include "wifi_utils.h"
+#include "lora_utils.h"
+#include "gps_utils.h"
+#include "display.h"
+#include "utils.h"*/
+#include <Ethernet.h>
+#include <SPI.h>
+#include "ethernet_utils.h"
+#include "board_pinout.h"
+
+/*extern Configuration    Config;
+extern uint32_t         lastScreenOn;
+extern String           iGateBeaconPacket;
+extern String           firstLine;
+extern String           secondLine;
+extern String           thirdLine;
+extern String           fourthLine;
+extern String           fifthLine;
+extern String           sixthLine;
+extern String           seventhLine;
+extern bool             backUpDigiMode;*/
+
+
+byte mac[] = {0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED};
+
+namespace ETHERNET_Utils {
+
+    void setup() {
+        SPI.beginTransaction(SPISettings(1000000, MSBFIRST, SPI_MODE0));
+        pinMode(Ethernet_CS, OUTPUT);
+        pinMode(Ethernet_MOSI, OUTPUT);
+        pinMode(Ethernet_MISO, INPUT);
+        pinMode(Ethernet_SCK, OUTPUT);
+        SPI.endTransaction();
+        Ethernet.init(Ethernet_CS);
+        Ethernet.begin(mac);
+        delay(1000);
+        Serial.println(Ethernet.localIP());
+
+        delay(1000);
+        Serial.println(Ethernet.linkStatus());
+        delay(1000);
+        Serial.println(Ethernet.linkStatus());
+        delay(1000);
+        Serial.println(Ethernet.linkStatus());
+        delay(1000);
+        Serial.println(Ethernet.linkStatus());
+        delay(1000);
+        if (Ethernet.linkStatus() == LinkON) {
+            Serial.println("Ethernet connected...");
+        } else {
+            Serial.println("Ethernet not connected...");
+        }
+    }
+
+}

src/gps_utils.cpp

@@ -110,30 +110,22 @@ namespace GPS_Utils {
     }
 
     String decodeEncodedGPS(const String& packet) {
-        int indexOfExclamation  = packet.indexOf(":!");
+        const String& GPSPacket         = packet.substring(packet.indexOf(":!")+3);
-        int indexOfEqual        = packet.indexOf(":=");
+        const String& encodedLatitude   = GPSPacket.substring(0,4);
+        const String& encodedLongtitude = GPSPacket.substring(4,8);
+        const String& comment           = GPSPacket.substring(12);
 
-        const uint8_t OFFSET = 3;     // Offset for encoded data in the packet
+        int Y1 = int(encodedLatitude[0]);
-        String GPSPacket;
+        int Y2 = int(encodedLatitude[1]);
-        if (indexOfExclamation > 10) {
+        int Y3 = int(encodedLatitude[2]);
-            GPSPacket = packet.substring(indexOfExclamation + OFFSET);
+        int Y4 = int(encodedLatitude[3]);
-        } else if (indexOfEqual > 10) {
+        float decodedLatitude = 90.0 - ((((Y1-33) * pow(91,3)) + ((Y2-33) * pow(91,2)) + ((Y3-33) * 91) + Y4-33) / 380926.0);
-            GPSPacket = packet.substring(indexOfEqual + OFFSET);
+        
-        }
+        int X1 = int(encodedLongtitude[0]);
-
+        int X2 = int(encodedLongtitude[1]);
-        String encodedLatitude = GPSPacket.substring(0,4);
+        int X3 = int(encodedLongtitude[2]);
-        int Y1 = encodedLatitude[0] - 33;
+        int X4 = int(encodedLongtitude[3]);
-        int Y2 = encodedLatitude[1] - 33;
+        float decodedLongitude = -180.0 + ((((X1-33) * pow(91,3)) + ((X2-33) * pow(91,2)) + ((X3-33) * 91) + X4-33) / 190463.0);
-        int Y3 = encodedLatitude[2] - 33;
-        int Y4 = encodedLatitude[3] - 33;
-        float decodedLatitude = 90.0 - (((Y1 * pow(91,3)) + (Y2 * pow(91,2)) + (Y3 * 91) + Y4) / 380926.0);
-
-        String encodedLongitude = GPSPacket.substring(4,8);
-        int X1 = encodedLongitude[0] - 33;
-        int X2 = encodedLongitude[1] - 33;
-        int X3 = encodedLongitude[2] - 33;
-        int X4 = encodedLongitude[3] - 33;
-        float decodedLongitude = -180.0 + (((X1 * pow(91,3)) + (X2 * pow(91,2)) + (X3 * 91) + X4) / 190463.0);
 
         distance = String(calculateDistanceTo(decodedLatitude, decodedLongitude),1);
 
@@ -144,7 +136,6 @@ namespace GPS_Utils {
         decodedGPS += distance;
         decodedGPS += "km";
 
-        String comment = GPSPacket.substring(12);
         if (comment != "") {
             decodedGPS += " / ";
             decodedGPS += comment;
@@ -153,30 +144,33 @@ namespace GPS_Utils {
     }
 
     String getReceivedGPS(const String& packet) {
-        int indexOfExclamation  = packet.indexOf(":!");
-        int indexOfEqual        = packet.indexOf(":=");
-        int indexOfAt           = packet.indexOf(":@");
-
         String infoGPS;
-        if (indexOfExclamation > 10) {
+        if (packet.indexOf(":!") > 10) {
-            infoGPS = packet.substring(indexOfExclamation + 2);
+            infoGPS = packet.substring(packet.indexOf(":!") + 2);
-        } else if (indexOfEqual > 10) {
+        } else if (packet.indexOf(":=") > 10) {
-            infoGPS = packet.substring(indexOfEqual + 2);
+            infoGPS = packet.substring(packet.indexOf(":=") + 2);
-        } else if (indexOfAt > 10) {
-            infoGPS = packet.substring(indexOfAt + 9);  // 9 = 2+7 (when 7 is timestamp characters)
         }
+        const String& Latitude      = infoGPS.substring(0,8);
+        const String& Longitude     = infoGPS.substring(9,18);
+        const String& comment       = infoGPS.substring(19);  
+        
+        float convertedLatitude, convertedLongitude;
+        const String& firstLatPart   = Latitude.substring(0,2);
+        const String& secondLatPart  = Latitude.substring(2,4);
+        const String& thirdLatPart   = Latitude.substring(Latitude.indexOf(".") + 1, Latitude.indexOf(".") + 3);
+        convertedLatitude     = firstLatPart.toFloat() + (secondLatPart.toFloat()/60) + (thirdLatPart.toFloat()/(60*100));
 
-        String Latitude             = infoGPS.substring(0,8);                   // First 8 characters are Latitude
+        const String& firstLngPart   = Longitude.substring(0,3);
-        float convertedLatitude     = Latitude.substring(0,2).toFloat();        // First 2 digits (Degrees)
+        const String& secondLngPart  = Longitude.substring(3,5);
-        convertedLatitude += Latitude.substring(2,4).toFloat() / 60;            // Next 2 digits (Minutes)
+        const String& thirdLngPart   = Longitude.substring(Longitude.indexOf(".") + 1, Longitude.indexOf(".") + 3);        
-        convertedLatitude += Latitude.substring(Latitude.indexOf(".") + 1, Latitude.indexOf(".") + 3).toFloat() / (60*100);
+        convertedLongitude    = firstLngPart.toFloat() + (secondLngPart.toFloat()/60) + (thirdLngPart.toFloat()/(60*100));
-        if (Latitude.endsWith("S")) convertedLatitude = -convertedLatitude;     // Handle Southern Hemisphere
+        
-
+        if (String(Latitude[7]) == "S") {
-        String Longitude            = infoGPS.substring(9,18);                  // Next 9 characters are Longitude
+            convertedLatitude = -convertedLatitude;
-        float convertedLongitude    = Longitude.substring(0,3).toFloat();       // First 3 digits (Degrees)
+        } 
-        convertedLongitude += Longitude.substring(3,5).toFloat() / 60;          // Next 2 digits (Minutes)
+        if (String(Longitude[8]) == "W") {
-        convertedLongitude += Longitude.substring(Longitude.indexOf(".") + 1, Longitude.indexOf(".") + 3).toFloat() / (60*100);
+            convertedLongitude = -convertedLongitude;
-        if (Longitude.endsWith("W")) convertedLongitude = -convertedLongitude;  // Handle Western Hemisphere
+        }
         
         distance = String(calculateDistanceTo(convertedLatitude, convertedLongitude),1);
 
@@ -187,7 +181,6 @@ namespace GPS_Utils {
         decodedGPS += distance;
         decodedGPS += "km";
 
-        String comment = infoGPS.substring(19);  
         if (comment != "") {
             decodedGPS += " / ";
             decodedGPS += comment;
@@ -196,30 +189,22 @@ namespace GPS_Utils {
     }
 
     String getDistanceAndComment(const String& packet) {
-        int indexOfAt = packet.indexOf(":@");
+        uint8_t encodedBytePosition = 0;
-        if (indexOfAt > 10) {
+        if (packet.indexOf(":!") > 10) {
-            return getReceivedGPS(packet);
+            encodedBytePosition = packet.indexOf(":!") + 14;
-        } else {
+        }
-            const uint8_t ENCODED_BYTE_OFFSET = 14;     // Offset for encoded data in the packet
+        if (packet.indexOf(":=") > 10) {
-            int indexOfExclamation  = packet.indexOf(":!");
+            encodedBytePosition = packet.indexOf(":=") + 14;
-            int indexOfEqual        = packet.indexOf(":=");
+        }
-            uint8_t encodedBytePosition = 0;
+        if (encodedBytePosition != 0) {
-            if (indexOfExclamation > 10) {              // Determine the position where encoded data starts
+            char currentChar = packet[encodedBytePosition];
-                encodedBytePosition = indexOfExclamation + ENCODED_BYTE_OFFSET;
+            if (currentChar == 'G' || currentChar == 'Q' || currentChar == '[' || currentChar == 'H' || currentChar == 'X') {
-            } else if (indexOfEqual > 10) {
+                return decodeEncodedGPS(packet);
-                encodedBytePosition = indexOfEqual + ENCODED_BYTE_OFFSET;
-            }
-
-            if (encodedBytePosition != 0) {
-                char currentChar = packet[encodedBytePosition];
-                if (currentChar == 'G' || currentChar == 'Q' || currentChar == '[' || currentChar == 'H' || currentChar == 'X') {
-                    return decodeEncodedGPS(packet);    // If valid encoded data position is found, decode it
-                } else {
-                    return getReceivedGPS(packet);
-                }
             } else {
-                return " _ / _ / _ ";
+                return getReceivedGPS(packet);
             }
+        } else {
+            return " _ / _ / _ ";
         }
     }
 

src/kiss_utils.cpp

@@ -1,7 +1,6 @@
 #include <Arduino.h>
 #include "kiss_protocol.h"
 
-
 bool validateTNC2Frame(const String& tnc2FormattedFrame) {
     return (tnc2FormattedFrame.indexOf(':') != -1) && (tnc2FormattedFrame.indexOf('>') != -1);
 }

src/lora_utils.cpp

@@ -9,7 +9,6 @@
 #include "display.h"
 #include "utils.h"
 
-
 extern Configuration    Config;
 extern uint32_t         lastRxTime;
 
@@ -186,7 +185,7 @@ namespace LoRa_Utils {
                     if (packet != "") {
 
                         String sender   = packet.substring(3, packet.indexOf(">"));
-                        if (packet.substring(0,3) == "\x3c\xff\x01" && !STATION_Utils::isBlacklisted(sender)){   // avoid processing BlackListed stations
+                        if (packet.substring(0,3) == "\x3c\xff\x01" && !STATION_Utils::checkBlackList(sender)){   // avoid processing BlackListed stations
                             rssi        = radio.getRSSI();
                             snr         = radio.getSNR();
                             freqError   = radio.getFrequencyError();

src/ota_utils.cpp

@@ -5,7 +5,6 @@
 #include "ota_utils.h"
 #include "display.h"
 
-
 extern Configuration        Config;
 extern uint32_t             lastScreenOn;
 extern bool                 isUpdatingOTA;

src/query_utils.cpp

@@ -22,9 +22,9 @@ namespace QUERY_Utils {
         String queryQuestion = query;
         queryQuestion.toUpperCase();
         if (queryQuestion == "?APRS?" || queryQuestion == "H" || queryQuestion == "HELP" || queryQuestion=="?") {
-            answer.concat("?APRSV ?APRSP ?APRSL ?APRSSSR ?EM=? ?TX=? "); // ?APRSH ?WHERE callsign
+            answer.concat("?APRSV ?APRSP ?APRSL ?APRSH ?WHERE callsign");
         } else if (queryQuestion == "?APRSV") {
-            answer.concat("CA2RXU_LoRa_iGate 2.3 v");
+            answer.concat("CA2RXU_LoRa_iGate 2.0 v");
             answer.concat(versionDate);
         } else if (queryQuestion == "?APRSP") {
             answer.concat("iGate QTH: ");
@@ -46,69 +46,29 @@ namespace QUERY_Utils {
             char signalData[35];
             snprintf(signalData, sizeof(signalData), " %ddBm / %.2fdB / %dHz", rssi, snr, freqError);
             answer.concat(signalData);        
-        } /*else if (queryQuestion.indexOf("?APRSH") == 0) {
+        } else if (queryQuestion.indexOf("?APRSH") == 0) {
             // sacar callsign despues de ?APRSH
             Serial.println("escuchaste a X estacion? en las ultimas 24 o 8 horas?");
             answer.concat("?APRSH on development 73!");
-        } *//*else if (queryQuestion.indexOf("?WHERE") == 0) { 
+        } else if (queryQuestion.indexOf("?WHERE") == 0) { 
             // agregar callsign para completar donde esta X callsign --> posicion
             Serial.println("estaciones escuchadas directo (ultimos 30 min)");
             answer.concat("?WHERE on development 73!");
-        } */
+        } else if (queryQuestion.indexOf("?APRSEEM") == 0 && Config.digi.ecoMode == true) {    // Exit Digipeater EcoMode
-        else if (STATION_Utils::isManager(station) && (!queryFromAPRSIS || !Config.remoteManagement.rfOnly)) {
+            answer = "DigiEcoMode:Stop";
-            if (queryQuestion.indexOf("?EM=OFF") == 0) {
+            Config.digi.ecoMode         = false;
-                if ((Config.digi.mode == 2 || Config.digi.mode == 3) && Config.loramodule.txActive && Config.loramodule.rxActive && !Config.aprs_is.active) {
+            Config.display.alwaysOn     = true;
-                    if (Config.digi.ecoMode) {    // Exit Digipeater EcoMode
+            Config.display.timeout      = 10;
-                        answer = "DigiEcoMode:OFF";
+            shouldSleepLowVoltage       = true;     // to make sure all packets in outputPacketBuffer are sended before restart.
-                        Config.digi.ecoMode         = false;
+            saveNewDigiEcoModeConfig    = true;
-                        Config.display.alwaysOn     = true;
+        } else if (queryQuestion.indexOf("?APRSSEM") == 0 && Config.digi.ecoMode == false) {    // Start Digipeater EcoMode
-                        Config.display.timeout      = 10;
+            answer = "DigiEcoMode:Start";
-                        shouldSleepLowVoltage       = true;     // to make sure all packets in outputPacketBuffer are sended before restart.
+            Config.digi.ecoMode         = true;
-                        saveNewDigiEcoModeConfig    = true;
+            shouldSleepLowVoltage       = true;     // to make sure all packets in outputPacketBuffer are sended before restart.
-                    } else {
+            saveNewDigiEcoModeConfig    = true;
-                        answer = "DigiEcoMode was OFF";
+        } else if (queryQuestion.indexOf("?APRSEMS") == 0) {    // Digipeater EcoMode Status
-                    }
+            answer = (Config.digi.ecoMode) ? "DigiEcoMode:ON" : "DigiEcoMode:OFF";
-                } else {
-                    answer = "DigiEcoMode control not possible";
-                }
-            } else if (queryQuestion.indexOf("?EM=ON") == 0) {
-                if ((Config.digi.mode == 2 || Config.digi.mode == 3) && Config.loramodule.txActive && Config.loramodule.rxActive && !Config.aprs_is.active) {
-                    if (!Config.digi.ecoMode) {     // Start Digipeater EcoMode
-                        answer = "DigiEcoMode:ON";
-                        Config.digi.ecoMode         = true;
-                        shouldSleepLowVoltage       = true;     // to make sure all packets in outputPacketBuffer are sended before restart.
-                        saveNewDigiEcoModeConfig    = true;
-                    } else {
-                        answer = "DigiEcoMode was ON";
-                    }
-                } else {
-                    answer = "DigiEcoMode control not possible";
-                }
-            } else if (queryQuestion.indexOf("?EM=?") == 0) {    // Digipeater EcoMode Status
-                answer = (Config.digi.ecoMode) ? "DigiEcoMode:ON" : "DigiEcoMode:OFF";
-            } else  if (queryQuestion.indexOf("?TX=ON") == 0) {
-                if (Config.loramodule.txActive) {
-                    answer = "TX was ON";
-                } else {
-                    Config.loramodule.txActive = true;
-                    answer = "TX=ON";
-                }
-            } else if (queryQuestion.indexOf("?TX=OFF") == 0) {
-                if (!Config.loramodule.txActive) {
-                    answer = "TX was OFF";
-                } else {
-                    Config.loramodule.txActive = false;
-                    answer = "TX=OFF";
-                } 
-            } else if (queryQuestion.indexOf("?TX=?") == 0) {
-                answer = (Config.loramodule.txActive) ? "TX=ON" : "TX=OFF";
-            } else if (queryQuestion.indexOf("?COMMIT") == 0) {     // saving for next reboot
-                answer = "New Config Saved";
-                Config.writeFile();
-            }
         }
-        
-        if (answer == "") return "";
 
         String queryAnswer = Config.callsign;
         queryAnswer += ">APLRG1";
@@ -130,11 +90,6 @@ namespace QUERY_Utils {
         queryAnswer += processedStation;
         queryAnswer += ":";
         queryAnswer += answer;
-
-        queryAnswer += " *";
-        queryAnswer += char(random(97, 123));
-        queryAnswer += char(random(97, 123));
-        queryAnswer += "*";
         return queryAnswer;
     }
 

src/station_utils.cpp

@@ -7,7 +7,6 @@
 #include "utils.h"
 #include <vector>
 
-
 extern Configuration            Config;
 extern uint32_t                 lastRxTime;
 extern String                   fourthLine;
@@ -17,8 +16,7 @@ uint32_t lastTxTime             = millis();
 std::vector<LastHeardStation>   lastHeardStations;
 std::vector<String>             outputPacketBuffer;
 std::vector<Packet25SegBuffer>  packet25SegBuffer;
-std::vector<String>             blacklist;
+std::vector<String>             blackList;
-std::vector<String>             managers;
 std::vector<LastHeardStation>   lastHeardObjects;
 
 bool saveNewDigiEcoModeConfig   = false;
@@ -26,52 +24,31 @@ bool saveNewDigiEcoModeConfig   = false;
 
 namespace STATION_Utils {
 
-    std::vector<String> loadCallSignList(const String& list) {
+    void loadBlackList() {
-        std::vector<String> loadedList;
+        if (Config.blackList != "") {
+            String callsigns    = Config.blackList;
+            int spaceIndex      = callsigns.indexOf(" ");
 
-        String callsigns = list;
+            while (spaceIndex >= 0) {
-        callsigns.trim();
+                blackList.push_back(callsigns.substring(0, spaceIndex));
-
+                callsigns   = callsigns.substring(spaceIndex + 1);
-        while (callsigns.length() > 0) {    // != ""
+                spaceIndex  = callsigns.indexOf(" ");
-            int spaceIndex = callsigns.indexOf(" ");
-            if (spaceIndex == -1) {         // No more spaces, add the last part
-                loadedList.push_back(callsigns);
-                break;
             }
-            loadedList.push_back(callsigns.substring(0, spaceIndex));
+            callsigns.trim();
-            callsigns = callsigns.substring(spaceIndex + 1);
+            if (callsigns.length() > 0) blackList.push_back(callsigns); // Add the last word if available
-            callsigns.trim();               // Trim in case of multiple spaces
         }
-        return loadedList;
     }
 
-    void loadBlacklist() {
+    bool checkBlackList(const String& callsign) {
-        blacklist = loadCallSignList(Config.blacklist);
+        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("*"));
-    void loadManagers() {
+                if (callsign.startsWith(wildCard))return true;
-        managers = loadCallSignList(Config.remoteManagement.managers);
-    }
-
-    bool checkCallsignList(const std::vector<String>& list, const String& callsign) {
-        for (int i = 0; i < list.size(); i++) {
-            int wildcardIndex = list[i].indexOf("*");
-            if (wildcardIndex >= 0) {
-                String wildcard = list[i].substring(0, wildcardIndex);
-                if (callsign.startsWith(wildcard)) return true;
             } else {
-                if (list[i] == callsign) return true;
+                if (blackList[i] == callsign) return true;
             }                
         }
         return false;
-    }    
-
-    bool isBlacklisted(const String& callsign) {
-        return checkCallsignList(blacklist, callsign);
-    }
-
-    bool isManager(const String& callsign) {
-        return checkCallsignList(managers, callsign);
     }
 
     void cleanObjectsHeard() {

src/syslog_utils.cpp

@@ -4,7 +4,6 @@
 #include "syslog_utils.h"
 #include "gps_utils.h"
 
-
 extern Configuration    Config;
 
 WiFiUDP udpClient;
@@ -38,16 +37,15 @@ namespace SYSLOG_Utils {
                         syslogPacket.concat(sender);
                         syslogPacket.concat(" ---> "); 
                         syslogPacket.concat(packet.substring(colonIndex + 2));
-                    } else if (nextChar == '!' || nextChar == '=' || nextChar == '@') {
+                    } else if (nextChar == '!' || nextChar == '=') {
                         syslogPacket.concat("GPS / ");
                         syslogPacket.concat(sender);
                         syslogPacket.concat(" / ");
-                        int greaterThanIndex = packet.indexOf(">");
                         if (packet.indexOf("WIDE1-1") > 10) {
-                            syslogPacket.concat(packet.substring(greaterThanIndex + 1, packet.indexOf(",")));
+                            syslogPacket.concat(packet.substring(packet.indexOf(">") + 1, packet.indexOf(",")));
                             syslogPacket.concat(" / WIDE1-1");
                         } else {
-                            syslogPacket.concat(packet.substring(greaterThanIndex + 1, colonIndex));
+                            syslogPacket.concat(packet.substring(packet.indexOf(">") + 1, colonIndex));
                             syslogPacket.concat(" / -");
                         }
                     } else if (nextChar == '>') {
@@ -74,7 +72,7 @@ namespace SYSLOG_Utils {
                         syslogPacket.concat(packet);
                     }
                     syslogPacket.concat(signalData);
-                    if (nextChar == '!' || nextChar == '=' || nextChar == '@') {
+                    if (nextChar == '!' || nextChar == '=') {
                         syslogPacket.concat(" / ");
                         syslogPacket.concat(GPS_Utils::getDistanceAndComment(packet));
                     }

src/tnc_utils.cpp

@@ -5,7 +5,6 @@
 #include "station_utils.h"
 #include "utils.h"
 
-
 extern Configuration        Config;
 
 #define MAX_CLIENTS 4

src/web_utils.cpp

@@ -5,7 +5,6 @@
 #include "display.h"
 #include "utils.h"
 
-
 extern Configuration               Config;
 extern uint32_t                    lastBeaconTx;
 extern std::vector<ReceivedPacket> receivedPackets;
@@ -207,7 +206,7 @@ namespace WEB_Utils {
 
         Config.personalNote                 = request->getParam("personalNote", true)->value();
 
-        Config.blacklist                    = request->getParam("blacklist", true)->value();
+        Config.blackList                    = request->getParam("blackList", true)->value();
 
         Config.webadmin.active              = request->hasParam("webadmin.active", true);
         if (Config.webadmin.active) {
@@ -217,9 +216,6 @@ namespace WEB_Utils {
 
         Config.ntp.gmtCorrection            = request->getParam("ntp.gmtCorrection", true)->value().toFloat();
 
-        Config.remoteManagement.managers    = request->getParam("remoteManagement.managers", true)->value();
-        Config.remoteManagement.rfOnly      = request->getParam("remoteManagement.rfOnly", true);
-
         Config.writeFile();
 
         AsyncWebServerResponse *response    = request->beginResponse(302, "text/html", "");

src/wifi_utils.cpp

@@ -5,7 +5,6 @@
 #include "display.h"
 #include "utils.h"
 
-
 extern Configuration    Config;
 
 extern uint8_t          myWiFiAPIndex;

src/wx_utils.cpp

@@ -31,6 +31,7 @@ Adafruit_Si7021     sensor = Adafruit_Si7021();
 #endif
 
 
+
 namespace WX_Utils {
 
     void getWxModuleAddres() {

variants/ESP32C3_DIY_Ethernet_LoRa/board_pinout.h

@@ -0,0 +1,22 @@
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1278
+    #define RADIO_SCLK_PIN          4
+    #define RADIO_MISO_PIN          5
+    #define RADIO_MOSI_PIN          6
+    #define RADIO_CS_PIN            20
+    #define RADIO_RST_PIN           3
+    #define RADIO_BUSY_PIN          2
+
+    //  Ethernet    W5500
+    #define HAS_ETHERNET
+    #define Ethernet_SCK            4   //  W5550   SCK
+    #define Ethernet_MISO           5   //  W5550   MI
+    #define Ethernet_MOSI           6   //  W5550   MO
+    #define Ethernet_CS             7   //  W5550   CS  (CS = NSS = SS)
+    //#define Ethernet_VCC      3.3v
+    //#define Ethernet_GND      GND
+
+#endif

variants/ESP32C3_DIY_Ethernet_LoRa/platformio.ini

@@ -0,0 +1,10 @@
+[env:ESP32C3_DIY_Ethernet_LoRa]
+board = esp32-c3-devkitm-1
+board_build.mcu = esp32c3
+build_flags =
+	${common.build_flags}
+	${common.usb_flags}
+	-D ESP32C3_DIY_Ethernet_LoRa
+lib_deps =
+	${common.lib_deps}
+	arduino-libraries/Ethernet @ 2.0.2