From cdd6d18d29afd511dbd8045a247a6643c5a37ff4 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Wed, 23 Jun 2021 12:39:47 +0200 Subject: [PATCH] Fixed trims display depending on stick mode Resolves #287 --- radio/src/gui/colorlcd/layouts/trims.cpp | 3 ++- radio/src/gui/colorlcd/view_main_decoration.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/radio/src/gui/colorlcd/layouts/trims.cpp b/radio/src/gui/colorlcd/layouts/trims.cpp index 82dc4f9e3..312d7adbf 100644 --- a/radio/src/gui/colorlcd/layouts/trims.cpp +++ b/radio/src/gui/colorlcd/layouts/trims.cpp @@ -24,7 +24,8 @@ void MainViewTrim::checkEvents() { Window::checkEvents(); - int8_t newValue = getTrimValue(mixerCurrentFlightMode, idx); + int8_t stickIndex = CONVERT_MODE(idx); + int8_t newValue = getTrimValue(mixerCurrentFlightMode, stickIndex); if (value != newValue) { value = newValue; invalidate(); diff --git a/radio/src/gui/colorlcd/view_main_decoration.cpp b/radio/src/gui/colorlcd/view_main_decoration.cpp index f99e526b3..9f876ab10 100644 --- a/radio/src/gui/colorlcd/view_main_decoration.cpp +++ b/radio/src/gui/colorlcd/view_main_decoration.cpp @@ -286,22 +286,22 @@ void ViewMainDecoration::createTrims() HORIZONTAL_SLIDERS_WIDTH, 0 }; - trims[TRIMS_LH] = new MainViewHorizontalTrim(this, r, 0); + trims[TRIMS_LH] = new MainViewHorizontalTrim(this, r, TRIMS_LH); r = rect_t { right() - HORIZONTAL_SLIDERS_WIDTH - HMARGIN, 0, HORIZONTAL_SLIDERS_WIDTH, 0 }; - trims[TRIMS_RH] = new MainViewHorizontalTrim(this, r, 3); + trims[TRIMS_RH] = new MainViewHorizontalTrim(this, r, TRIMS_RH); r = rect_t { 0, 0, 0, VERTICAL_SLIDERS_HEIGHT }; - trims[TRIMS_LV] = new MainViewVerticalTrim(this, r, 2); - trims[TRIMS_RV] = new MainViewVerticalTrim(this, r, 1); + trims[TRIMS_LV] = new MainViewVerticalTrim(this, r, TRIMS_LV); + trims[TRIMS_RV] = new MainViewVerticalTrim(this, r, TRIMS_RV); } void ViewMainDecoration::createFlightMode()