From 4574fc6b39ab872f6b3b3d6eb2594e78e34b4ac8 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Sun, 13 Nov 2022 04:18:52 +0100 Subject: [PATCH] fix(crsf): internal module baudrate (#2717) --- radio/src/gui/colorlcd/hw_intmodule.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/radio/src/gui/colorlcd/hw_intmodule.cpp b/radio/src/gui/colorlcd/hw_intmodule.cpp index c20fa9253..9a09767c6 100644 --- a/radio/src/gui/colorlcd/hw_intmodule.cpp +++ b/radio/src/gui/colorlcd/hw_intmodule.cpp @@ -55,16 +55,16 @@ InternalModuleWindow::InternalModuleWindow(Window *parent) : [](int module) { return isInternalModuleSupported(module); }); #if defined(INTERNAL_MODULE_PXX1) && defined(EXTERNAL_ANTENNA) - box = new FormGroup(box, rect_t{}); - box->setFlexLayout(LV_FLEX_FLOW_ROW, lv_dpx(8)); + auto pxx1_box = new FormGroup(box, rect_t{}); + pxx1_box->setFlexLayout(LV_FLEX_FLOW_ROW, lv_dpx(8)); - ant_box = box->getLvObj(); + ant_box = pxx1_box->getLvObj(); lv_obj_set_width(ant_box, LV_SIZE_CONTENT); lv_obj_set_style_flex_cross_place(ant_box, LV_FLEX_ALIGN_CENTER, 0); - new StaticText(box, rect_t{}, STR_ANTENNA, 0, COLOR_THEME_PRIMARY1); + new StaticText(pxx1_box, rect_t{}, STR_ANTENNA, 0, COLOR_THEME_PRIMARY1); new Choice( - box, rect_t{}, STR_ANTENNA_MODES, ANTENNA_MODE_INTERNAL, + pxx1_box, rect_t{}, STR_ANTENNA_MODES, ANTENNA_MODE_INTERNAL, ANTENNA_MODE_EXTERNAL, GET_DEFAULT(g_eeGeneral.antennaMode), [](int antenna) { if (!isExternalAntennaEnabled() && @@ -87,15 +87,15 @@ InternalModuleWindow::InternalModuleWindow(Window *parent) : #endif #if defined(CROSSFIRE) - box = new FormGroup(box, rect_t{}); - box->setFlexLayout(LV_FLEX_FLOW_ROW); + auto crsf_box = new FormGroup(box, rect_t{}); + crsf_box->setFlexLayout(LV_FLEX_FLOW_ROW, lv_dpx(8)); - br_box = box->getLvObj(); + br_box = crsf_box->getLvObj(); lv_obj_set_width(br_box, LV_SIZE_CONTENT); lv_obj_set_style_flex_cross_place(br_box, LV_FLEX_ALIGN_CENTER, 0); - new StaticText(box, rect_t{}, STR_BAUDRATE, 0, COLOR_THEME_PRIMARY1); - new Choice(box, rect_t{}, STR_CRSF_BAUDRATE, 0, + new StaticText(crsf_box, rect_t{}, STR_BAUDRATE, 0, COLOR_THEME_PRIMARY1); + new Choice(crsf_box, rect_t{}, STR_CRSF_BAUDRATE, 0, CROSSFIRE_MAX_INTERNAL_BAUDRATE, getBaudrate, setBaudrate); updateBaudrateLine();