cleanup - review comments (@CapnBry)

mha1 · Nov 9, 2024 · 99ccab6 · 99ccab6
1 parent 2897abd
commit 99ccab6
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 25 deletions.
diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp
@@ -276,8 +276,8 @@ static uint8_t VIEWOPT_ROW(uint8_t value) { return expandState.viewOpt ? value :
 #else
 #define IF_MODULE_BAUDRATE_ADJUST(module, xxx) (isModuleCrossfire(module) ? (uint8_t)(xxx) : HIDDEN_ROW)
 #endif
-#define IF_MODULE_ARMED(module, xxx) (crossfireModuleStatus[module].isELRSV4 ? (uint8_t)(xxx) : HIDDEN_ROW)
-#define IF_MODULE_ARMED_TRIGGER(module, xxx) ((crossfireModuleStatus[module].isELRSV4 && g_model.moduleData[module].crsf.crsfArmingMode) ? (uint8_t)(xxx) : HIDDEN_ROW)
+#define IF_MODULE_ARMED(module, xxx) (CRSF_ELRS_MIN_VER(module, 4, 0) ? (uint8_t)(xxx) : HIDDEN_ROW)
+#define IF_MODULE_ARMED_TRIGGER(module, xxx) ((CRSF_ELRS_MIN_VER(module, 4, 0) && g_model.moduleData[module].crsf.crsfArmingMode) ? (uint8_t)(xxx) : HIDDEN_ROW)
 #else
 #define IF_MODULE_SYNCED(module, xxx)
 #define IF_MODULE_BAUDRATE_ADJUST(module, xxx)

diff --git a/radio/src/gui/212x64/model_setup.cpp b/radio/src/gui/212x64/model_setup.cpp
@@ -424,8 +424,8 @@ inline uint8_t EXTERNAL_MODULE_TYPE_ROW()
 #else
 #define IF_MODULE_BAUDRATE_ADJUST(module, xxx) (isModuleCrossfire(module) ? (uint8_t)(xxx) : HIDDEN_ROW)
 #endif
-#define IF_MODULE_ARMED(module, xxx) (crossfireModuleStatus[module].isELRSV4 ? (uint8_t)(xxx) : HIDDEN_ROW)
-#define IF_MODULE_ARMED_TRIGGER(module, xxx) ((crossfireModuleStatus[module].isELRSV4  && g_model.moduleData[module].crsf.crsfArmingMode) ? (uint8_t)(xxx) : HIDDEN_ROW)  
+#define IF_MODULE_ARMED(module, xxx) (CRSF_ELRS_MIN_VER(module, 4, 0) ? (uint8_t)(xxx) : HIDDEN_ROW)
+#define IF_MODULE_ARMED_TRIGGER(module, xxx) ((CRSF_ELRS_MIN_VER(module, 4, 0) && g_model.moduleData[module].crsf.crsfArmingMode) ? (uint8_t)(xxx) : HIDDEN_ROW)  
 #else
 #define IF_MODULE_SYNCED(module, xxx)
 #define IF_MODULE_BAUDRATE_ADJUST(module, xxx)

diff --git a/radio/src/gui/colorlcd/module/crossfire_settings.cpp b/radio/src/gui/colorlcd/module/crossfire_settings.cpp
@@ -30,7 +30,7 @@
 
 CrossfireSettings::CrossfireSettings(Window* parent, const FlexGridLayout& g,
                                      uint8_t moduleIdx) :
-    Window(parent, rect_t{}), md(&g_model.moduleData[moduleIdx])
+    Window(parent, rect_t{}), md(&g_model.moduleData[moduleIdx]), moduleIdx(moduleIdx)
 {
   FlexGridLayout grid(g);
   setFlexLayout();
@@ -67,33 +67,33 @@ CrossfireSettings::CrossfireSettings(Window* parent, const FlexGridLayout& g,
     return std::string(msg);
   });
 
-  this->moduleIdx = moduleIdx;
+  moduleIdx = moduleIdx;
 
   auto armingLine = newLine(grid);
-  text = new StaticText(armingLine, rect_t{}, STR_ARMING_MODE);
+  lblArmMode = new StaticText(armingLine, rect_t{}, STR_ARMING_MODE);
   auto box = new Window(armingLine, rect_t{});
   box->padAll(PAD_TINY);
   box->setFlexLayout(LV_FLEX_FLOW_ROW, PAD_SMALL);
-  choice = new Choice(box, rect_t{}, STR_CRSF_ARMING_MODES, 0, 1, GET_SET_DEFAULT(md->crsf.crsfArmingMode));
-  switchChoice = new SwitchChoice(box, rect_t{}, SWSRC_FIRST, SWSRC_LAST, GET_SET_DEFAULT(md->crsf.crsfArmingTrigger));
-  switchChoice->setAvailableHandler([=](int sw) { return isSwitchAvailableForArming(sw); });
+  choArmMode = new Choice(box, rect_t{}, STR_CRSF_ARMING_MODES, 0, 1, GET_SET_DEFAULT(md->crsf.crsfArmingMode));
+  choArmSwitch = new SwitchChoice(box, rect_t{}, SWSRC_FIRST, SWSRC_LAST, GET_SET_DEFAULT(md->crsf.crsfArmingTrigger));
+  choArmSwitch->setAvailableHandler([=](int sw) { return isSwitchAvailableForArming(sw); });
 
   update();                      
 }
 
 void CrossfireSettings::update() {
-    if(crossfireModuleStatus[this->moduleIdx].isELRSV4) {
-      text->show();
-      choice->show();
+    if(CRSF_ELRS_MIN_VER(moduleIdx, 4, 0)) {
+      lblArmMode->show();
+      choArmMode->show();
 
       if(md->crsf.crsfArmingMode == ARMING_MODE_SWITCH)
-        switchChoice->show();
+        choArmSwitch->show();
       else
-        switchChoice->hide();
+        choArmSwitch->hide();
     } else {
-      text->hide();
-      choice->hide();
-      switchChoice->hide();
+      lblArmMode->hide();
+      choArmMode->hide();
+      choArmSwitch->hide();
     }
 }
 

diff --git a/radio/src/gui/colorlcd/module/crossfire_settings.h b/radio/src/gui/colorlcd/module/crossfire_settings.h
@@ -30,11 +30,10 @@ struct ModuleData;
 class CrossfireSettings : public Window, public ModuleOptions
 {
   ModuleData* md;
-  StaticText *text;
-  Choice *choice;
-  SwitchChoice *switchChoice;
+  StaticText *lblArmMode;
+  Choice *choArmMode;
+  SwitchChoice *choArmSwitch;
   uint8_t moduleIdx;
-  bool isELRSV4;
 
   void checkEvents() override;
   void update() override;

diff --git a/radio/src/telemetry/crossfire.cpp b/radio/src/telemetry/crossfire.cpp
@@ -270,9 +270,8 @@ void processCrossfireTelemetryFrame(uint8_t module, uint8_t* rxBuffer,
         crossfireModuleStatus[module].major = rxBuffer[14 + nameSize];
         crossfireModuleStatus[module].minor = rxBuffer[15 + nameSize];
         crossfireModuleStatus[module].revision = rxBuffer[16 + nameSize];
-        crossfireModuleStatus[module].isELRSV4 = crossfireModuleStatus[module].isELRS && crossfireModuleStatus[module].major >= 4;
 
-        if(!crossfireModuleStatus[module].isELRSV4) {
+        if(!CRSF_ELRS_MIN_VER(module, 4, 0) && g_model.moduleData[module].crsf.crsfArmingMode != ARMING_MODE_CH5) {
           g_model.moduleData[module].crsf.crsfArmingMode = ARMING_MODE_CH5;
           g_model.moduleData[module].crsf.crsfArmingTrigger = SWSRC_NONE;
 

diff --git a/radio/src/telemetry/crossfire.h b/radio/src/telemetry/crossfire.h
@@ -111,7 +111,6 @@ struct CrossfireModuleStatus
     char name[CRSF_NAME_MAXSIZE];
     bool queryCompleted;
     bool isELRS;
-    bool isELRSV4;
 };
 
 extern CrossfireModuleStatus crossfireModuleStatus[2];
@@ -157,6 +156,11 @@ const uint8_t CROSSFIRE_FRAME_PERIODS[] = {
         % DIM(CROSSFIRE_BAUDRATES)
 #endif
 
+#define CRSF_ELRS_MIN_VER(moduleIdx, maj, min) \
+        (crossfireModuleStatus[moduleIdx].isELRS \
+         && crossfireModuleStatus[moduleIdx].major >= maj \
+         && crossfireModuleStatus[moduleIdx].minor >= min)
+
 #if defined(HARDWARE_INTERNAL_MODULE)
 #define INT_CROSSFIRE_BR_IDX   CROSSFIRE_STORE_TO_INDEX(g_eeGeneral.internalModuleBaudrate)
 #define INT_CROSSFIRE_BAUDRATE CROSSFIRE_BAUDRATES[INT_CROSSFIRE_BR_IDX]