From 5111253156e5af32b6149ff65de4a530033e3059 Mon Sep 17 00:00:00 2001 From: 3djc Date: Mon, 2 Sep 2019 10:10:41 +0200 Subject: [PATCH 1/2] Fix x10 compilation --- radio/src/gui/colorlcd/model_setup.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/radio/src/gui/colorlcd/model_setup.cpp b/radio/src/gui/colorlcd/model_setup.cpp index 82ace3a8d..6952c2a6f 100644 --- a/radio/src/gui/colorlcd/model_setup.cpp +++ b/radio/src/gui/colorlcd/model_setup.cpp @@ -513,6 +513,7 @@ class ModuleWindow : public Window { FormField::link(previousField, moduleChoice); // Module parameters +#if defined (PCBNV14) if (isModuleFlysky(moduleIdx)) { grid.nextLine(); rfChoice = new Choice(this, grid.getFieldSlot(), STR_FLYSKY_PROTOCOLS, 0, 3, @@ -524,13 +525,14 @@ class ModuleWindow : public Window { //TODO onFlySkyReceiverSetPulse(INTERNAL_MODULE, newValue); }); -#if defined (PCBNV14) + grid.nextLine(); new StaticText(this, grid.getLabelSlot(true), STR_FLYSKY_TELEMETRY); new CheckBox(this, grid.getFieldSlot(), GET_SET_DEFAULT(g_model.rssiAlarms.flysky_telemetry)); -#endif } - else if (isModuleXJT(moduleIdx)) { + else +#endif + if (isModuleXJT(moduleIdx)) { auto xjtChoice = new Choice(this, grid.getFieldSlot(2, 1), STR_XJT_ACCST_RF_PROTOCOLS, MODULE_SUBTYPE_PXX1_OFF, MODULE_SUBTYPE_PXX1_ACCST_LR12, GET_SET_DEFAULT(g_model.moduleData[moduleIdx].rfProtocol)); xjtChoice->setAvailableHandler([](int index) { From eb10f3c502672c100236fbcaae5137460a3169d3 Mon Sep 17 00:00:00 2001 From: 3djc Date: Mon, 2 Sep 2019 10:26:55 +0200 Subject: [PATCH 2/2] Cosmetics --- radio/src/gui/colorlcd/model_setup.cpp | 37 +++++++++++++------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/radio/src/gui/colorlcd/model_setup.cpp b/radio/src/gui/colorlcd/model_setup.cpp index 6952c2a6f..8b95c265c 100644 --- a/radio/src/gui/colorlcd/model_setup.cpp +++ b/radio/src/gui/colorlcd/model_setup.cpp @@ -513,25 +513,6 @@ class ModuleWindow : public Window { FormField::link(previousField, moduleChoice); // Module parameters -#if defined (PCBNV14) - if (isModuleFlysky(moduleIdx)) { - grid.nextLine(); - rfChoice = new Choice(this, grid.getFieldSlot(), STR_FLYSKY_PROTOCOLS, 0, 3, - GET_DEFAULT(g_model.moduleData[moduleIdx].flysky.mode), - [=](int32_t newValue) -> void { - g_model.moduleData[moduleIdx].flysky.mode = newValue; - SET_DIRTY(); - //TODO moduleFlagBackNormal(moduleIdx); - //TODO onFlySkyReceiverSetPulse(INTERNAL_MODULE, newValue); - }); - - - grid.nextLine(); - new StaticText(this, grid.getLabelSlot(true), STR_FLYSKY_TELEMETRY); - new CheckBox(this, grid.getFieldSlot(), GET_SET_DEFAULT(g_model.rssiAlarms.flysky_telemetry)); - } - else -#endif if (isModuleXJT(moduleIdx)) { auto xjtChoice = new Choice(this, grid.getFieldSlot(2, 1), STR_XJT_ACCST_RF_PROTOCOLS, MODULE_SUBTYPE_PXX1_OFF, MODULE_SUBTYPE_PXX1_ACCST_LR12, GET_SET_DEFAULT(g_model.moduleData[moduleIdx].rfProtocol)); @@ -654,6 +635,24 @@ class ModuleWindow : public Window { new StaticText(this, grid.getLabelSlot(true), STR_MULTI_LOWPOWER); new CheckBox(this, grid.getFieldSlot(), GET_SET_DEFAULT(g_model.moduleData[moduleIdx].multi.lowPowerMode)); } +#endif +#if defined (PCBNV14) + else if (isModuleFlysky(moduleIdx)) { + grid.nextLine(); + rfChoice = new Choice(this, grid.getFieldSlot(), STR_FLYSKY_PROTOCOLS, 0, 3, + GET_DEFAULT(g_model.moduleData[moduleIdx].flysky.mode), + [=](int32_t newValue) -> void { + g_model.moduleData[moduleIdx].flysky.mode = newValue; + SET_DIRTY(); + //TODO moduleFlagBackNormal(moduleIdx); + //TODO onFlySkyReceiverSetPulse(INTERNAL_MODULE, newValue); + }); + + + grid.nextLine(); + new StaticText(this, grid.getLabelSlot(true), STR_FLYSKY_TELEMETRY); + new CheckBox(this, grid.getFieldSlot(), GET_SET_DEFAULT(g_model.rssiAlarms.flysky_telemetry)); + } #endif grid.nextLine();