ua1zbe
/
LoRa_APRS_iGate111
mirror of https://github.com/richonguzman/LoRa_APRS_iGate.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ht-ct62 updates

This commit is contained in:
richonguzman 2024-08-13 12:36:37 -04:00
parent 1019306c7c
commit bc5183a192
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/LoRa_APRS_iGate.cpp
View File

@ -38,7 +38,7 @@ ________________________________________________________________________________
#include "A7670_utils.h" #include "A7670_utils.h"
#endif #endif
String versionDate = "2024.08.12"; String versionDate = "2024.08.13";
Configuration Config; Configuration Config;
WiFiClient espClient; WiFiClient espClient;
@ -98,7 +98,7 @@ void setup() {
String comment = Config.beacon.comment; String comment = Config.beacon.comment;
if (Config.battery.sendInternalVoltage) comment += " Batt=" + String(BATTERY_Utils::checkInternalVoltage(),2) + "V"; if (Config.battery.sendInternalVoltage) comment += " Batt=" + String(BATTERY_Utils::checkInternalVoltage(),2) + "V";
if (Config.battery.sendExternalVoltage) comment += " Ext=" + String(BATTERY_Utils::checkExternalVoltage(),2) + "V"; if (Config.battery.sendExternalVoltage) comment += " Ext=" + String(BATTERY_Utils::checkExternalVoltage(),2) + "V";
STATION_Utils::addToOutputPacketBuffer(GPS_Utils::getiGateLoRaBeaconPacket() + comment); LoRa_Utils::sendNewPacket(GPS_Utils::getiGateLoRaBeaconPacket() + comment);
lastBeacon = time; lastBeacon = time;
} }

9
src/digi_utils.cpp
View File

@ -5,6 +5,7 @@
#include "query_utils.h" #include "query_utils.h"
#include "digi_utils.h" #include "digi_utils.h"
#include "wifi_utils.h" #include "wifi_utils.h"
#include "lora_utils.h"
#include "gps_utils.h" #include "gps_utils.h"
#include "display.h" #include "display.h"
#include "utils.h" #include "utils.h"
@ -102,7 +103,7 @@ namespace DIGI_Utils {
if (!thirdPartyPacket && !Utils::checkValidCallsign(Sender)) { if (!thirdPartyPacket && !Utils::checkValidCallsign(Sender)) {
return; return;
} }
if (STATION_Utils::check25SegBuffer(Sender, temp.substring(temp.indexOf(":") + 2))) { if (STATION_Utils::check25SegBuffer(Sender, temp.substring(temp.indexOf(":") + 2)) || Config.lowPowerMode) {
STATION_Utils::updateLastHeard(Sender); STATION_Utils::updateLastHeard(Sender);
Utils::typeOfPacket(temp, 2); // Digi Utils::typeOfPacket(temp, 2); // Digi
bool queryMessage = false; bool queryMessage = false;
@ -117,7 +118,11 @@ namespace DIGI_Utils {
if (!queryMessage) { if (!queryMessage) {
String loraPacket = generateDigiRepeatedPacket(packet.substring(3), thirdPartyPacket); String loraPacket = generateDigiRepeatedPacket(packet.substring(3), thirdPartyPacket);
if (loraPacket != "") { if (loraPacket != "") {
STATION_Utils::addToOutputPacketBuffer(loraPacket); if (Config.lowPowerMode) {
LoRa_Utils::sendNewPacket(loraPacket);
} else {
STATION_Utils::addToOutputPacketBuffer(loraPacket);
}
display_toggle(true); display_toggle(true);
lastScreenOn = millis(); lastScreenOn = millis();
} }

4
src/lora_utils.cpp
View File

@ -160,9 +160,9 @@ namespace LoRa_Utils {
String receivePacket() { String receivePacket() {
String packet = ""; String packet = "";
if (operationDone) { if (operationDone || Config.lowPowerMode) {
operationDone = false; operationDone = false;
if (transmitFlag) { if (transmitFlag && !Config.lowPowerMode) {
radio.startReceive(); radio.startReceive();
transmitFlag = false; transmitFlag = false;
} else { } else {