From 93ec316a4b470a0268f92b4751ff2874041ec2ef Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Mon, 31 Oct 2022 04:39:42 +0100 Subject: [PATCH] feat: Prevent OFF for internal module in hardware settings (#2654) * Prevent OFF for internal module in hardware settings * chore: Change "Mode" to "Type" --- radio/src/gui/colorlcd/hw_intmodule.cpp | 2 +- radio/src/gui/gui_common.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/radio/src/gui/colorlcd/hw_intmodule.cpp b/radio/src/gui/colorlcd/hw_intmodule.cpp index ad66e647b..c20fa9253 100644 --- a/radio/src/gui/colorlcd/hw_intmodule.cpp +++ b/radio/src/gui/colorlcd/hw_intmodule.cpp @@ -40,7 +40,7 @@ InternalModuleWindow::InternalModuleWindow(Window *parent) : FlexGridLayout grid(col_dsc, row_dsc, 2); setLayout(&grid); - new StaticText(this, rect_t{}, STR_MODE, 0, COLOR_THEME_PRIMARY1); + new StaticText(this, rect_t{}, STR_TYPE, 0, COLOR_THEME_PRIMARY1); auto box = new FormGroup(this, rect_t{}); box->setFlexLayout(LV_FLEX_FLOW_ROW, lv_dpx(8)); diff --git a/radio/src/gui/gui_common.cpp b/radio/src/gui/gui_common.cpp index 18de02102..79bd041ee 100644 --- a/radio/src/gui/gui_common.cpp +++ b/radio/src/gui/gui_common.cpp @@ -737,7 +737,6 @@ bool areModulesConflicting(int intModuleType, int extModuleType) bool isInternalModuleSupported(int moduleType) { switch(moduleType) { - case MODULE_TYPE_NONE: return true; #if defined(INTERNAL_MODULE_MULTI) case MODULE_TYPE_MULTIMODULE: return true; #endif