digirepeater Beacon fixed

.github/workflows/build.yml

@@ -77,6 +77,8 @@ jobs:
                       chip: esp32c3
                     - name: QRPLabs_LightGateway_1_0
                       chip: esp32s3
+                    - name: XIAO_ESP32S3_WIO_SX1262
+                      chip: esp32s3                    
         steps:
             - uses: actions/checkout@v3
 

common_settings.ini

@@ -32,7 +32,7 @@ lib_deps =
 	arduino-libraries/NTPClient @ 3.2.1
 	ayushsharma82/ElegantOTA @ 3.1.5
 	bblanchon/ArduinoJson @ 6.21.3
-	jgromes/RadioLib @ 6.6.0
+	jgromes/RadioLib @ 7.1.0
 	mathieucarbou/AsyncTCP @ 3.2.5
 	mathieucarbou/ESPAsyncWebServer @ 3.2.3
 	mikalhart/TinyGPSPlus @ 1.0.3	

data_embed/index.html

@@ -77,7 +77,7 @@
                             </tbody>
                         </table>
                         <span>List refresh automatically every 15 seconds.</span><br>
-                        <small>(Local Time is NPT-Time adjusted with your GMT Offset)</small>
+                        <small>(Local Time is NTP-Time adjusted with your GMT Offset)</small>
                     </div>
                 </div>
                 <hr />
@@ -1310,7 +1310,7 @@
                                             type="text"
                                             name="syslog.port"
                                             id="syslog.port"
-                                            placeholder="514"
+                                            placeholder="1514"
                                             class="form-control"
                                             disabled
                                         />

include/README

@@ -1,39 +0,0 @@
-
-This directory is intended for project header files.
-
-A header file is a file containing C declarations and macro definitions
-to be shared between several project source files. You request the use of a
-header file in your project source file (C, C++, etc) located in `src` folder
-by including it, with the C preprocessing directive `#include'.
-
-```src/main.c
-
-#include "header.h"
-
-int main (void)
-{
- ...
-}
-```
-
-Including a header file produces the same results as copying the header file
-into each source file that needs it. Such copying would be time-consuming
-and error-prone. With a header file, the related declarations appear
-in only one place. If they need to be changed, they can be changed in one
-place, and programs that include the header file will automatically use the
-new version when next recompiled. The header file eliminates the labor of
-finding and changing all the copies as well as the risk that a failure to
-find one copy will result in inconsistencies within a program.
-
-In C, the usual convention is to give header files names that end with `.h'.
-It is most portable to use only letters, digits, dashes, and underscores in
-header file names, and at most one dot.
-
-Read more about using header files in official GCC documentation:
-
-* Include Syntax
-* Include Operation
-* Once-Only Headers
-* Computed Includes
-
-https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html

include/aprs_is_utils.h

