richonguzman/LoRa_APRS_iGate
1
0
Fork 0
mirror of https://github.com/richonguzman/LoRa_APRS_iGate.git synced 2026-01-21 16:20:15 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

betaTestDigirepeater

Browse source
This commit is contained in:
richonguzman 2023-06-09 00:23:11 -04:00
parent bac7f9fd5f
commit 56c0010a3b
6 changed files with 30 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/igate_conf.json
View file

@ -42,8 +42,6 @@
},
"other": {
"beaconInterval": 15,
"rememberStationTime": 30,
"statusAfterBoot": true,
"defaultStatus": "https://github.com/richonguzman/LoRa_APRS_iGate"
"rememberStationTime": 30
}
}

2
src/LoRa_APRS_iGate.cpp
View file

@ -26,7 +26,7 @@ WiFiClient espClient;
int myWiFiAPIndex = 0;
int myWiFiAPSize = Config.wifiAPs.size();
WiFi_AP *currentWiFi = &Config.wifiAPs[myWiFiAPIndex];
bool statusAfterBoot = Config.statusAfterBoot;
bool statusAfterBoot = true;
int stationMode = Config.stationMode;
bool beacon_update = true;

2
src/configuration.cpp
View file

@ -34,8 +34,6 @@ void Configuration::readFile(fs::FS &fs, const char *fileName) {
iGateComment = data["iGateComment"].as<String>();
beaconInterval = data["other"]["beaconInterval"].as<int>();
rememberStationTime = data["other"]["rememberStationTime"].as<int>();
statusAfterBoot = data["other"]["statusAfterBoot"].as<bool>();
defaultStatus = data["other"]["defaultStatus"].as<String>();
digi.comment = data["digi"]["comment"].as<String>();
digi.latitude = data["digi"]["latitude"].as<double>();

2
src/configuration.h
View file

@ -56,8 +56,6 @@ public:
String iGateComment;
int beaconInterval;
int rememberStationTime;
bool statusAfterBoot;
String defaultStatus;
std::vector<WiFi_AP> wifiAPs;
DIGI digi;
APRS_IS aprs_is;

39
src/digi_utils.cpp
View file

@ -32,22 +32,33 @@ void processPacket(String packet) {
String firstPart, lastPart, loraPacket;
if (packet != "") {
Serial.print("Received Lora Packet : " + String(packet));
if ((packet.substring(0, 3) == "\x3c\xff\x01") && (packet.indexOf("NOGATE") == -1) && (packet.indexOf("WIDE1-1") > 10)) { // confirmar lo de WIDE1-1 !!!
if ((packet.substring(0, 3) == "\x3c\xff\x01") && (packet.indexOf("NOGATE") == -1)) {
Serial.println(" ---> APRS LoRa Packet");
typeOfPacket(packet);
firstPart = packet.substring(3,packet.indexOf(",")+1);
lastPart = packet.substring(packet.indexOf(":"));
loraPacket = firstPart + Config.callsign + "*" + lastPart;
delay(500);
if (stationMode == 4) { // Digirepeating with Freq Rx != Tx
LoRa_Utils::changeFreqTx();
if ((stationMode==3) && (packet.indexOf("WIDE1-1") > 10)) {
typeOfPacket(packet);
firstPart = packet.substring(3,packet.indexOf(",")+1);
lastPart = packet.substring(packet.indexOf(":"));
loraPacket = firstPart + Config.callsign + "*" + lastPart;
delay(500);
LoRa_Utils::sendNewPacket("APRS", loraPacket);
display_toggle(true);
lastScreenOn = millis();
} else { // stationMode = 4
typeOfPacket(packet);
firstPart = packet.substring(3,packet.indexOf(",")+1);
lastPart = packet.substring(packet.indexOf(",")+1);
loraPacket = firstPart + Config.callsign + lastPart; // se agrega "*"" ???
delay(500);
if (stationMode == 4) { // Digirepeating with Freq Rx != Tx
LoRa_Utils::changeFreqTx();
}
LoRa_Utils::sendNewPacket("APRS", loraPacket);
if (stationMode == 4) {
LoRa_Utils::changeFreqRx();
}
display_toggle(true);
lastScreenOn = millis();
}
LoRa_Utils::sendNewPacket("APRS", loraPacket);
if (stationMode == 4) {
LoRa_Utils::changeFreqRx();
}
display_toggle(true);
lastScreenOn = millis();
} else {
Serial.println(" ---> LoRa Packet Ignored (first 3 bytes or NOGATE)\n");
}

6
src/utils.cpp
View file

@ -24,12 +24,12 @@ void processStatus() {
String status = Config.callsign + ">APLRG1";
if (stationMode==1 || stationMode==2) {
delay(1000);
status += ",qAC:>" + Config.defaultStatus;
status += ",qAC:>https://github.com/richonguzman/LoRa_APRS_iGate";
espClient.write((status + "\n").c_str());
} else {
delay(5000);
status += ":>" + Config.defaultStatus;
if (stationMode == 4) { // Digirepeating with Freq Rx != Tx
status += ":>https://github.com/richonguzman/LoRa_APRS_iGate";
if (stationMode == 4) {
LoRa_Utils::changeFreqTx();
}
LoRa_Utils::sendNewPacket("APRS", status);