dandri/ZephCore
1
0
Fork 0
mirror of https://github.com/liquidraver/ZephCore.git synced 2026-10-15 08:20:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

radio: extract CadController and NoiseFloorEstimator, one prefs source

Browse Source 
- CadController (stats, window, re-anchor, visits, staircase, safety,
  starvation relax) and NoiseFloorEstimator split out of LoRaRadioBase
  behind a 4-call CadHw interface; Zephyr-free, host unit tests added
- prefs mandatory: setPrefs() before begin(), LoRaConfig fallbacks and the
  companion/observer placeholder prefs removed; LoRaConfig is the one
  defaults source (invalid-prefs fallback now uses the board TX default)
- TX-wait thread stack owned by the base; reconfigureWithParams removed
- driver extension headers on the public include path
  (zephyr/drivers/lora/*.h); patch 0003 include updated
- comment diet (image-identical); rationale moved to devdocs LLD 03
This commit is contained in:
liquidraver
2026-09-23 14:33:29 +02:00
parent a7d073900e
commit fd2cbe9d62
36 changed files with 935 additions and 1629 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zephcore/app/main_observer.cpp
+8 -19
View File
@@ -274,19 +274,17 @@ static mesh::ZephyrMillisecondClock s_ms_clock;
static const struct device *const lora_dev = DEVICE_DT_GET(DT_ALIAS(lora0));
/* Static-init placeholder only. The radio is rebound to the mesh's own
* NodePrefs via setPrefs() in main() before observer_mesh.begin() — this object
* is not the live radio configuration and is never loaded from flash. */
static NodePrefs s_radio_prefs;
/* Radio is constructed with no prefs pointer; main() binds it to the mesh's
* NodePrefs via setPrefs() before observer_mesh.begin(). */
#if IS_ENABLED(CONFIG_ZEPHCORE_RADIO_LR1110)
static mesh::LR1110Radio lora_radio(lora_dev, s_board, &s_radio_prefs);
static mesh::LR1110Radio lora_radio(lora_dev, s_board);
#elif IS_ENABLED(CONFIG_ZEPHCORE_RADIO_LR2021)
static mesh::LR2021Radio lora_radio(lora_dev, s_board, &s_radio_prefs);
static mesh::LR2021Radio lora_radio(lora_dev, s_board);
#elif IS_ENABLED(CONFIG_ZEPHCORE_RADIO_SX127X)
static mesh::SX127xRadio lora_radio(lora_dev, s_board, &s_radio_prefs);
static mesh::SX127xRadio lora_radio(lora_dev, s_board);
#else
static mesh::SX126xRadio lora_radio(lora_dev, s_board, &s_radio_prefs);
static mesh::SX126xRadio lora_radio(lora_dev, s_board);
#endif
static mesh::ObserverMesh observer_mesh(lora_radio, s_ms_clock, s_rtc_clock);
@@ -296,13 +294,6 @@ static RepeaterDataStore data_store;
int main(void)
{
/* Initialize radio prefs with observer-specific defaults */
initNodePrefs(&s_radio_prefs);
s_radio_prefs.cr = 5; /* CR 4/5 (same as initNodePrefs; kept explicit) */
s_radio_prefs.tx_power_dbm = 0; /* observer never TXes */
strncpy(s_radio_prefs.node_name, "Observer",
sizeof(s_radio_prefs.node_name) - 1);
/* Brief boot delay — lets USB enumerate before first log */
k_sleep(K_MSEC(1500));
LOG_INF("=== ZephCore Observer starting ===");
@@ -352,10 +343,8 @@ int main(void)
*
* The radio reads freq/bw/sf/cr through this pointer, both during
* begin() → Dispatcher::begin() → Radio::begin() and on every later
* reconfigure() (LoRaRadioBase::reconfigureWithParams() ignores its
* arguments and re-reads the pointer). Constructed against
* s_radio_prefs, which is never loaded from flash, the radio stayed on
* the compiled-in defaults forever: `set freq/sf/bw/cr` wrote flash and
* reconfigure(). Bound to a placeholder that was never loaded from
* flash, the radio stayed on the compiled-in defaults forever: `set freq/sf/bw/cr` wrote flash and
* updated the CLI/MQTT readback but never reached the hardware, so the
* setting looked accepted and then "reverted" on reboot.
*