Merge pull request #157 from S57PNX/main
Correct logic of serial notifications for APRS-IS and RF beacons
This commit is contained in:
commit
a8c972c5e1
|
|
@ -112,7 +112,6 @@ namespace Utils {
|
||||||
if (!Config.display.alwaysOn && Config.display.timeout != 0) {
|
if (!Config.display.alwaysOn && Config.display.timeout != 0) {
|
||||||
displayToggle(true);
|
displayToggle(true);
|
||||||
}
|
}
|
||||||
Utils::println("-- Sending Beacon to APRSIS --");
|
|
||||||
|
|
||||||
STATION_Utils::deleteNotHeard();
|
STATION_Utils::deleteNotHeard();
|
||||||
|
|
||||||
|
|
@ -174,6 +173,7 @@ namespace Utils {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (Config.aprs_is.active && Config.beacon.sendViaAPRSIS && !backUpDigiMode) {
|
if (Config.aprs_is.active && Config.beacon.sendViaAPRSIS && !backUpDigiMode) {
|
||||||
|
Utils::println("-- Sending Beacon to APRSIS --");
|
||||||
displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, "SENDING IGATE BEACON", 0);
|
displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, "SENDING IGATE BEACON", 0);
|
||||||
seventhLine = " listening...";
|
seventhLine = " listening...";
|
||||||
#ifdef HAS_A7670
|
#ifdef HAS_A7670
|
||||||
|
|
@ -184,6 +184,7 @@ namespace Utils {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Config.beacon.sendViaRF || backUpDigiMode) {
|
if (Config.beacon.sendViaRF || backUpDigiMode) {
|
||||||
|
Utils::println("-- Sending Beacon to RF --");
|
||||||
displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, "SENDING DIGI BEACON", 0);
|
displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, "SENDING DIGI BEACON", 0);
|
||||||
seventhLine = " listening...";
|
seventhLine = " listening...";
|
||||||
STATION_Utils::addToOutputPacketBuffer(secondaryBeaconPacket);
|
STATION_Utils::addToOutputPacketBuffer(secondaryBeaconPacket);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue