align dev_plus with current PRs (meshcore-dev#1727 CAD on by default) + minor

weebl2000 · weebl2000 · commit e27288310fd6 · 2026-06-07T00:22:44.000+02:00
Changes vs dev_plus: - meshcore-dev#1727 hardware-CAD redesign: cad_enabled pref (slot 293), 'cad on/off' CLI cmd, RSSI interference (int.thresh) + separate hardware-CAD gate in RadioLibWrappers. DEVIATION (per request): cad_enabled defaults to 1 (CAD ENABLED) on repeater/room/sensor; companion getCADEnabled() returns true. companion getInterferenceThreshold() aligned to PR (0; RSSI int.thresh disabled until currentRSSI() is fixed). Fixed a merge-dup of performChannelScan() decl. - meshcore-dev#2001: 'af' getter ftoa -> ftoa3 - meshcore-dev#1896: ESP32 RTC fallback seed literal -> RTC_TIME_MIN - meshcore-dev#1925: rak11200 P_LORA_DIO_1 via platformio build flag (not header #define) No-ops (verified already-aligned in dev_plus, or intentionally absent): meshcore-dev#1677 AEAD, meshcore-dev#1686 short-sleeps (=> meshcore-dev#1347 subset), meshcore-dev#2674 be-more-patient(+backoff), meshcore-dev#1447 robust-contacts (absent), meshcore-dev#2537 fix-serial-bursts (absent).
diff --git a/docs/cli_commands.md b/docs/cli_commands.md
@@ -559,6 +559,20 @@ This document provides an overview of CLI commands that can be sent to MeshCore
 
 ---
 
+#### Enable or disable hardware Channel Activity Detection (CAD)
+**Usage:**
+- `get cad`
+- `set cad <on|off>`
+
+**Description:** When enabled, the radio performs a hardware Channel Activity Detection scan before transmitting and defers if the channel is busy. Runs independently of `int.thresh` — either, both, or none may be active.
+
+**Parameters:**
+- `on|off`: Enable or disable hardware CAD
+
+**Default:** `off`
+
+---
+
 #### View or change the AGC Reset Interval
 **Usage:**
 - `get agc.reset.interval`
diff --git a/examples/companion_radio/MyMesh.cpp b/examples/companion_radio/MyMesh.cpp
@@ -277,7 +277,10 @@ float MyMesh::getAirtimeBudgetFactor() const {
 }
 
 int MyMesh::getInterferenceThreshold() const {
-  return 1; // non-zero enables hardware CAD (Channel Activity Detection) before TX
+  return 0; // RSSI interference detection disabled, until currentRSSI() problem is resolved
+}
+bool MyMesh::getCADEnabled() const {
+  return true; // hardware CAD before TX (no CLI toggle on companion; enabled by default)
 }
 
 int MyMesh::calcRxDelay(float score, uint32_t air_time) const {
diff --git a/examples/companion_radio/MyMesh.h b/examples/companion_radio/MyMesh.h
@@ -105,6 +105,7 @@ class MyMesh : public BaseChatMesh, public DataStoreHost {
 protected:
   float getAirtimeBudgetFactor() const override;
   int getInterferenceThreshold() const override;
+  bool getCADEnabled() const override;
   int calcRxDelay(float score, uint32_t air_time) const override;
   uint32_t getRetransmitDelay(const mesh::Packet *packet) override;
   uint32_t getDirectRetransmitDelay(const mesh::Packet *packet) override;
diff --git a/examples/simple_repeater/MyMesh.cpp b/examples/simple_repeater/MyMesh.cpp
@@ -991,7 +991,8 @@ MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondCloc
   _prefs.flood_max = 64;
   _prefs.flood_max_unscoped = 64;
   _prefs.flood_max_advert = 8;
-  _prefs.interference_threshold = 1; // non-zero enables hardware CAD before TX
+  _prefs.interference_threshold = 0; // disabled
+  _prefs.cad_enabled = 1;            // hardware CAD before TX (on by default; 'set cad off' to disable)
 
   // bridge defaults
   _prefs.bridge_enabled = 1;    // enabled
diff --git a/examples/simple_repeater/MyMesh.h b/examples/simple_repeater/MyMesh.h
@@ -152,6 +152,9 @@ class MyMesh : public mesh::Mesh, public CommonCLICallbacks {
   int getInterferenceThreshold() const override {
     return _prefs.interference_threshold;
   }
+  bool getCADEnabled() const override {
+    return _prefs.cad_enabled;
+  }
   int getAGCResetInterval() const override {
     return ((int)_prefs.agc_reset_interval) * 4000;   // milliseconds
   }
diff --git a/examples/simple_room_server/MyMesh.cpp b/examples/simple_room_server/MyMesh.cpp
@@ -703,7 +703,8 @@ MyMesh::MyMesh(mesh::MainBoard &board, mesh::Radio &radio, mesh::MillisecondCloc
   _prefs.flood_max = 64;
   _prefs.flood_max_unscoped = 64;
   _prefs.flood_max_advert = 8;
-  _prefs.interference_threshold = 1; // non-zero enables hardware CAD before TX
+  _prefs.interference_threshold = 0; // disabled
+  _prefs.cad_enabled = 1;            // hardware CAD before TX (on by default; 'set cad off' to disable)
 #ifdef ROOM_PASSWORD
   StrHelper::strncpy(_prefs.guest_password, ROOM_PASSWORD, sizeof(_prefs.guest_password));
 #endif
diff --git a/examples/simple_room_server/MyMesh.h b/examples/simple_room_server/MyMesh.h
@@ -145,6 +145,9 @@ class MyMesh : public mesh::Mesh, public CommonCLICallbacks {
   int getInterferenceThreshold() const override {
     return _prefs.interference_threshold;
   }
+  bool getCADEnabled() const override {
+    return _prefs.cad_enabled;
+  }
   int getAGCResetInterval() const override {
     return ((int)_prefs.agc_reset_interval) * 4000;   // milliseconds
   }
diff --git a/examples/simple_sensor/SensorMesh.cpp b/examples/simple_sensor/SensorMesh.cpp
@@ -323,6 +323,9 @@ uint32_t SensorMesh::getDirectRetransmitDelay(const mesh::Packet* packet) {
 int SensorMesh::getInterferenceThreshold() const {
   return _prefs.interference_threshold;
 }
+bool SensorMesh::getCADEnabled() const {
+  return _prefs.cad_enabled;
+}
 int SensorMesh::getAGCResetInterval() const {
   return ((int)_prefs.agc_reset_interval) * 4000;   // milliseconds
 }
@@ -779,7 +782,8 @@ SensorMesh::SensorMesh(mesh::MainBoard& board, mesh::Radio& radio, mesh::Millise
   _prefs.flood_advert_interval = 0;   // disabled
   _prefs.disable_fwd = true;
   _prefs.flood_max = 64;
-  _prefs.interference_threshold = 1;  // non-zero enables hardware CAD before TX
+  _prefs.interference_threshold = 0;  // disabled
+  _prefs.cad_enabled = 1;             // hardware CAD before TX (on by default; 'set cad off' to disable)
 
   // GPS defaults
   _prefs.gps_enabled = 0;
diff --git a/examples/simple_sensor/SensorMesh.h b/examples/simple_sensor/SensorMesh.h
@@ -123,6 +123,7 @@ class SensorMesh : public mesh::Mesh, public CommonCLICallbacks {
   uint32_t getRetransmitDelay(const mesh::Packet* packet) override;
   uint32_t getDirectRetransmitDelay(const mesh::Packet* packet) override;
   int getInterferenceThreshold() const override;
+  bool getCADEnabled() const override;
   int getAGCResetInterval() const override;
   void onAnonDataRecv(mesh::Packet* packet, const uint8_t* secret, const mesh::Identity& sender, uint8_t* data, size_t len) override;
   int searchPeersByHash(const uint8_t* hash) override;
diff --git a/src/Dispatcher.cpp b/src/Dispatcher.cpp
@@ -75,6 +75,7 @@ uint32_t Dispatcher::getCADFailMaxDuration() const {
 void Dispatcher::loop() {
   if (millisHasNowPassed(next_floor_calib_time)) {
     _radio->triggerNoiseFloorCalibrate(getInterferenceThreshold());
+    _radio->setCADEnabled(getCADEnabled());
     next_floor_calib_time = futureMillis(NOISE_FLOOR_CALIB_INTERVAL);
   }
   _radio->loop();
diff --git a/src/Dispatcher.h b/src/Dispatcher.h
@@ -65,6 +65,8 @@ class Radio {
 
   virtual void triggerNoiseFloorCalibrate(int threshold) { }
 
+  virtual void setCADEnabled(bool enable) { }
+
   virtual void resetAGC() { }
 
   virtual bool isInRecvMode() const = 0;
@@ -171,6 +173,7 @@ class Dispatcher {
   virtual uint32_t getCADFailRetryDelay() const;
   virtual uint32_t getCADFailMaxDuration() const;
   virtual int getInterferenceThreshold() const { return 0; }    // disabled by default
+  virtual bool getCADEnabled() const { return false; }    // hardware CAD disabled by default
   virtual int getAGCResetInterval() const { return 0; }    // disabled by default
   virtual unsigned long getDutyCycleWindowMs() const { return 3600000; }
 
diff --git a/src/helpers/CommonCLI.cpp b/src/helpers/CommonCLI.cpp
@@ -91,7 +91,8 @@ void CommonCLI::loadPrefsInt(FILESYSTEM* fs, const char* filename) {
     file.read((uint8_t *)&_prefs->rx_boosted_gain, sizeof(_prefs->rx_boosted_gain));              // 290
     file.read((uint8_t *)&_prefs->flood_max_unscoped, sizeof(_prefs->flood_max_unscoped));   // 291
     file.read((uint8_t *)&_prefs->flood_max_advert, sizeof(_prefs->flood_max_advert));       // 292
-    // next: 293
+    file.read((uint8_t *)&_prefs->cad_enabled, sizeof(_prefs->cad_enabled));                  // 293
+    // next: 294
 
     // sanitise bad pref values
     _prefs->rx_delay_base = constrain(_prefs->rx_delay_base, 0, 20.0f);
@@ -121,6 +122,7 @@ void CommonCLI::loadPrefsInt(FILESYSTEM* fs, const char* filename) {
 
     // sanitise settings
     _prefs->rx_boosted_gain = constrain(_prefs->rx_boosted_gain, 0, 1); // boolean
+    _prefs->cad_enabled = constrain(_prefs->cad_enabled, 0, 1); // boolean
 
     file.close();
   }
@@ -184,7 +186,8 @@ void CommonCLI::savePrefs(FILESYSTEM* fs) {
     file.write((uint8_t *)&_prefs->rx_boosted_gain, sizeof(_prefs->rx_boosted_gain));              // 290
     file.write((uint8_t *)&_prefs->flood_max_unscoped, sizeof(_prefs->flood_max_unscoped));   // 291
     file.write((uint8_t *)&_prefs->flood_max_advert, sizeof(_prefs->flood_max_advert));       // 292
-    // next: 293
+    file.write((uint8_t *)&_prefs->cad_enabled, sizeof(_prefs->cad_enabled));                 // 293
+    // next: 294
 
     file.close();
   }
@@ -497,6 +500,10 @@ void CommonCLI::handleSetCmd(uint32_t sender_timestamp, char* command, char* rep
     _prefs->interference_threshold = atoi(&config[11]);
     savePrefs();
     strcpy(reply, "OK");
+  } else if (memcmp(config, "cad ", 4) == 0) {
+    _prefs->cad_enabled = memcmp(&config[4], "on", 2) == 0;
+    savePrefs();
+    strcpy(reply, "OK");
   } else if (memcmp(config, "agc.reset.interval ", 19) == 0) {
     _prefs->agc_reset_interval = atoi(&config[19]) / 4;
     savePrefs();
@@ -770,9 +777,11 @@ void CommonCLI::handleGetCmd(uint32_t sender_timestamp, char* command, char* rep
     int dc_frac = (int)((dc - dc_int) * 10.0f + 0.5f);
     sprintf(reply, "> %d.%d%%", dc_int, dc_frac);
   } else if (memcmp(config, "af", 2) == 0) {
-    sprintf(reply, "> %s", StrHelper::ftoa(_prefs->airtime_factor));
+    sprintf(reply, "> %s", StrHelper::ftoa3(_prefs->airtime_factor));
   } else if (memcmp(config, "int.thresh", 10) == 0) {
     sprintf(reply, "> %d", (uint32_t) _prefs->interference_threshold);
+  } else if (memcmp(config, "cad", 3) == 0) {
+    sprintf(reply, "> %s", _prefs->cad_enabled ? "on" : "off");
   } else if (memcmp(config, "agc.reset.interval", 18) == 0) {
     sprintf(reply, "> %d", ((uint32_t) _prefs->agc_reset_interval) * 4);
   } else if (memcmp(config, "multi.acks", 10) == 0) {
diff --git a/src/helpers/CommonCLI.h b/src/helpers/CommonCLI.h
@@ -63,6 +63,7 @@ struct NodePrefs { // persisted to file
   uint8_t rx_boosted_gain; // power settings
   uint8_t path_hash_mode;   // which path mode to use when sending
   uint8_t loop_detect;
+  uint8_t cad_enabled;      // hardware Channel Activity Detection before TX (boolean)
 };
 
 class CommonCLICallbacks {
diff --git a/src/helpers/ESP32Board.h b/src/helpers/ESP32Board.h
@@ -200,7 +200,7 @@ class ESP32RTCClock : public mesh::RTCClock {
     if (_rtc_backup_magic == RTC_BACKUP_MAGIC && _rtc_backup_time > RTC_TIME_MIN) {
       tv.tv_sec = _rtc_backup_time;
     } else {
-      tv.tv_sec = 1772323200;  // 1 Mar 2026
+      tv.tv_sec = RTC_TIME_MIN;
     }
     tv.tv_usec = 0;
     settimeofday(&tv, NULL);
diff --git a/src/helpers/radiolib/RadioLibWrappers.cpp b/src/helpers/radiolib/RadioLibWrappers.cpp
@@ -36,6 +36,7 @@ void RadioLibWrapper::begin() {
 
   _noise_floor = 0;
   _threshold = 0;
+  _cad_enabled = false;
 
   // start average out some samples
   _num_floor_samples = 0;
@@ -183,15 +184,21 @@ int16_t RadioLibWrapper::performChannelScan() {
 }
 
 bool RadioLibWrapper::isChannelActive() {
-  if (_threshold == 0) return false;    // interference check is disabled
+  // int.thresh: RSSI-based interference detection (relative to noise floor)
+  if (_threshold != 0 && getCurrentRSSI() > _noise_floor + _threshold) return true;
+
+  // cad: hardware channel activity detection
+  if (_cad_enabled) {
+    int16_t result = performChannelScan();
+    // scanChannel() triggers DIO interrupt (CAD done) which sets STATE_INT_READY
+    // via setFlag() ISR. Clear it before restarting RX so recvRaw() doesn't
+    // try to read a non-existent packet and count a spurious recv error.
+    state = STATE_IDLE;
+    startRecv();
+    if (result != RADIOLIB_CHANNEL_FREE) return true;
+  }
 
-  int16_t result = performChannelScan();
-  // scanChannel() triggers DIO interrupt (CAD done) which sets STATE_INT_READY
-  // via setFlag() ISR. Clear it before restarting RX so recvRaw() doesn't
-  // try to read a non-existent packet and count a spurious recv error.
-  state = STATE_IDLE;
-  startRecv();
-  return result != RADIOLIB_CHANNEL_FREE;
+  return false;
 }
 
 float RadioLibWrapper::getLastRSSI() const {
diff --git a/src/helpers/radiolib/RadioLibWrappers.h b/src/helpers/radiolib/RadioLibWrappers.h
@@ -9,6 +9,7 @@ class RadioLibWrapper : public mesh::Radio {
   mesh::MainBoard* _board;
   uint32_t n_recv, n_sent, n_recv_errors;
   int16_t _noise_floor, _threshold;
+  bool _cad_enabled;
   uint16_t _num_floor_samples;
   int32_t _floor_sample_sum;
   uint8_t _preamble_sf;
@@ -43,13 +44,14 @@ class RadioLibWrapper : public mesh::Radio {
   void setTxPower(int8_t dbm);
 
   virtual float getCurrentRSSI() =0;
-  virtual int16_t performChannelScan();
   virtual uint8_t getSpreadingFactor() const { return LORA_SF; }
   static uint16_t preambleLengthForSF(uint8_t sf) { return sf <= 8 ? 32 : 16; }
   void updatePreamble(uint8_t sf) { _preamble_sf = sf; _radio->setPreambleLength(preambleLengthForSF(sf)); }
+  virtual int16_t performChannelScan();
 
   int getNoiseFloor() const override { return _noise_floor; }
   void triggerNoiseFloorCalibrate(int threshold) override;
+  void setCADEnabled(bool enable) override { _cad_enabled = enable; }
   void resetAGC() override;
 
   void loop() override;
diff --git a/variants/rak11200/RAK11200Board.h b/variants/rak11200/RAK11200Board.h
@@ -4,7 +4,7 @@
 #include <helpers/ESP32Board.h>
 
 // LoRa radio module pins when paired with the RAK13300 SX1262 module
-#define  P_LORA_DIO_1   22    // GPIO22 (ESP32 pin 36 -> IO6/DIO1)
+// P_LORA_DIO_1 is defined as a build flag (platformio.ini) so the base ESP32Board.h sees it
 #define  P_LORA_NSS     32    // GPIO32 (ESP32 pin 8 -> SPI_CS)
 #define  P_LORA_RESET   23    // GPIO23 (ESP32 pin 37 -> IO4/NRESET)
 #define  P_LORA_BUSY    13    // GPIO13 (ESP32 pin 16 -> IO5)
diff --git a/variants/rak11200/platformio.ini b/variants/rak11200/platformio.ini
@@ -16,6 +16,7 @@ build_flags =
   -D PIN_OLED_RESET=-1
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
+  -D P_LORA_DIO_1=22 ; GPIO22 (ESP32 pin 36 -> IO6/DIO1); build flag so base ESP32Board.h getIRQGpio() sees it
   -D LORA_TX_POWER=22
   -D SX126X_CURRENT_LIMIT=140
   -D SX126X_DIO2_AS_RF_SWITCH=true

Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,10 @@ float MyMesh::getAirtimeBudgetFactor() const {`
`277`	`277`	`}`
`278`	`278`
`279`	`279`	`int MyMesh::getInterferenceThreshold() const {`
`280`		`- return 1; // non-zero enables hardware CAD (Channel Activity Detection) before TX`
	`280`	`+ return 0; // RSSI interference detection disabled, until currentRSSI() problem is resolved`
	`281`	`+}`
	`282`	`+bool MyMesh::getCADEnabled() const {`
	`283`	`+ return true; // hardware CAD before TX (no CLI toggle on companion; enabled by default)`
`281`	`284`	`}`
`282`	`285`
`283`	`286`	`int MyMesh::calcRxDelay(float score, uint32_t air_time) const {`
Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,9 @@ class MyMesh : public mesh::Mesh, public CommonCLICallbacks {`
`152`	`152`	`int getInterferenceThreshold() const override {`
`153`	`153`	`return _prefs.interference_threshold;`
`154`	`154`	`}`
	`155`	`+ bool getCADEnabled() const override {`
	`156`	`+ return _prefs.cad_enabled;`
	`157`	`+ }`
`155`	`158`	`int getAGCResetInterval() const override {`
`156`	`159`	`return ((int)_prefs.agc_reset_interval) * 4000; // milliseconds`
`157`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,9 @@ class MyMesh : public mesh::Mesh, public CommonCLICallbacks {`
`145`	`145`	`int getInterferenceThreshold() const override {`
`146`	`146`	`return _prefs.interference_threshold;`
`147`	`147`	`}`
	`148`	`+ bool getCADEnabled() const override {`
	`149`	`+ return _prefs.cad_enabled;`
	`150`	`+ }`
`148`	`151`	`int getAGCResetInterval() const override {`
`149`	`152`	`return ((int)_prefs.agc_reset_interval) * 4000; // milliseconds`
`150`	`153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ uint32_t Dispatcher::getCADFailMaxDuration() const {`
`75`	`75`	`void Dispatcher::loop() {`
`76`	`76`	`if (millisHasNowPassed(next_floor_calib_time)) {`
`77`	`77`	`_radio->triggerNoiseFloorCalibrate(getInterferenceThreshold());`
	`78`	`+ _radio->setCADEnabled(getCADEnabled());`
`78`	`79`	`next_floor_calib_time = futureMillis(NOISE_FLOOR_CALIB_INTERVAL);`
`79`	`80`	`}`
`80`	`81`	`_radio->loop();`