Skip to content

Commit ffd3eae

Browse files
committed
fixes for beaconUpdate
1 parent df03a49 commit ffd3eae

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,9 @@ jobs:
7878
- name: QRPLabs_LightGateway_1_0
7979
chip: esp32s3
8080
- name: XIAO_ESP32S3_WIO_SX1262
81-
chip: esp32s3
81+
chip: esp32s3
82+
- name: TROY_LoRa_APRS
83+
chip: esp32
8284
steps:
8385
- uses: actions/checkout@v3
8486

src/LoRa_APRS_iGate.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ ___________________________________________________________________*/
4848
#include "A7670_utils.h"
4949
#endif
5050

51-
String versionDate = "2025.01.06";
51+
String versionDate = "2025.01.07";
5252
Configuration Config;
5353
WiFiClient espClient;
5454
#ifdef HAS_GPS

src/utils.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ namespace Utils {
186186

187187
void checkBeaconInterval() {
188188
uint32_t lastTx = millis() - lastBeaconTx;
189-
if (((Config.aprs_is.active && passcodeValid) || Config.digi.mode != 0) && (lastBeaconTx == 0 || lastTx >= Config.beacon.interval * 60 * 1000)) {
189+
if (lastBeaconTx == 0 || lastTx >= Config.beacon.interval * 60 * 1000) {
190190
beaconUpdate = true;
191191
}
192192

@@ -198,9 +198,7 @@ namespace Utils {
198198
#endif
199199

200200
if (beaconUpdate) {
201-
if (!Config.display.alwaysOn && Config.display.timeout != 0) {
202-
displayToggle(true);
203-
}
201+
if (!Config.display.alwaysOn && Config.display.timeout != 0) displayToggle(true);
204202

205203
if (sendStartTelemetry && Config.battery.sendVoltageAsTelemetry && !Config.wxsensor.active && (Config.battery.sendInternalVoltage || Config.battery.sendExternalVoltage)) {
206204
sendInitialTelemetryPackets();
@@ -289,7 +287,7 @@ namespace Utils {
289287
secondaryBeaconPacket += encodedTelemetry;
290288
}
291289

292-
if (Config.aprs_is.active && Config.beacon.sendViaAPRSIS && !backUpDigiMode) {
290+
if (Config.beacon.sendViaAPRSIS && Config.aprs_is.active && passcodeValid && !backUpDigiMode) {
293291
Utils::println("-- Sending Beacon to APRSIS --");
294292
displayShow(firstLine, secondLine, thirdLine, fourthLine, fifthLine, sixthLine, "SENDING IGATE BEACON", 0);
295293
seventhLine = " listening...";

0 commit comments

Comments
 (0)