adam/LoRa_APRS_iGate
1
0 Fork 0
mirror of https://github.com/richonguzman/LoRa_APRS_iGate.git synced 2026-10-31 02:51:58 +01:00
Code Issues 55 Packages Projects Releases Wiki Activity

update destination

Browse Source
This commit is contained in:
richonguzman committed 2023-06-06 17:25:50 -04:00
1 parent 32b91a97a3
commit 9769996717
4 files changed
+6 -39
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/LoRa_APRS_iGate.cpp
+2 -35
View File
@@ -39,39 +39,6 @@ std::vector<String> lastHeardStation_temp;
String firstLine, secondLine, thirdLine, fourthLine, iGateBeaconPacket;
/*String processQueryAnswer(String query, String station, String queryOrigin) {
String processedQuery, queryAnswer;
if (query=="?APRS?" || query=="?aprs?" || query=="?Aprs?" || query=="H" || query=="h" || query=="Help" || query=="help" || query=="?") {
processedQuery = "?APRSV ?APRSP ?APRSL ?APRSH ?WHERE callsign";
} else if (query=="?APRSV" || query=="?aprsv" || query=="?Aprsv") {
processedQuery = Config.aprs_is.softwareName + " " + Config.aprs_is.softwareVersion;
} else if (query=="?APRSP" || query=="?aprsp" || query=="?Aprsp") {
processedQuery = "iGate QTH: " + String(currentWiFi->latitude) + " " + String(currentWiFi->longitude);
} else if (query=="?APRSL" || query=="?aprsl" || query=="?Aprsl") {
for (int i=0; i<lastHeardStation.size(); i++) {
processedQuery += lastHeardStation[i].substring(0,lastHeardStation[i].indexOf(",")) + " ";
}
processedQuery.trim();
} /*else if (query.indexOf("?APRSH") == 0 || query.indexOf("?aprsv") == 0 || query.indexOf("?Aprsv") == 0) {
// sacar callsign despues de ?APRSH
Serial.println("escuchaste a X estacion? en las ultimas 24 o 8 horas?");
processedQuery = "APRSH";
} else if (query.indexOf("?WHERE") == 0) {
// agregar callsign para completar donde esta X callsign
Serial.println("estaciones escuchadas directo (ultimos 30 min)");
processedQuery = "WHERE";
}
for(int i = station.length(); i < 9; i++) {
station += ' ';
}
if (queryOrigin == "APRSIS") {
queryAnswer = Config.callsign + ">APLR10,TCPIP,qAC::" + station + ":" + processedQuery + "\n";
} else if (queryOrigin == "LoRa") {
queryAnswer = Config.callsign + ">APLR10,RFONLY::" + station + ":" + processedQuery;
}
return queryAnswer;
}*/
void checkReceivedPacket(String packet) {
bool queryMessage = false;
String aprsPacket, Sender, AddresseeAndMessage, Addressee, ackMessage, receivedMessage;
@@ -94,7 +61,7 @@ void checkReceivedPacket(String packet) {
for(int i = Sender.length(); i < 9; i++) {
Sender += ' ';
}
LoRaUtils::sendNewPacket("APRS", Config.callsign + ">APLR10,RFONLY::" + Sender + ":" + ackMessage);
LoRaUtils::sendNewPacket("APRS", Config.callsign + ">APLRG1,RFONLY::" + Sender + ":" + ackMessage);
receivedMessage = AddresseeAndMessage.substring(AddresseeAndMessage.indexOf(":")+1, AddresseeAndMessage.indexOf("{"));
} else {
receivedMessage = AddresseeAndMessage.substring(AddresseeAndMessage.indexOf(":")+1);
@@ -240,7 +207,7 @@ void loop() {
for(int i = Sender.length(); i < 9; i++) {
Sender += ' ';
}
String ackPacket = Config.callsign + ">APLR10,TCPIP,qAC::" + Sender + ":" + ackMessage + "\n";
String ackPacket = Config.callsign + ">APLRG1,TCPIP,qAC::" + Sender + ":" + ackMessage + "\n";
espClient.write(ackPacket.c_str());
receivedMessage = AddresseeAndMessage.substring(AddresseeAndMessage.indexOf(":")+1, AddresseeAndMessage.indexOf("{"));
} else {
src/gps_utils.cpp
+1 -1
View File
@@ -74,7 +74,7 @@ String processLongitudeAPRS() {
String generateBeacon() {
String iGateLat = processLatitudeAPRS();
String iGateLon = processLongitudeAPRS();
String beaconPacket = Config.callsign + ">APLR10,qAC:=";
String beaconPacket = Config.callsign + ">APLRG1,qAC:=";
if (Config.loramodule.enableTx) {
beaconPacket += iGateLat + "L" + iGateLon + "a";
} else {
src/query_utils.cpp
+2 -2
View File
@@ -34,9 +34,9 @@ String process(String query, String station, String queryOrigin) {
station += ' ';
}
if (queryOrigin == "APRSIS") {
return Config.callsign + ">APLR10,TCPIP,qAC::" + station + ":" + answer + "\n";
return Config.callsign + ">APLRG1,TCPIP,qAC::" + station + ":" + answer + "\n";
} else { //} if (queryOrigin == "LoRa") {
return Config.callsign + ">APLR10,RFONLY::" + station + ":" + answer;
return Config.callsign + ">APLRG1,RFONLY::" + station + ":" + answer;
}
}
src/utils.cpp
+1 -1
View File
@@ -11,7 +11,7 @@ namespace utils {
void processStatus() {
delay(1000);
String startupStatus = Config.callsign + ">APLR10,qAC:>" + Config.defaultStatus;
String startupStatus = Config.callsign + ">APLRG1,qAC:>" + Config.defaultStatus;
espClient.write((startupStatus + "\n").c_str());
statusAfterBoot = false;
}