From 97d3c68efc68ec934c6412e6095de898e2fb0b66 Mon Sep 17 00:00:00 2001 From: 3djc Date: Thu, 10 Feb 2022 08:15:52 +0100 Subject: [PATCH] Cosmetics --- radio/src/gui/128x64/model_setup.cpp | 9 +- radio/src/gui/212x64/model_setup.cpp | 13 +-- radio/src/gui/colorlcd/model_setup.cpp | 7 +- radio/src/gui/colorlcd/radio_hardware.cpp | 122 +++++++++------------- 4 files changed, 56 insertions(+), 95 deletions(-) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 6342f5ff7..f0ee5d29c 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -1060,14 +1060,9 @@ void menuModelSetup(event_t event) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_BAUDRATE: { ModuleData & moduleData = g_model.moduleData[moduleIdx]; lcdDrawText( INDENT_WIDTH, y, STR_BAUDRATE); - lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, EXT_CROSSFIRE_BAUDRATE, - attr | LEFT); + lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, EXT_CROSSFIRE_BAUDRATE,attr | LEFT); if (attr) { - moduleData.crsf.telemetryBaudrate = - CROSSFIRE_INDEX_TO_STORE(checkIncDecModel( - event, - CROSSFIRE_STORE_TO_INDEX(moduleData.crsf.telemetryBaudrate), 0, - DIM(CROSSFIRE_BAUDRATES) - 1)); + moduleData.crsf.telemetryBaudrate = CROSSFIRE_INDEX_TO_STORE(checkIncDecModel(event,CROSSFIRE_STORE_TO_INDEX(moduleData.crsf.telemetryBaudrate), 0,DIM(CROSSFIRE_BAUDRATES) - 1)); if (checkIncDec_Ret) { restartExternalModule(); } diff --git a/radio/src/gui/212x64/model_setup.cpp b/radio/src/gui/212x64/model_setup.cpp index fd495a56d..fd3232a56 100644 --- a/radio/src/gui/212x64/model_setup.cpp +++ b/radio/src/gui/212x64/model_setup.cpp @@ -1023,16 +1023,11 @@ void menuModelSetup(event_t event) #if defined(CROSSFIRE) case ITEM_MODEL_SETUP_EXTERNAL_MODULE_BAUDRATE: { - ModuleData & moduleData = g_model.moduleData[EXTERNAL_MODULE]; - lcdDrawText( INDENT_WIDTH, y, STR_BAUDRATE); - lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, EXT_CROSSFIRE_BAUDRATE, - attr | LEFT); + ModuleData &moduleData = g_model.moduleData[EXTERNAL_MODULE]; + lcdDrawText(INDENT_WIDTH, y, STR_BAUDRATE); + lcdDrawNumber(MODEL_SETUP_2ND_COLUMN, y, EXT_CROSSFIRE_BAUDRATE,attr | LEFT); if (attr) { - moduleData.crsf.telemetryBaudrate = - CROSSFIRE_INDEX_TO_STORE(checkIncDecModel( - event, - CROSSFIRE_STORE_TO_INDEX(moduleData.crsf.telemetryBaudrate), 0, - DIM(CROSSFIRE_BAUDRATES) - 1)); + moduleData.crsf.telemetryBaudrate = CROSSFIRE_INDEX_TO_STORE(checkIncDecModel(event,CROSSFIRE_STORE_TO_INDEX(moduleData.crsf.telemetryBaudrate),0, DIM(CROSSFIRE_BAUDRATES) - 1)); if (checkIncDec_Ret) { restartExternalModule(); } diff --git a/radio/src/gui/colorlcd/model_setup.cpp b/radio/src/gui/colorlcd/model_setup.cpp index 29e8611e7..add6ed664 100644 --- a/radio/src/gui/colorlcd/model_setup.cpp +++ b/radio/src/gui/colorlcd/model_setup.cpp @@ -610,11 +610,8 @@ class ModuleWindow : public FormGroup { // Module parameters if (moduleIdx== EXTERNAL_MODULE && isModuleCrossfire(moduleIdx)) { grid.nextLine(); - new StaticText(this, grid.getLabelSlot(true), STR_BAUDRATE, 0, - COLOR_THEME_PRIMARY1); - new Choice( - this, grid.getFieldSlot(1, 0), STR_CRSF_BAUDRATE, 0, - CROSSFIRE_MAX_INTERNAL_BAUDRATE, + new StaticText(this, grid.getLabelSlot(true), STR_BAUDRATE, 0,COLOR_THEME_PRIMARY1); + new Choice(this, grid.getFieldSlot(1, 0), STR_CRSF_BAUDRATE, 0,CROSSFIRE_MAX_INTERNAL_BAUDRATE, [=]() -> int { return CROSSFIRE_STORE_TO_INDEX(g_model.moduleData[moduleIdx].crsf.telemetryBaudrate); }, diff --git a/radio/src/gui/colorlcd/radio_hardware.cpp b/radio/src/gui/colorlcd/radio_hardware.cpp index 3eeb7ad0a..939e21459 100644 --- a/radio/src/gui/colorlcd/radio_hardware.cpp +++ b/radio/src/gui/colorlcd/radio_hardware.cpp @@ -282,8 +282,7 @@ class InternalModuleWindow : public FormGroup { new StaticText(this, grid.getLabelSlot(), TR_INTERNAL_MODULE, 0, COLOR_THEME_PRIMARY1); - auto internalModule = new Choice(this, grid.getFieldSlot(1, 0), - STR_INTERNAL_MODULE_PROTOCOLS, MODULE_TYPE_NONE, MODULE_TYPE_COUNT - 1, + auto internalModule = new Choice(this, grid.getFieldSlot(1, 0),STR_INTERNAL_MODULE_PROTOCOLS, MODULE_TYPE_NONE, MODULE_TYPE_COUNT - 1, GET_DEFAULT(g_eeGeneral.internalModule), [=](int moduleType) { if (g_model.moduleData[INTERNAL_MODULE].type != moduleType) { @@ -301,11 +300,8 @@ class InternalModuleWindow : public FormGroup { #if defined(CROSSFIRE) if (isInternalModuleCrossfire()) { grid.nextLine(); - new StaticText(this, grid.getLabelSlot(), STR_BAUDRATE, 0, - COLOR_THEME_PRIMARY1); - new Choice( - this, grid.getFieldSlot(1, 0), STR_CRSF_BAUDRATE, 0, - CROSSFIRE_MAX_INTERNAL_BAUDRATE, + new StaticText(this, grid.getLabelSlot(), STR_BAUDRATE, 0,COLOR_THEME_PRIMARY1); + new Choice(this, grid.getFieldSlot(1, 0), STR_CRSF_BAUDRATE, 0,CROSSFIRE_MAX_INTERNAL_BAUDRATE, [=]() -> int { return CROSSFIRE_STORE_TO_INDEX(g_eeGeneral.InternalModuleBaudrate); }, @@ -347,14 +343,14 @@ void RadioHardwarePage::build(FormWindow * window) grid.spacer(PAGE_PADDING); // Calibration - new StaticText(window, grid.getLabelSlot(), STR_INPUTS, 0, - COLOR_THEME_PRIMARY1 | FONT(BOLD)); + new StaticText(window, grid.getLabelSlot(), STR_INPUTS, 0, COLOR_THEME_PRIMARY1 | FONT(BOLD)); auto calib = new TextButton(window, grid.getFieldSlot(), STR_CALIBRATION); calib->setPressHandler([=]() -> uint8_t { - auto calibrationPage = new RadioCalibrationPage(); - calibrationPage->setCloseHandler( - [=]() { calib->setFocus(SET_FOCUS_DEFAULT); }); - return 0; + auto calibrationPage = new RadioCalibrationPage(); + calibrationPage->setCloseHandler([=]() { + calib->setFocus(SET_FOCUS_DEFAULT); + }); + return 0; }); grid.nextLine(); @@ -362,11 +358,8 @@ void RadioHardwarePage::build(FormWindow * window) new Subtitle(window, grid.getLineSlot(), STR_STICKS, 0, COLOR_THEME_PRIMARY1); grid.nextLine(); for (int i = 0; i < NUM_STICKS; i++) { - new StaticText(window, grid.getLabelSlot(true), - TEXT_AT_INDEX(STR_VSRCRAW, (i + 1)), 0, - COLOR_THEME_PRIMARY1); - new RadioTextEdit(window, grid.getFieldSlot(2, 0), g_eeGeneral.anaNames[i], - LEN_ANA_NAME); + new StaticText(window, grid.getLabelSlot(true), TEXT_AT_INDEX(STR_VSRCRAW, (i + 1)), 0, COLOR_THEME_PRIMARY1); + new RadioTextEdit(window, grid.getFieldSlot(2,0), g_eeGeneral.anaNames[i], LEN_ANA_NAME); grid.nextLine(); } @@ -376,39 +369,30 @@ void RadioHardwarePage::build(FormWindow * window) for (int i = 0; i < NUM_POTS; i++) { // Display EX3 & EX4 (= last two pots) only when FlySky gimbals are present #if !defined(SIMU) && defined(RADIO_FAMILY_T16) - if (!globalData.flyskygimbals && (i >= (NUM_POTS - 2))) continue; + if (!globalData.flyskygimbals && (i >= (NUM_POTS - 2))) + continue; #endif - new StaticText(window, grid.getLabelSlot(true), - TEXT_AT_INDEX(STR_VSRCRAW, (i + NUM_STICKS + 1)), 0, - COLOR_THEME_PRIMARY1); - new RadioTextEdit(window, grid.getFieldSlot(2, 0), - g_eeGeneral.anaNames[i + NUM_STICKS], LEN_ANA_NAME); - new Choice( - window, grid.getFieldSlot(2, 1), STR_POTTYPES, POT_NONE, - POT_WITHOUT_DETENT, - [=]() -> int { - return bfGet(g_eeGeneral.potsConfig, 2 * i, 2); - }, - [=](int newValue) { - g_eeGeneral.potsConfig = - bfSet(g_eeGeneral.potsConfig, newValue, 2 * i, 2); - SET_DIRTY(); - }); + new StaticText(window, grid.getLabelSlot(true), TEXT_AT_INDEX(STR_VSRCRAW, (i + NUM_STICKS + 1)), 0, COLOR_THEME_PRIMARY1); + new RadioTextEdit(window, grid.getFieldSlot(2,0), g_eeGeneral.anaNames[i + NUM_STICKS], LEN_ANA_NAME); + new Choice(window, grid.getFieldSlot(2,1), STR_POTTYPES, POT_NONE, POT_WITHOUT_DETENT, + [=]() -> int { + return bfGet(g_eeGeneral.potsConfig, 2*i, 2); + }, + [=](int newValue) { + g_eeGeneral.potsConfig = bfSet(g_eeGeneral.potsConfig, newValue, 2*i, 2); + SET_DIRTY(); + }); grid.nextLine(); } // Sliders - new Subtitle(window, grid.getLineSlot(), STR_SLIDERS, 0, - COLOR_THEME_PRIMARY1); + new Subtitle(window, grid.getLineSlot(), STR_SLIDERS, 0, COLOR_THEME_PRIMARY1); grid.nextLine(); for (int i = 0; i < NUM_SLIDERS; i++) { const int idx = i + NUM_STICKS + NUM_POTS; - new StaticText(window, grid.getLabelSlot(true), - TEXT_AT_INDEX(STR_VSRCRAW, idx + 1), 0, - COLOR_THEME_PRIMARY1); - new RadioTextEdit(window, grid.getFieldSlot(2, 0), - g_eeGeneral.anaNames[idx], LEN_ANA_NAME); + new StaticText(window, grid.getLabelSlot(true), TEXT_AT_INDEX(STR_VSRCRAW, idx + 1), 0, COLOR_THEME_PRIMARY1); + new RadioTextEdit(window, grid.getFieldSlot(2, 0), g_eeGeneral.anaNames[idx], LEN_ANA_NAME); new Choice( window, grid.getFieldSlot(2, 1), STR_SLIDERTYPES, SLIDER_NONE, SLIDER_WITH_DETENT, @@ -426,52 +410,42 @@ void RadioHardwarePage::build(FormWindow * window) } // Switches - new Subtitle(window, grid.getLineSlot(), STR_SWITCHES, 0, - COLOR_THEME_PRIMARY1); + new Subtitle(window, grid.getLineSlot(), STR_SWITCHES, 0, COLOR_THEME_PRIMARY1); grid.nextLine(); for (int i = 0; i < NUM_SWITCHES; i++) { new SwitchDynamicLabel(window, grid.getLabelSlot(true), i); - new RadioTextEdit(window, grid.getFieldSlot(2, 0), - g_eeGeneral.switchNames[i], LEN_SWITCH_NAME); - new Choice( - window, grid.getFieldSlot(2, 1), STR_SWTYPES, SWITCH_NONE, - SWITCH_TYPE_MAX(i), [=]() -> int { return SWITCH_CONFIG(i); }, - [=](int newValue) { - swconfig_t mask = (swconfig_t)0x03 << (2 * i); - g_eeGeneral.switchConfig = (g_eeGeneral.switchConfig & ~mask) | - ((swconfig_t(newValue) & 0x03) << (2 * i)); - SET_DIRTY(); - }); + new RadioTextEdit(window, grid.getFieldSlot(2, 0), g_eeGeneral.switchNames[i], LEN_SWITCH_NAME); + new Choice(window, grid.getFieldSlot(2, 1), STR_SWTYPES, SWITCH_NONE, SWITCH_TYPE_MAX(i), + [=]() -> int { + return SWITCH_CONFIG(i); + }, + [=](int newValue) { + swconfig_t mask = (swconfig_t) 0x03 << (2 * i); + g_eeGeneral.switchConfig = (g_eeGeneral.switchConfig & ~mask) | ((swconfig_t(newValue) & 0x03) << (2 * i)); + SET_DIRTY(); + }); grid.nextLine(); } // Bat calibration - new StaticText(window, grid.getLabelSlot(), STR_BATT_CALIB, 0, - COLOR_THEME_PRIMARY1); - auto batCal = - new NumberEdit(window, grid.getFieldSlot(1, 0), -127, 127, - GET_SET_DEFAULT(g_eeGeneral.txVoltageCalibration)); - batCal->setDisplayHandler( - [](BitmapBuffer *dc, LcdFlags flags, int32_t value) { - dc->drawNumber(FIELD_PADDING_LEFT, FIELD_PADDING_TOP, - getBatteryVoltage(), flags | PREC2, 0, nullptr, "V"); - }); + new StaticText(window, grid.getLabelSlot(), STR_BATT_CALIB, 0, COLOR_THEME_PRIMARY1); + auto batCal = new NumberEdit(window, grid.getFieldSlot(1,0), -127, 127, GET_SET_DEFAULT(g_eeGeneral.txVoltageCalibration)); + batCal->setDisplayHandler([](BitmapBuffer * dc, LcdFlags flags, int32_t value) { + dc->drawNumber(FIELD_PADDING_LEFT, FIELD_PADDING_TOP, getBatteryVoltage(), flags | PREC2, 0, nullptr, "V"); + }); batCal->setWindowFlags(REFRESH_ALWAYS); grid.nextLine(); // RTC Batt display - new StaticText(window, grid.getLabelSlot(), STR_RTC_BATT, 0, - COLOR_THEME_PRIMARY1); - new DynamicNumber( - window, grid.getFieldSlot(1, 0), [] { return getRTCBatteryVoltage(); }, - COLOR_THEME_PRIMARY1 | PREC2, nullptr, "V"); + new StaticText(window, grid.getLabelSlot(), STR_RTC_BATT, 0, COLOR_THEME_PRIMARY1); + new DynamicNumber(window, grid.getFieldSlot(1,0), [] { + return getRTCBatteryVoltage(); + }, COLOR_THEME_PRIMARY1 | PREC2, nullptr, "V"); grid.nextLine(); // RTC Batt check enable - new StaticText(window, grid.getLabelSlot(), STR_RTC_CHECK, 0, - COLOR_THEME_PRIMARY1); - new CheckBox(window, grid.getFieldSlot(1, 0), - GET_SET_INVERTED(g_eeGeneral.disableRtcWarning)); + new StaticText(window, grid.getLabelSlot(), STR_RTC_CHECK, 0, COLOR_THEME_PRIMARY1); + new CheckBox(window, grid.getFieldSlot(1,0), GET_SET_INVERTED(g_eeGeneral.disableRtcWarning )); grid.nextLine(); #if defined(HARDWARE_INTERNAL_MODULE)