From fcc94cc24b96491af1e2a5a0e447028246e951b6 Mon Sep 17 00:00:00 2001 From: philmoz Date: Wed, 3 Jan 2024 16:02:36 +1100 Subject: [PATCH] fix(radio): Inactivity timer being reset by unconfigured pots/sliders (#4464) --- radio/src/inactivity_timer.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/radio/src/inactivity_timer.cpp b/radio/src/inactivity_timer.cpp index 8c3497147..508b9f78c 100644 --- a/radio/src/inactivity_timer.cpp +++ b/radio/src/inactivity_timer.cpp @@ -56,11 +56,12 @@ bool inactivityCheckInputs() { uint8_t sum = 0; - auto max_inputs = adcGetMaxInputs(ADC_INPUT_MAIN) - + adcGetMaxInputs(ADC_INPUT_FLEX); + auto max_sticks = adcGetMaxInputs(ADC_INPUT_MAIN); + auto max_inputs = max_sticks + adcGetMaxInputs(ADC_INPUT_FLEX); for (uint8_t i = 0; i < max_inputs; i++) { - sum += getAnalogValue(i) >> INAC_STICKS_SHIFT; + if (i < max_sticks || IS_POT_AVAILABLE(i - max_sticks)) + sum += getAnalogValue(i) >> INAC_STICKS_SHIFT; } for (uint8_t i = 0; i < getSwitchCount(); i++)