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

cad timeout y oled update

Browse Source
This commit is contained in:
Ricardo Guzman committed 2026-09-29 18:46:41 -03:00
1 parent fc256de09c
commit a472c307d3
2 files changed
+28 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/LoRa_APRS_iGate.cpp
+1 -1
View File
@@ -68,7 +68,7 @@ ___________________________________________________________________*/
#endif
String versionDate = "2026-09-28";
String versionDate = "2026-09-29";
String versionNumber = "4.0.1";
Configuration Config;
WiFiClient aprsIsClient;
src/lora_utils.cpp
+27 -10
View File
@@ -41,6 +41,8 @@ bool transmitFlag = true;
#define DIFS_SLOTS 2 // Number of secuential CAD slots to consider a free channel to Tx
int backoffMax = 4; // Max Backoff value (number of CAD slots to wait before Tx)
#define CAD_MAX_WAIT_MS 10000 // Max total time waiting for a free channel, then the packet is dropped
unsigned long cadStartTime = 0;
#ifdef HAS_SX1262
SX1262 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN);
@@ -195,8 +197,13 @@ namespace LoRa_Utils {
return true;
}
bool cadTimedOut() {
return millis() - cadStartTime > CAD_MAX_WAIT_MS;
}
void waitForDIFS() {
while (!doDIFS()) {
if (cadTimedOut()) return;
Serial.println("CAD/DIFS failed, retry...");
}
}
@@ -204,6 +211,7 @@ namespace LoRa_Utils {
void doBEB() {
int backoffCounter = random(1, backoffMax + 1);
while (backoffCounter > 0) {
if (cadTimedOut()) return;
if (doCAD()) {
waitForDIFS(); // busy channel: freeze backoff and restart DIFS
} else {
@@ -225,22 +233,30 @@ namespace LoRa_Utils {
if (Config.digi.ecoMode != 1) digitalWrite(INTERNAL_LED_PIN, HIGH); // disabled in Ultra Eco Mode
#endif
bool cadDropped = false;
if (Config.loramodule.cadActive) {
cadStartTime = millis();
waitForDIFS(); // DIFS (Distributed Inter-Frame Space)
doBEB(); // BEB (Binary Exponential Backoff)
if (cadTimedOut()) {
Utils::println("CAD timeout, packet dropped: " + newPacket);
cadDropped = true;
}
}
int state = radio.transmit("\x3c\xff\x01" + newPacket);
transmitFlag = true;
if (state == RADIOLIB_ERR_NONE) {
if (Config.syslog.active && networkManager->isConnected()) {
SYSLOG_Utils::logLoRaTx(newPacket);
if (!cadDropped) {
int state = radio.transmit("\x3c\xff\x01" + newPacket);
transmitFlag = true;
if (state == RADIOLIB_ERR_NONE) {
if (Config.syslog.active && networkManager->isConnected()) {
SYSLOG_Utils::logLoRaTx(newPacket);
}
Utils::print("---> LoRa Packet Tx : ");
Utils::println(newPacket);
} else {
Utils::print(F("failed, code "));
Utils::println(String(state));
}
Utils::print("---> LoRa Packet Tx : ");
Utils::println(newPacket);
} else {
Utils::print(F("failed, code "));
Utils::println(String(state));
}
#ifdef INTERNAL_LED_PIN
if (Config.digi.ecoMode != 1) digitalWrite(INTERNAL_LED_PIN, LOW); // disabled in Ultra Eco Mode
@@ -250,6 +266,7 @@ namespace LoRa_Utils {
changeFreqRx();
}
}
if (cadDropped) radio.startReceive(); // no Tx end IRQ will restart Rx
}
String receivePacketFromSleep() {