From 73180141b3f3e590824ac4859d5934dde1a82d66 Mon Sep 17 00:00:00 2001 From: oscgonfer Date: Fri, 17 Jul 2026 22:08:06 +0200 Subject: [PATCH] Add userprefs for telemetry screen settings (#11051) * Add telemetry update interval to userprefs * Add telemetry screen configs to userprefs * Removed duped code from cherry-pick --- src/mesh/NodeDB.cpp | 12 ++++++++++-- userPrefs.jsonc | 2 ++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp index 1e88ea873..4c2879adc 100644 --- a/src/mesh/NodeDB.cpp +++ b/src/mesh/NodeDB.cpp @@ -1526,14 +1526,18 @@ void NodeDB::initModuleConfigIntervals() moduleConfig.telemetry.device_update_interval = MAX_INTERVAL; #endif +#ifdef USERPREFS_CONFIG_ENVIRONMENT_MEASUREMENT_ENABLED + moduleConfig.telemetry.environment_measurement_enabled = USERPREFS_CONFIG_ENVIRONMENT_MEASUREMENT_ENABLED; +#endif + #ifdef USERPREFS_CONFIG_ENV_TELEM_UPDATE_INTERVAL moduleConfig.telemetry.environment_update_interval = USERPREFS_CONFIG_ENV_TELEM_UPDATE_INTERVAL; #else moduleConfig.telemetry.environment_update_interval = 0; #endif -#ifdef USERPREFS_CONFIG_ENVIRONMENT_MEASUREMENT_ENABLED - moduleConfig.telemetry.environment_measurement_enabled = USERPREFS_CONFIG_ENVIRONMENT_MEASUREMENT_ENABLED; +#ifdef USERPREFS_CONFIG_ENV_SCREEN_SCREEN_ENABLED + moduleConfig.telemetry.environment_screen_enabled = USERPREFS_CONFIG_ENV_SCREEN_SCREEN_ENABLED; #endif #ifdef USERPREFS_CONFIG_AQ_TELEM_UPDATE_INTERVAL @@ -1546,6 +1550,10 @@ void NodeDB::initModuleConfigIntervals() moduleConfig.telemetry.air_quality_enabled = USERPREFS_CONFIG_AQ_MEASUREMENT_ENABLED; #endif +#ifdef USERPREFS_CONFIG_AQ_SCREEN_ENABLED + moduleConfig.telemetry.air_quality_screen_enabled = USERPREFS_CONFIG_AQ_SCREEN_ENABLED; +#endif + moduleConfig.telemetry.power_update_interval = 0; moduleConfig.telemetry.health_update_interval = 0; moduleConfig.neighbor_info.update_interval = 0; diff --git a/userPrefs.jsonc b/userPrefs.jsonc index 3e3fbd5c9..66ee623c6 100644 --- a/userPrefs.jsonc +++ b/userPrefs.jsonc @@ -37,8 +37,10 @@ // "USERPREFS_CONFIG_DEVICE_TELEM_UPDATE_INTERVAL": "900", // Device telemetry update interval in seconds // "USERPREFS_CONFIG_ENV_TELEM_UPDATE_INTERVAL": "900", // Environment telemetry update interval in seconds // "USERPREFS_CONFIG_ENVIRONMENT_MEASUREMENT_ENABLED": "1", // Force BMP280/sensor reads + LoRa broadcast on first boot + // "USERPREFS_CONFIG_ENV_SCREEN_SCREEN_ENABLED": "1", // Environment telemetry enable on screen // "USERPREFS_CONFIG_AQ_TELEM_UPDATE_INTERVAL": "900", // AQ telemetry update interval in seconds // "USERPREFS_CONFIG_AQ_MEASUREMENT_ENABLED": "1", // AQ telemetry enable + // "USERPREFS_CONFIG_AQ_SCREEN_ENABLED": "1", // AQ telemetry enable on screen // "USERPREFS_LORACONFIG_CHANNEL_NUM": "31", // "USERPREFS_LORACONFIG_TX_POWER": "0", // "USERPREFS_LORACONFIG_MODEM_PRESET": "meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST",