SmartCAD p1

zephcore/src/Dispatcher.cpp

@@ -38,6 +38,8 @@ Dispatcher::Dispatcher(Radio &radio, MillisecondClock &ms, PacketManager &mgr)
 	_err_flags = 0;
 	radio_nonrx_start = 0;
 	prev_isrecv_mode = true;
+	cad_offset_shadow = 0;
+	cad_offset_shadow_valid = false;
 	n_sent_flood = n_sent_direct = 0;
 	n_recv_flood = n_recv_direct = 0;
 	_tx_queued_cb = nullptr;
@@ -181,6 +183,20 @@ void Dispatcher::maintenanceLoop()
 		_radio->resetAGC();
 		next_agc_reset_time = futureMillis(getAGCResetInterval());
 	}
+
+	/* Adaptive CAD: probe scheduling + staircase live in the radio;
+	 * we only surface offset changes so the app layer can persist them. */
+	_radio->cadMaintenance();
+
+	int8_t cad_off = _radio->getCadOffset();
+
+	if (!cad_offset_shadow_valid) {
+		cad_offset_shadow = cad_off;
+		cad_offset_shadow_valid = true;
+	} else if (cad_off != cad_offset_shadow) {
+		cad_offset_shadow = cad_off;
+		onCadOffsetChanged(cad_off);
+	}
 }
 
 bool Dispatcher::tryParsePacket(Packet *pkt, const uint8_t *raw, int len)

zephcore/src/main_companion.cpp

@@ -708,6 +708,19 @@ public:
 		return lora_radio.setRxBoost(enable);
 	}
 
+	/* Adaptive CAD */
+	int formatCadStatus(char* buf, int cap) override {
+		return lora_radio.formatCadStatus(buf, cap);
+	}
+	void applyCadPrefs() override {
+		lora_radio.setCadParams(companion_mesh.prefs.cad_auto != 0,
+					companion_mesh.prefs.cad_offset,
+					companion_mesh.prefs.cad_probe_interval);
+	}
+	void resetCadStats() override {
+		lora_radio.resetCadStats();
+	}
+
 #ifdef CONFIG_ZEPHCORE_APC
 	int8_t getAPCReduction() const override {
 		return companion_mesh.getAPCReduction();
@@ -1507,6 +1520,9 @@ int main(void)
 	/* Apply RX boost and duty cycle from prefs */
 	lora_radio.setRxBoost(companion_mesh.prefs.rx_boost != 0);
 	lora_radio.enableRxDutyCycle(companion_mesh.prefs.rx_duty_cycle != 0);
+	lora_radio.setCadParams(companion_mesh.prefs.cad_auto != 0,
+				companion_mesh.prefs.cad_offset,
+				companion_mesh.prefs.cad_probe_interval);
 #ifdef CONFIG_ZEPHCORE_APC
 	ui_set_radio_runtime(
 		lora_radio.getEffectiveTxPower(),

zephcore/src/main_repeater.cpp

@@ -630,6 +630,8 @@ int main(void)
 	/* Apply RX boost and duty cycle from prefs */
 	lora_radio.setRxBoost(prefs->rx_boost != 0);
 	lora_radio.enableRxDutyCycle(prefs->rx_duty_cycle != 0);
+	lora_radio.setCadParams(prefs->cad_auto != 0, prefs->cad_offset,
+				prefs->cad_probe_interval);
 
 	/* Feed initial UI state from loaded prefs */
 	ui_set_node_name(prefs->node_name);

zephcore/src/main_room_server.cpp

@@ -609,6 +609,8 @@ int main(void)
 	/* Apply RX boost and duty cycle from prefs */
 	lora_radio.setRxBoost(prefs->rx_boost != 0);
 	lora_radio.enableRxDutyCycle(prefs->rx_duty_cycle != 0);
+	lora_radio.setCadParams(prefs->cad_auto != 0, prefs->cad_offset,
+				prefs->cad_probe_interval);
 
 	/* Feed initial UI state from loaded prefs */
 	ui_set_node_name(prefs->node_name);