@@ -8,6 +8,7 @@ namespace APRS_IS_Utils {
 
     void    upload(const String& line);
     void    connect();
+    
     void    checkStatus();
     String  checkForStartingBytes(const String& packet);
     
@@ -19,6 +20,8 @@ namespace APRS_IS_Utils {
     void    processAPRSISPacket(const String& packet);
     void    listenAPRSIS();
 
+    void    firstConnection();
+
 }
 
 #endif

src/LoRa_APRS_iGate.cpp

@@ -48,7 +48,7 @@ ___________________________________________________________________*/
     #include "A7670_utils.h"
 #endif
 
-String              versionDate             = "2024.11.06";
+String              versionDate             = "2024.12.30";
 Configuration       Config;
 WiFiClient          espClient;
 #ifdef HAS_GPS
@@ -136,6 +136,7 @@ void setup() {
         A7670_Utils::setup();
     #endif
     Utils::checkRebootMode();
+    APRS_IS_Utils::firstConnection();
 }
 
 void loop() {
@@ -149,14 +150,13 @@ void loop() {
     if (Config.lowVoltageCutOff > 0) {
         BATTERY_Utils::checkIfShouldSleep();
     }
-
+    
     thirdLine = Utils::getLocalIP();
 
-    WIFI_Utils::checkWiFi();
-
     #ifdef HAS_A7670
         if (Config.aprs_is.active && !modemLoggedToAPRSIS) A7670_Utils::APRS_IS_connect();
     #else
+        WIFI_Utils::checkWiFi();
         if (Config.aprs_is.active && (WiFi.status() == WL_CONNECTED) && !espClient.connected()) APRS_IS_Utils::connect();
     #endif
 
@@ -191,10 +191,10 @@ void loop() {
         }
     }
 
-    if (Config.aprs_is.active) { // If APRSIS enabled
+    if (Config.aprs_is.active) {
         APRS_IS_Utils::listenAPRSIS(); // listen received packet from APRSIS
     }
-    
+
     STATION_Utils::processOutputPacketBuffer();
 
     displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, seventhLine, 0);

src/aprs_is_utils.cpp

@@ -22,7 +22,8 @@ extern String               seventhLine;
 extern bool                 modemLoggedToAPRSIS;
 extern bool                 backUpDigiMode;
 
-uint32_t lastRxTime         = millis();
+uint32_t    lastRxTime      = millis();
+bool        passcodeValid   = false;
 
 #ifdef HAS_A7670
     extern bool                 stationBeacon;
@@ -50,11 +51,9 @@ namespace APRS_IS_Utils {
         }
         if (count == 20) {
             Serial.println("Tried: " + String(count) + " FAILED!");
-        }
-        else {
+        } else {
             Serial.println("Connected!\n(Server: " + String(Config.aprs_is.server) + " / Port: " + String(Config.aprs_is.port) + ")");
             // String filter = "t/m/" + Config.callsign + "/" + (String)Config.aprs_is.reportingDistance;
-
             String aprsAuth = "user ";
             aprsAuth += Config.callsign;
             aprsAuth += " pass ";
@@ -62,7 +61,6 @@ namespace APRS_IS_Utils {
             aprsAuth += " vers CA2RXU_LoRa_iGate 2.0 filter ";
             aprsAuth += Config.aprs_is.filter;
             upload(aprsAuth);
-            delay(200);
         }
     }
 
@@ -174,7 +172,7 @@ namespace APRS_IS_Utils {
     }
 
     void processLoRaPacket(const String& packet) {
-        if (espClient.connected() || modemLoggedToAPRSIS) {
+        if (passcodeValid && (espClient.connected() || modemLoggedToAPRSIS)) {
             if (packet != "") {
                 if ((packet.substring(0, 3) == "\x3c\xff\x01")  && (packet.indexOf("NOGATE") == -1) && (packet.indexOf("RFONLY") == -1)) {
                     int firstColonIndex = packet.indexOf(":");
@@ -259,13 +257,22 @@ namespace APRS_IS_Utils {
     }
 
     void processAPRSISPacket(const String& packet) {
-        if (!packet.startsWith("#")) {
+        if (!passcodeValid && packet.indexOf(Config.callsign) != -1) {
+            if (packet.indexOf("unverified") != -1 ) {
+                Serial.println("\n****APRS PASSCODE NOT VALID****\n");
+                displayShow(firstLine, "", "    APRS PASSCODE", "    NOT VALID !!!", "", "", "", 0);
+                while (1) {};
+            } else if (packet.indexOf("verified") != -1 ) {
+                passcodeValid = true;
+            }
+        }
+        if (passcodeValid && !packet.startsWith("#")) {
             if (Config.aprs_is.messagesToRF && packet.indexOf("::") > 0) {
                 String Sender = packet.substring(0, packet.indexOf(">"));
                 const String& AddresseeAndMessage = packet.substring(packet.indexOf("::") + 2);
                 String Addressee = AddresseeAndMessage.substring(0, AddresseeAndMessage.indexOf(":"));
                 Addressee.trim();
-                if (Addressee == Config.callsign) {             // its for me!
+                if (Addressee == Config.callsign) {                 // its for me!
                     String receivedMessage;
                     if (AddresseeAndMessage.indexOf("{") > 0) {     // ack?
                         String ackMessage = "ack";
@@ -350,4 +357,13 @@ namespace APRS_IS_Utils {
         #endif
     }
 
+    void firstConnection() {
+        if (Config.aprs_is.active && (WiFi.status() == WL_CONNECTED) && !espClient.connected()) {
+            connect();
+            while (!passcodeValid) {
+                listenAPRSIS();
+            }
+        }
+    }
+
 }

src/configuration.cpp

@@ -196,7 +196,7 @@ bool Configuration::readFile() {
 
         syslog.active                   = data["syslog"]["active"] | false;
         syslog.server                   = data["syslog"]["server"] | "lora.link9.net";
-        syslog.port                     = data["syslog"]["port"] | 514;
+        syslog.port                     = data["syslog"]["port"] | 1514;
 
         tnc.enableServer                = data["tnc"]["enableServer"] | false;
         tnc.enableSerial                = data["tnc"]["enableSerial"] | false;
@@ -293,7 +293,7 @@ void Configuration::init() {
 
     syslog.active                   = false;
     syslog.server                   = "lora.link9.net";
-    syslog.port                     = 514;
+    syslog.port                     = 1514;
 
     wxsensor.active                 = false;
     wxsensor.heightCorrection       = 0;

src/display.cpp

@@ -21,9 +21,6 @@
         #else
             #include <Adafruit_GFX.h>
             #include <Adafruit_SSD1306.h>
-            #if defined(HELTEC_V3) || defined(HELTEC_WS)
-                #define OLED_DISPLAY_HAS_RST_PIN
-            #endif
             #ifdef HELTEC_WSL_V3_DISPLAY
                 Adafruit_SSD1306 display(128, 64, &Wire1, OLED_RST);
             #else

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

@@ -205,7 +205,7 @@ namespace POWER_Utils {
             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)
+        #if defined(HELTEC_V3) || defined(HELTEC_WS) || defined(LIGHTGATEWAY_1_0) || defined(TTGO_LORA32_T3S3_V1_2) || defined(HELTEC_V2)
             Wire.begin(OLED_SDA, OLED_SCL);
         #endif
         

src/station_utils.cpp

@@ -70,34 +70,22 @@ namespace STATION_Utils {
         Utils::println(" ---> Station not Heard for last 30 min (Not Tx)\n");
         return false;
     }
-
     void clean25SegBuffer() {
-        if (!packet25SegBuffer.empty()) {
-            if ((millis() - packet25SegBuffer[0].receivedTime) >  25 * 1000) {
-                packet25SegBuffer.erase(packet25SegBuffer.begin());
-            }
-        }
+        if (!packet25SegBuffer.empty() && (millis() - packet25SegBuffer[0].receivedTime) >  25 * 1000) packet25SegBuffer.erase(packet25SegBuffer.begin());
     }
 
     bool check25SegBuffer(const String& station, const String& textMessage) {
-        bool shouldBeIgnored = false;
         if (!packet25SegBuffer.empty()) {
             for (int i = 0; i < packet25SegBuffer.size(); i++) {
-                if (packet25SegBuffer[i].station == station && packet25SegBuffer[i].payload == textMessage) {
-                    shouldBeIgnored = true;
-                }
+                if (packet25SegBuffer[i].station == station && packet25SegBuffer[i].payload == textMessage) return false;
             }
         }
-        if (shouldBeIgnored) {
-            return false;
-        } else {
-            Packet25SegBuffer packet;
-            packet.receivedTime = millis();
-            packet.station      = station;
-            packet.payload      = textMessage;
-            packet25SegBuffer.push_back(packet);
-            return true;
-        }
+        Packet25SegBuffer   packet;
+        packet.receivedTime = millis();
+        packet.station      = station;
+        packet.payload      = textMessage;
+        packet25SegBuffer.push_back(packet);
+        return true;
     }
 
     void processOutputPacketBuffer() {

src/utils.cpp

@@ -37,12 +37,13 @@ extern int                  wxModuleType;
 extern bool                 backUpDigiMode;
 extern bool                 shouldSleepLowVoltage;
 extern bool                 transmitFlag;
+extern bool                 passcodeValid;
 
 extern std::vector<LastHeardStation>    lastHeardStations;
 
 bool        statusAfterBoot     = true;
 bool        sendStartTelemetry  = true;
-bool        beaconUpdate        = true;
+bool        beaconUpdate        = false;
 uint32_t    lastBeaconTx        = 0;
 uint32_t    lastScreenOn        = millis();
 String      beaconPacket;
@@ -185,7 +186,7 @@ namespace Utils {
 
     void checkBeaconInterval() {
         uint32_t lastTx = millis() - lastBeaconTx;
-        if (lastBeaconTx == 0 || lastTx >= Config.beacon.interval * 60 * 1000) {
+        if (((Config.aprs_is.active && passcodeValid) || Config.digi.mode != 0) && (lastBeaconTx == 0 || lastTx >= Config.beacon.interval * 60 * 1000)) {
             beaconUpdate = true;    
         }
 

test/README

@@ -1,11 +0,0 @@
-
-This directory is intended for PlatformIO Test Runner and project tests.
-
-Unit Testing is a software testing method by which individual units of
-source code, sets of one or more MCU program modules together with associated
-control data, usage procedures, and operating procedures, are tested to
-determine whether they are fit for use. Unit testing finds problems early
-in the development cycle.
-
-More information about PlatformIO Unit Testing:
-- https://docs.platformio.org/en/latest/advanced/unit-testing/index.html

variants/XIAO_ESP32S3_WIO_SX1262/board_pinout.h

@@ -0,0 +1,20 @@
+#ifndef BOARD_PINOUT_H_
+#define BOARD_PINOUT_H_
+
+    //  LoRa Radio
+    #define HAS_SX1262
+    #define RADIO_SCLK_PIN      7
+    #define RADIO_MISO_PIN      8
+    #define RADIO_MOSI_PIN      9
+    #define RADIO_CS_PIN        41
+    #define RADIO_RST_PIN       42
+    #define RADIO_DIO1_PIN      39
+    #define RADIO_BUSY_PIN      40
+
+    #define RADIO_HAS_RF_SWITCH //  DIO02
+    #define RADIO_RF_SWITCH     38
+
+    #define BUTTON_PIN          21
+    #define INTERNAL_LED_PIN    48
+    
+#endif

variants/XIAO_ESP32S3_WIO_SX1262/platformio.ini

@@ -0,0 +1,8 @@
+[env:XIAO_ESP32S3_WIO_SX1262]
+board = seeed_xiao_esp32s3
+build_flags =
+	${common.build_flags}
+	${common.usb_flags}
+	-D XIAO_ESP32S3_LORA
+lib_deps =
+	${common.lib_deps}

variants/heltec-lora32-v2/board_pinout.h

@@ -20,6 +20,7 @@
     #define OLED_SDA                4
     #define OLED_SCL                15
     #define OLED_RST                16
+    #define OLED_DISPLAY_HAS_RST_PIN
 
     //  Aditional Config
     #define INTERNAL_LED_PIN        25

variants/heltec_wifi_lora_32_V3/board_pinout.h

@@ -21,6 +21,7 @@
     #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

variants/heltec_wireless_stick/board_pinout.h

@@ -21,6 +21,7 @@
     #define OLED_SDA                4
     #define OLED_SCL                15
     #define OLED_RST                16
+    #define OLED_DISPLAY_HAS_RST_PIN
 
     //  Aditional Config
     #define INTERNAL_LED_PIN        35