TextSerialOutputForApp
This commit is contained in:
parent
4cdb30cc10
commit
9fbf105241
|
|
@ -60,6 +60,7 @@ ____________________________________________________
|
|||
____________________________________________________
|
||||
## Timeline (Versions):
|
||||
|
||||
- 2024.01.19 TextSerialOutputForApp added to get text from Serial-Output over USB into PC for PinPoint App (https://www.pinpointaprs.com) and APRSIS32 App (http://aprsisce.wikidot.com)
|
||||
- 2024.01.12 Added iGate Mode to also repeat packets (like a iGate+DigiRepeater) in stationMode 2 and 5.
|
||||
- 2024.01.11 Added iGate Mode to enable APRS-IS and LoRa beacon report at the same time.
|
||||
- 2024.01.05 Added support for Lilygo TTGO T-Beam V1, V1.2, V1 + SX1268, V1.2 + SX1262.
|
||||
|
|
@ -72,7 +73,6 @@ ____________________________________________________
|
|||
- 2023.11.26 Small correction to enable Syslog in stationMode5.
|
||||
- 2023.10.09 Added "WIDE1-1" to Tx packets from iGate to be *repeated* by Digirepeaters.
|
||||
- 2023.10.09 Added Support also for BMP280 module.
|
||||
- 2023.10.08 Added Serial Comunication with PinPoint APRS app (https://www.pinpointaprs.com)
|
||||
- 2023.08.20 Added External Voltage Measurement (Max 15V!)
|
||||
- 2023.08.05 Ground Height Correction for Pressure readings added.
|
||||
- 2023.07.31 StationMode5 added: iGate when WiFi and APRS available, DigiRepeater when not.
|
||||
|
|
|
|||
|
|
@ -84,13 +84,13 @@ namespace APRS_IS_Utils {
|
|||
bool queryMessage = false;
|
||||
String aprsPacket, Sender, AddresseeAndMessage, Addressee, ackMessage, receivedMessage;
|
||||
if (packet != "") {
|
||||
#ifdef PinPointApp
|
||||
#ifdef TextSerialOutputForApp
|
||||
Serial.println(packet.substring(3));
|
||||
#else
|
||||
Serial.print("Received Lora Packet : " + String(packet));
|
||||
#endif
|
||||
if ((packet.substring(0,3) == "\x3c\xff\x01") && (packet.indexOf("TCPIP") == -1) && (packet.indexOf("NOGATE") == -1) && (packet.indexOf("RFONLY") == -1)) {
|
||||
#ifndef PinPointApp
|
||||
#ifndef TextSerialOutputForApp
|
||||
Serial.print(" ---> APRS LoRa Packet!");
|
||||
#endif
|
||||
Sender = packet.substring(3,packet.indexOf(">"));
|
||||
|
|
@ -139,7 +139,7 @@ namespace APRS_IS_Utils {
|
|||
}
|
||||
lastScreenOn = millis();
|
||||
espClient.write(aprsPacket.c_str());
|
||||
#ifndef PinPointApp
|
||||
#ifndef TextSerialOutputForApp
|
||||
Serial.println(" ---> Uploaded to APRS-IS");
|
||||
#endif
|
||||
STATION_Utils::updateLastHeard(Sender);
|
||||
|
|
@ -148,7 +148,7 @@ namespace APRS_IS_Utils {
|
|||
}
|
||||
}
|
||||
} else {
|
||||
#ifndef PinPointApp
|
||||
#ifndef TextSerialOutputForApp
|
||||
Serial.println(" ---> LoRa Packet Ignored (first 3 bytes or TCPIP/NOGATE/RFONLY)\n");
|
||||
#endif
|
||||
}
|
||||
|
|
@ -179,7 +179,7 @@ namespace APRS_IS_Utils {
|
|||
receivedMessage = AddresseeAndMessage.substring(AddresseeAndMessage.indexOf(":")+1);
|
||||
}
|
||||
if (receivedMessage.indexOf("?") == 0) {
|
||||
#ifndef PinPointApp
|
||||
#ifndef TextSerialOutputForApp
|
||||
Serial.println("Received Query APRS-IS : " + packet);
|
||||
#endif
|
||||
String queryAnswer = QUERY_Utils::process(receivedMessage, Sender, "APRSIS");
|
||||
|
|
@ -199,7 +199,7 @@ namespace APRS_IS_Utils {
|
|||
seventhLine = "QUERY = " + receivedMessage;
|
||||
}
|
||||
} else {
|
||||
#ifndef PinPointApp
|
||||
#ifndef TextSerialOutputForApp
|
||||
Serial.print("Received from APRS-IS : " + packet);
|
||||
#endif
|
||||
if ((stationMode==2 || stationMode==5) && STATION_Utils::wasHeard(Addressee)) {
|
||||
|
|
|
|||
|
|
@ -3,7 +3,12 @@
|
|||
|
||||
#include <Arduino.h>
|
||||
|
||||
//#define PinPointApp //uncomment this line when using PinPoint App ( https://www.pinpointaprs.com )
|
||||
|
||||
//#define TextSerialOutputForApp
|
||||
/* uncomment the previous line to get text from Serial-Output over USB into PC for:
|
||||
- PinPoint App ( https://www.pinpointaprs.com )
|
||||
- APRSIS32 App ( http://aprsisce.wikidot.com )
|
||||
*/
|
||||
|
||||
namespace APRS_IS_Utils {
|
||||
|
||||
|
|
|
|||
|
|
@ -167,7 +167,7 @@ namespace LoRa_Utils {
|
|||
}
|
||||
}
|
||||
#endif
|
||||
#ifndef PinPointApp
|
||||
#ifndef TextSerialOutputForApp
|
||||
if (loraPacket!="") {
|
||||
Serial.println("(RSSI:" +String(rssi) + " / SNR:" + String(snr) + " / FreqErr:" + String(freqError) + ")");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ namespace STATION_Utils {
|
|||
}
|
||||
fourthLine += String(lastHeardStation.size());
|
||||
|
||||
#ifndef PinPointApp ////// This is just for debugging
|
||||
#ifndef TextSerialOutputForApp ////// This is just for debugging
|
||||
Serial.print("Stations Near (last " + String(Config.rememberStationTime) + " minutes): ");
|
||||
for (int k=0; k<lastHeardStation.size(); k++) {
|
||||
Serial.print(lastHeardStation[k].substring(0,lastHeardStation[k].indexOf(","))); Serial.print(" ");
|
||||
|
|
|
|||
Loading…
Reference in New Issue