iarv/LoRa_APRS_iGate
1
0
Fork 1
mirror of https://github.com/richonguzman/LoRa_APRS_iGate.git synced 2026-03-28 16:52:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tactical 6 update

Browse Source
This commit is contained in:
Ricardo Guzman (Richonguzman)
2026-01-11 11:46:23 -03:00
parent 66a5f03c12
commit d638093dbf
4 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/LoRa_APRS_iGate.cpp
View File

@@ -67,7 +67,7 @@ ___________________________________________________________________*/
#endif
String versionDate = "2026-01-07";
String versionDate = "2026-01-11";
String versionNumber = "3.1.7.1";
Configuration Config;
WiFiClient aprsIsClient;

6
src/gps_utils.cpp
View File

@@ -34,6 +34,7 @@
extern Configuration Config;
extern HardwareSerial gpsSerial;
extern TinyGPSPlus gps;
extern bool callsignIsValid;
String distance, iGateBeaconPacket, iGateLoRaBeaconPacket;
@@ -48,7 +49,7 @@ namespace GPS_Utils {
String encodedGPS = APRSPacketLib::encodeGPSIntoBase91(Config.beacon.latitude, Config.beacon.longitude, 0, 0, Config.beacon.symbol, false, 0, true, Config.beacon.ambiguityLevel);
if (Config.callsign.indexOf("NOCALL-10") != 0) {
if (!Utils::checkValidCallsign(Config.callsign)) {
if (!callsignIsValid) {
displayShow("***** ERROR ******", "CALLSIGN = NOT VALID!", "", "Only Rx Mode Active", 3000);
Config.loramodule.txActive = false;
Config.aprs_is.messagesToRF = false;
@@ -56,9 +57,8 @@ namespace GPS_Utils {
Config.beacon.sendViaRF = false;
Config.digi.mode = 0;
Config.backupDigiMode = false;
} else if (Utils::checkValidCallsign(Config.callsign) && Config.tacticalCallsign != "") {
} else if (callsignIsValid && Config.tacticalCallsign != "") {
beaconPacket = APRSPacketLib::generateBasePacket(Config.tacticalCallsign, "APLRG1", Config.beacon.path);
Config.beacon.comment = Config.beacon.comment + " de " + Config.callsign;
Config.aprs_is.active = false;
Config.beacon.sendViaAPRSIS = false;
Config.backupDigiMode = false;

3
src/power_utils.cpp
View File

@@ -20,6 +20,7 @@
#include "battery_utils.h"
#include "board_pinout.h"
#include "power_utils.h"
#include "utils.h"
#if defined(HAS_AXP192) || defined(HAS_AXP2101)
#ifdef TTGO_T_Beam_S3_SUPREME_V3
@@ -43,6 +44,7 @@
#endif
extern Configuration Config;
extern bool callsignIsValid;
namespace POWER_Utils {
@@ -326,6 +328,7 @@ namespace POWER_Utils {
delay(1000);
BATTERY_Utils::setup();
BATTERY_Utils::startupBatteryHealth();
callsignIsValid = Utils::checkValidCallsign(Config.callsign);
setCpuFrequencyMhz(80);
}

7
src/utils.cpp
View File

@@ -65,6 +65,7 @@ bool sendStartTelemetry = true;
bool beaconUpdate = false;
uint32_t lastBeaconTx = 0;
uint32_t lastScreenOn = millis();
bool callsignIsValid = false;
String beaconPacket;
String secondaryBeaconPacket;
@@ -191,6 +192,12 @@ namespace Utils {
}
beaconPacket += Config.beacon.comment;
secondaryBeaconPacket += Config.beacon.comment;
if (callsignIsValid && Config.tacticalCallsign != "") {
beaconPacket += " de ";
beaconPacket += Config.callsign;
secondaryBeaconPacket += " de ";
secondaryBeaconPacket += Config.callsign;
}
#if defined(BATTERY_PIN) || defined(HAS_AXP192) || defined(HAS_AXP2101)
if (Config.battery.sendInternalVoltage || Config.battery.monitorInternalVoltage) {