From f1ba56232ae9edaa2edf96040597a25130b503f3 Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Sat, 3 Jul 2021 20:42:31 +1000 Subject: [PATCH] Use uint32_t values consistent with underlying data structures --- radio/src/gui/colorlcd/model_inputs.cpp | 4 ++-- radio/src/gui/colorlcd/model_mixes.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/radio/src/gui/colorlcd/model_inputs.cpp b/radio/src/gui/colorlcd/model_inputs.cpp index 62a24d2a8..a28b1e0dd 100644 --- a/radio/src/gui/colorlcd/model_inputs.cpp +++ b/radio/src/gui/colorlcd/model_inputs.cpp @@ -284,12 +284,12 @@ class InputEditWindow : public Page // Flight modes new StaticText(window, grid.getLabelSlot(), STR_FLMODE); - for (uint8_t i=0; i 0 && (i % 4) == 0) grid.nextLine(); new TextButton(window, grid.getFieldSlot(4, i % 4), fm, - [=]() -> uint8_t { + [=]() -> uint32_t { BFBIT_FLIP(line->flightModes, bfBit(i)); SET_DIRTY(); return !(bfSingleBitGet(line->flightModes, i)); diff --git a/radio/src/gui/colorlcd/model_mixes.cpp b/radio/src/gui/colorlcd/model_mixes.cpp index 3d534b32a..a6fae37a9 100644 --- a/radio/src/gui/colorlcd/model_mixes.cpp +++ b/radio/src/gui/colorlcd/model_mixes.cpp @@ -136,13 +136,13 @@ class MixEditWindow : public Page // Flight modes new StaticText(window, grid.getLabelSlot(), STR_FLMODE); - for (uint8_t i = 0; i < MAX_FLIGHT_MODES; i++) { + for (uint32_t i = 0; i < MAX_FLIGHT_MODES; i++) { char fm[2] = {char('0' + i), '\0'}; if (i > 0 && (i % 4) == 0) grid.nextLine(); new TextButton( window, grid.getFieldSlot(4, i % 4), fm, - [=]() -> uint8_t { - BFBIT_FLIP(mix->flightModes, bfBit(i)); + [=]() -> uint32_t { + BFBIT_FLIP(mix->flightModes, bfBit(i)); SET_DIRTY(); return !(bfSingleBitGet(mix->flightModes, i)); },