mirror of
https://github.com/zvx-echo6/meshai.git
synced 2026-05-22 07:34:47 +02:00
fix(config): correct meshtastic include nesting
- Changed orchestrator to use meshtastic: include meshtastic.yaml - Added hoisting logic to extract connection/commands from wrapper - Fixes restart loop caused by connection.type defaulting to serial Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
parent
965a844b0d
commit
67ab2689fe
1 changed files with 8 additions and 0 deletions
|
|
@ -424,6 +424,14 @@ def load_config(config_dir: Path = Path("/data/config")) -> Config:
|
||||||
# Load orchestrator with !include support
|
# Load orchestrator with !include support
|
||||||
_logger.debug(f"Loading config from {orchestrator_path}")
|
_logger.debug(f"Loading config from {orchestrator_path}")
|
||||||
data = _load_yaml_with_includes(orchestrator_path)
|
data = _load_yaml_with_includes(orchestrator_path)
|
||||||
|
# Hoist meshtastic.connection and meshtastic.commands to top level
|
||||||
|
# meshtastic.yaml contains both sections under wrapper keys
|
||||||
|
if "meshtastic" in data and isinstance(data["meshtastic"], dict):
|
||||||
|
meshtastic = data.pop("meshtastic")
|
||||||
|
if "connection" in meshtastic:
|
||||||
|
data["connection"] = meshtastic["connection"]
|
||||||
|
if "commands" in meshtastic:
|
||||||
|
data["commands"] = meshtastic["commands"]
|
||||||
|
|
||||||
# Load local.yaml
|
# Load local.yaml
|
||||||
local_path = config_dir / "local.yaml"
|
local_path = config_dir / "local.yaml"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue