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

validate stations heard

Browse source
This commit is contained in:
richonguzman 2023-06-06 14:37:47 -04:00
parent f648140049
commit ec409a0b18
3 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/LoRa_APRS_iGate.cpp
View file

@ -152,15 +152,6 @@ void checkReceivedPacket(String packet) {
}
}
String processAPRSISPacket(String aprsisMessage) {
String firstPart, messagePart, newLoraPacket;
aprsisMessage.trim();
firstPart = aprsisMessage.substring(0, aprsisMessage.indexOf(","));
messagePart = aprsisMessage.substring(aprsisMessage.indexOf("::")+2);
newLoraPacket = firstPart + ",TCPIP," + Config.callsign + "::" + messagePart;
return newLoraPacket;
}
void setup() {
Serial.begin(115200);
delay(1000);
@ -243,7 +234,7 @@ void loop() {
}
if (espClient.available()) {
String aprsisData, aprsisPacket, newLoraPacket, Sender, AddresseeAndMessage, Addressee, receivedMessage;
String aprsisData, aprsisPacket, Sender, AddresseeAndMessage, Addressee, receivedMessage;
bool validHeardStation = false;
aprsisData = espClient.readStringUntil('\r'); // or '\n'
aprsisPacket.concat(aprsisData);
@ -283,8 +274,7 @@ void loop() {
} else {
Serial.print("Received from APRS-IS : " + aprsisPacket);
if (STATION_Utils::wasHeard(Addressee)) {
newLoraPacket = processAPRSISPacket(aprsisPacket);
LoRaUtils::sendNewPacket("APRS", newLoraPacket);
LoRaUtils::sendNewPacket("APRS", LoRaUtils::generatePacket(aprsisPacket));
display_toggle(true);
lastRxTxTime = millis();
receivedMessage = AddresseeAndMessage.substring(AddresseeAndMessage.indexOf(":")+1);

8
src/lora_utils.cpp
View file

@ -39,6 +39,14 @@ void sendNewPacket(const String &typeOfMessage, const String &newPacket) {
Serial.println(newPacket);
}
String generatePacket(String aprsisPacket) {
String firstPart, messagePart;
aprsisPacket.trim();
firstPart = aprsisPacket.substring(0, aprsisPacket.indexOf(","));
messagePart = aprsisPacket.substring(aprsisPacket.indexOf("::")+2);
return firstPart + ",TCPIP," + Config.callsign + "::" + messagePart;
}
/*String receivePacket() {
String loraPacket;
int packetSize = LoRa.parsePacket(); // Listening for LoRa Packets

1
src/lora_utils.h
View file

@ -5,6 +5,7 @@ namespace LoRaUtils {
void setup();
void sendNewPacket(const String &typeOfMessage, const String &newPacket);
String generatePacket(String aprsisPacket);
//String receivePacket();
}