From 9bddbdf20ad2f91b4b9a5eb4992d019228026034 Mon Sep 17 00:00:00 2001 From: Ricardo Guzman Date: Sun, 4 Oct 2026 12:16:41 -0300 Subject: [PATCH] variable name change and payload id change for messages --- src/digi_utils.cpp | 1 - src/gps_utils.cpp | 10 +++++----- src/utils.cpp | 6 +++--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/digi_utils.cpp b/src/digi_utils.cpp index db5ed4d..cdb9e72 100644 --- a/src/digi_utils.cpp +++ b/src/digi_utils.cpp @@ -31,7 +31,6 @@ extern Configuration Config; extern uint32_t lastScreenOn; extern APRSPacket lastAprsPacket; -extern String iGateBeaconPacket; extern String firstLine; extern String secondLine; extern String thirdLine; diff --git a/src/gps_utils.cpp b/src/gps_utils.cpp index 2615efd..441ee79 100644 --- a/src/gps_utils.cpp +++ b/src/gps_utils.cpp @@ -40,7 +40,7 @@ extern Configuration Config; extern HardwareSerial gpsSerial; extern TinyGPSPlus gps; extern bool stationCallsignIsValid; -String distance, iGateBeaconPacket, iGateLoRaBeaconPacket; +String distance, iGateAPRSISBeaconPacket, iGateLoRaBeaconPacket; namespace GPS_Utils { @@ -143,10 +143,10 @@ namespace GPS_Utils { Config.beacon.sendViaRF = false; } - iGateBeaconPacket = beaconPacket; - iGateBeaconPacket += ",qAC:="; - iGateBeaconPacket += Config.beacon.overlay; - iGateBeaconPacket += encodedGPS; + iGateAPRSISBeaconPacket = beaconPacket; + iGateAPRSISBeaconPacket += ",qAC:="; + iGateAPRSISBeaconPacket += Config.beacon.overlay; + iGateAPRSISBeaconPacket += encodedGPS; iGateLoRaBeaconPacket = beaconPacket; iGateLoRaBeaconPacket += ":="; diff --git a/src/utils.cpp b/src/utils.cpp index 6a7d2b1..89e01e3 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -48,7 +48,7 @@ extern String fourthLine; extern String fifthLine; extern String sixthLine; extern String seventhLine; -extern String iGateBeaconPacket; +extern String iGateAPRSISBeaconPacket; extern String iGateLoRaBeaconPacket; extern int rssi; extern float snr; @@ -188,7 +188,7 @@ namespace Utils { showActiveStations(); - beaconPacket = iGateBeaconPacket; + beaconPacket = iGateAPRSISBeaconPacket; secondaryBeaconPacket = iGateLoRaBeaconPacket; #ifdef HAS_GPS if (Config.beacon.gpsActive && Config.digi.ecoMode == 0) { @@ -198,7 +198,7 @@ namespace Utils { String encodedGPS = APRSPacketLib::encodeGPSIntoBase91(gps.location.lat(),gps.location.lng(), 0, 0, Config.beacon.symbol, false, 0, true, Config.beacon.ambiguityLevel); beaconPacket = basePacket; - beaconPacket += ",qAC:!"; + beaconPacket += ",qAC:="; beaconPacket += Config.beacon.overlay; beaconPacket += encodedGPS;