richonguzman/LoRa_APRS_iGate
1
0
Fork 0
mirror of https://github.com/richonguzman/LoRa_APRS_iGate.git synced 2026-03-11 07:53:58 +01:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

lastRxTime added to process buffer

Browse source
This commit is contained in:
richonguzman 2024-04-20 09:37:22 -04:00
parent b4f2daca42
commit 8f1629abbc
4 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/LoRa_APRS_iGate.cpp
View file

@ -52,6 +52,7 @@ std::vector<String> lastHeardStation;
std::vector<String> lastHeardStation_temp;
std::vector<String> outputPacketBuffer;
uint32_t lastTxTime = millis();
uint32_t lastRxTime = millis();
std::vector<ReceivedPacket> receivedPackets;

2
src/aprs_is_utils.cpp
View file

@ -21,6 +21,7 @@ extern String sixthLine;
extern String seventhLine;
extern std::vector<String> outputPacketBuffer;
extern uint32_t lastRxTime;
namespace APRS_IS_Utils {
@ -243,6 +244,7 @@ namespace APRS_IS_Utils {
String aprsisPacket = espClient.readStringUntil('\r');
// Serial.println(aprsisPacket);
processAPRSISPacket(aprsisPacket);
lastRxTime = millis();
}
}
}

11
src/lora_utils.cpp
View file

@ -7,13 +7,15 @@
#include "display.h"
#include "utils.h"
extern Configuration Config;
extern Configuration Config;
extern uint32_t lastRxTime;
extern std::vector<ReceivedPacket> receivedPackets;
bool transmissionFlag = true;
bool ignorePacket = false;
bool operationDone = true;
bool transmissionFlag = true;
bool ignorePacket = false;
bool operationDone = true;
#ifdef HAS_SX1262
SX1262 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN);
@ -181,6 +183,7 @@ namespace LoRa_Utils {
if (Config.syslog.active && WiFi.status() == WL_CONNECTED) {
SYSLOG_Utils::log("Rx", loraPacket, rssi, snr, freqError);
}
lastRxTime = millis();
return loraPacket;
}
} else if (state == RADIOLIB_ERR_RX_TIMEOUT) {

5
src/station_utils.cpp
View file

@ -10,6 +10,7 @@ extern std::vector<String> lastHeardStation;
extern std::vector<String> lastHeardStation_temp;
extern std::vector<String> outputPacketBuffer;
extern uint32_t lastTxTime;
extern uint32_t lastRxTime;
extern String fourthLine;
@ -63,8 +64,10 @@ namespace STATION_Utils {
}
void processOutputPacketBuffer() {
int timeToWait = 3 * 1000; // 3 segs between packet Tx and also Rx ???
uint32_t lastRx = millis() - lastRxTime;
uint32_t lastTx = millis() - lastTxTime;
if (outputPacketBuffer.size() == 0 || lastTx < 5 * 1000) { // 5 segs between packet tx ???
if (outputPacketBuffer.size() == 0 || lastTx < timeToWait || lastRx < timeToWait) {
return;
} else {
LoRa_Utils::sendNewPacket(outputPacketBuffer[0]);