From 9c0330631cad95ead8a8018aac00a9cc1822ea62 Mon Sep 17 00:00:00 2001 From: TeTeHacko Date: Mon, 31 Aug 2026 22:20:49 +0200 Subject: [PATCH] =?UTF-8?q?fix(companion):=20gps=20duty=20jde=20kone=C4=8D?= =?UTF-8?q?n=C4=9B=20ulo=C5=BEit=20=E2=80=94=20dv=C4=9B=20m=C3=ADsta=20ho?= =?UTF-8?q?=20p=C5=99episovala?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Duty přidal c7c9b812 (6. 8.), ale jen čtecí stranu: MyMesh.h:182 umí gps_enabled == 2, zapsat ho tam ale nešlo. Dvě upstream místa to mařila, každé samo o sobě: * CMD_SET_CUSTOM_VAR uložil `gps:2` jako 0 (podmínka byla boolean), takže duty se runtime zapnul, ale do prefs se dostala nula; * a i kdyby se 2 uložila, sanitizace po loadPrefs ji clampovala na 1. Výsledek: `gps duty` byl na companionu nedosažitelný přes jedinou cestu, kterou karta má — companion build nemá textovou konzoli ani USB rozhraní. Karty probe-card i a-card proto jely GPS naplno, tedy o ~46 mA víc, než je potřeba (měřeno na SenseCAP P1-Pro, viz docs/power-saving.md). Clamp 0..2 je i v CommonCLI.cpp:137, takže tohle jen srovnává companion se zbytkem stromu. Displejová cesta (ui-tiny/UITask.cpp:811) zůstává boolean — karta má NullDisplayDriver, takže na ni nedosáhne. Co-Authored-By: Claude Opus 5 (1M context) Claude-Session: https://claude.ai/code/session_01Pwhe5XoCuuEbBCNLvsJBPL --- examples/companion_radio/MyMesh.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/companion_radio/MyMesh.cpp b/examples/companion_radio/MyMesh.cpp index 5498f412..b7fc62f5 100644 --- a/examples/companion_radio/MyMesh.cpp +++ b/examples/companion_radio/MyMesh.cpp @@ -954,7 +954,7 @@ void MyMesh::begin(bool has_display) { _prefs.sf = constrain(_prefs.sf, 5, 12); _prefs.cr = constrain(_prefs.cr, 5, 8); _prefs.tx_power_dbm = constrain(_prefs.tx_power_dbm, -9, MAX_LORA_TX_POWER); - _prefs.gps_enabled = constrain(_prefs.gps_enabled, 0, 1); // Ensure boolean 0 or 1 + _prefs.gps_enabled = constrain(_prefs.gps_enabled, 0, 2); // 0 off, 1 on, 2 duty cycle _prefs.gps_interval = constrain(_prefs.gps_interval, 0, 86400); // Max 24 hours #ifdef BLE_PIN_CODE // 123456 by default @@ -1861,7 +1861,7 @@ void MyMesh::handleCmdFrame(size_t len) { #if ENV_INCLUDE_GPS == 1 // Update node preferences for GPS settings if (strcmp(sp, "gps") == 0) { - _prefs.gps_enabled = (np[0] == '1') ? 1 : 0; + _prefs.gps_enabled = (np[0] == '2') ? 2 : ((np[0] == '1') ? 1 : 0); savePrefs(); } else if (strcmp(sp, "gps_interval") == 0) { uint32_t interval_seconds = atoi(np);