marcel/RNode_Firmware_CE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed missing check in interference avoidance

Browse Source
This commit is contained in:
Mark Qvist
2025-01-13 21:12:39 +01:00
parent 6eaacb7f99
commit 6f0c849cb3
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
RNode_Firmware.ino
View File

@@ -242,11 +242,13 @@ void setup() {
avoid_interference = false; avoid_interference = false;
#else #else
#if HAS_EEPROM #if HAS_EEPROM
if (EEPROM.read(eeprom_addr(ADDR_CONF_DIA)) == 0x01) { avoid_interference = false; } uint8_t ia_conf = EEPROM.read(eeprom_addr(ADDR_CONF_DIA));
else { avoid_interference = true; } if (ia_conf == 0x00) { avoid_interference = true; }
else { avoid_interference = false; }
#elif MCU_VARIANT == MCU_NRF52 #elif MCU_VARIANT == MCU_NRF52
if (eeprom_read(eeprom_addr(ADDR_CONF_DIA)) == 0x01) { avoid_interference = false; } uint8_t ia_conf == eeprom_read(eeprom_addr(ADDR_CONF_DIA));
else { avoid_interference = true; } if (ia_conf == 0x00) { avoid_interference = true; }
else { avoid_interference = false; }
#endif #endif
#endif #endif
#endif #endif
@@ -1263,7 +1265,7 @@ void update_modem_status() {
portEXIT_CRITICAL(); portEXIT_CRITICAL();
#endif #endif
interference_detected = current_rssi > (noise_floor+CSMA_INFR_THRESHOLD_DB); interference_detected = !carrier_detected && (current_rssi > (noise_floor+CSMA_INFR_THRESHOLD_DB));
if (interference_detected) { if (led_id_filter < LED_ID_TRIG) { led_id_filter += 1; } } if (interference_detected) { if (led_id_filter < LED_ID_TRIG) { led_id_filter += 1; } }
else { if (led_id_filter > 0) {led_id_filter -= 1; } } else { if (led_id_filter > 0) {led_id_filter -= 1; } }