From 1e020c5f2fd1a12285138c9f55122e12119b1ef1 Mon Sep 17 00:00:00 2001 From: 3djc Date: Mon, 9 Dec 2019 07:38:51 +0100 Subject: [PATCH] Fix optionsValue related casting This fixes #7170 --- radio/src/gui/128x64/model_setup.cpp | 2 +- radio/src/gui/212x64/model_setup.cpp | 2 +- radio/src/gui/480x272/model_setup.cpp | 2 +- radio/src/pulses/modules_helpers.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 13e37fec0..5860bf2ca 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -1484,7 +1484,7 @@ void menuModelSetup(event_t event) lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, optionValue, LEFT | attr); if (attr) { - uint8_t min, max; + int8_t min, max; getMultiOptionValues(multi_proto, min, max); CHECK_INCDEC_MODELVAR(event, g_model.moduleData[moduleIdx].multi.optionValue, min, max); } diff --git a/radio/src/gui/212x64/model_setup.cpp b/radio/src/gui/212x64/model_setup.cpp index 69897a0f6..c7acddefb 100644 --- a/radio/src/gui/212x64/model_setup.cpp +++ b/radio/src/gui/212x64/model_setup.cpp @@ -1241,7 +1241,7 @@ void menuModelSetup(event_t event) lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, optionValue, LEFT | attr); if (attr) { - uint8_t min, max; + int8_t min, max; getMultiOptionValues(multi_proto, min, max); CHECK_INCDEC_MODELVAR(event, g_model.moduleData[moduleIdx].multi.optionValue, min, max); } diff --git a/radio/src/gui/480x272/model_setup.cpp b/radio/src/gui/480x272/model_setup.cpp index c34dab101..93fed1953 100644 --- a/radio/src/gui/480x272/model_setup.cpp +++ b/radio/src/gui/480x272/model_setup.cpp @@ -1635,7 +1635,7 @@ bool menuModelSetup(event_t event) lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, optionValue, LEFT | attr); if (attr) { - uint8_t min, max; + int8_t min, max; getMultiOptionValues(multi_proto, min, max); CHECK_INCDEC_MODELVAR(event, g_model.moduleData[moduleIdx].multi.optionValue, min, max); } diff --git a/radio/src/pulses/modules_helpers.h b/radio/src/pulses/modules_helpers.h index 2b42d8175..2c9a64e94 100644 --- a/radio/src/pulses/modules_helpers.h +++ b/radio/src/pulses/modules_helpers.h @@ -559,7 +559,7 @@ inline void resetMultiProtocolsOptions(uint8_t moduleIdx) g_model.moduleData[moduleIdx].multi.lowPowerMode = 0; } -inline void getMultiOptionValues(uint8_t multi_proto, uint8_t & min, uint8_t & max) +inline void getMultiOptionValues(int8_t multi_proto, int8_t & min, int8_t & max) { switch (multi_proto) { case MODULE_SUBTYPE_MULTI_DSM2: