mirror of
https://github.com/richonguzman/LoRa_APRS_iGate.git
synced 2026-10-31 02:51:58 +01:00
variable name change and payload id change for messages
This commit is contained in:
1 parent
e6f8953da2
commit
9bddbdf20a
3 files changed
+8
-9
No files matched your search
@@ -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;
|
||||
|
||||
+5
-5
@@ -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 += ":=";
|
||||
|
||||
+3
-3
@@ -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;
|
||||
|
||||
|
||||
Reference in new issue
Block a user