changed hats mode enum names to have prefix HATS_

EdgeTX · Aug 5, 2023 · 0dad502 · 0dad502
1 parent 0a9f622
commit 0dad502
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 32 deletions.
diff --git a/companion/src/firmwares/edgetx/yaml_generalsettings.cpp b/companion/src/firmwares/edgetx/yaml_generalsettings.cpp
@@ -118,9 +118,9 @@ const YamlLookupTable internalModuleLut = {
 };
 
 static const YamlLookupTable hatsModeLut = {
-  {  GeneralSettings::MODE_TRIMS_ONLY, "TRIMS_ONLY"  },
-  {  GeneralSettings::MODE_KEYS_ONLY, "KEYS_ONLY"  },
-  {  GeneralSettings::MODE_SWITCHABLE, "SWITCHABLE"  },
+  {  GeneralSettings::HATS_MODE_TRIMS_ONLY, "TRIMS_ONLY"  },
+  {  GeneralSettings::HATS_MODE_KEYS_ONLY, "KEYS_ONLY"  },
+  {  GeneralSettings::HATS_MODE_SWITCHABLE, "SWITCHABLE"  },
 };
 
 YamlTelemetryBaudrate::YamlTelemetryBaudrate(

diff --git a/companion/src/firmwares/edgetx/yaml_modeldata.cpp b/companion/src/firmwares/edgetx/yaml_modeldata.cpp
@@ -89,10 +89,10 @@ static const YamlLookupTable usbJoystickIfModeLut = {
 };
 
 static const YamlLookupTable hatsModeLut = {
-  {  GeneralSettings::MODE_TRIMS_ONLY, "TRIMS_ONLY"  },
-  {  GeneralSettings::MODE_KEYS_ONLY, "KEYS_ONLY"  },
-  {  GeneralSettings::MODE_SWITCHABLE, "SWITCHABLE"  },
-  {  GeneralSettings::MODE_GLOBAL, "GLOBAL"  },
+  {  GeneralSettings::HATS_MODE_TRIMS_ONLY, "TRIMS_ONLY"  },
+  {  GeneralSettings::HATS_MODE_KEYS_ONLY, "KEYS_ONLY"  },
+  {  GeneralSettings::HATS_MODE_SWITCHABLE, "SWITCHABLE"  },
+  {  GeneralSettings::HATS_MODE_GLOBAL, "GLOBAL"  },
 };
 
 struct YamlTrim {

diff --git a/companion/src/firmwares/generalsettings.cpp b/companion/src/firmwares/generalsettings.cpp
@@ -684,13 +684,13 @@ QString GeneralSettings::hatsModeToString() const
 QString GeneralSettings::hatsModeToString(int value)
 {
   switch(value) {
-    case MODE_TRIMS_ONLY:
+    case HATS_MODE_TRIMS_ONLY:
       return tr("Trims only");
-    case MODE_KEYS_ONLY:
+    case HATS_MODE_KEYS_ONLY:
       return tr("Keys only");
-    case MODE_SWITCHABLE:
+    case HATS_MODE_SWITCHABLE:
       return tr("Switchable");
-    case MODE_GLOBAL:
+    case HATS_MODE_GLOBAL:
       return tr("Global");
     default:
       return CPN_STR_UNKNOWN_ITEM;
@@ -704,7 +704,7 @@ AbstractStaticItemModel * GeneralSettings::hatsModeItemModel(bool radio_setup)
   mdl->setName(AIM_GS_HATSMODE);
 
   for (int i = 0; i < HATS_MODE_COUNT; i++) {
-    mdl->appendToItemList(hatsModeToString(i), i, i == MODE_GLOBAL && radio_setup ? false : true);
+    mdl->appendToItemList(hatsModeToString(i), i, i == HATS_MODE_GLOBAL && radio_setup ? false : true);
   }
 
   mdl->loadItemList();

diff --git a/companion/src/firmwares/generalsettings.h b/companion/src/firmwares/generalsettings.h
@@ -174,10 +174,10 @@ class GeneralSettings {
     };
 
     enum HatsMode {
-      MODE_TRIMS_ONLY,
-      MODE_KEYS_ONLY,
-      MODE_SWITCHABLE,
-      MODE_GLOBAL,
+      HATS_MODE_TRIMS_ONLY,
+      HATS_MODE_KEYS_ONLY,
+      HATS_MODE_SWITCHABLE,
+      HATS_MODE_GLOBAL,
       HATS_MODE_COUNT
     };
 

diff --git a/radio/src/dataconstants.h b/radio/src/dataconstants.h
@@ -658,10 +658,10 @@ enum BluetoothModes {
 
 #if defined(USE_TRIMS_AS_BUTTONS)
 enum HatsMode {
-  MODE_TRIMS_ONLY,
-  MODE_KEYS_ONLY,
-  MODE_SWITCHABLE,
-  MODE_GLOBAL
+  HATS_MODE_TRIMS_ONLY,
+  HATS_MODE_KEYS_ONLY,
+  HATS_MODE_SWITCHABLE,
+  HATS_MODE_GLOBAL
 };
 #endif
 

diff --git a/radio/src/gui/colorlcd/radio_setup.cpp b/radio/src/gui/colorlcd/radio_setup.cpp
@@ -814,7 +814,7 @@ void RadioSetupPage::build(FormWindow * window)
 #if defined(USE_TRIMS_AS_BUTTONS)
   line = window->newLine(&grid);
   new StaticText(line, rect_t{}, STR_HATS_MODE, 0, COLOR_THEME_PRIMARY1);
-  new Choice(line, rect_t{}, STR_HATS_OPT, MODE_TRIMS_ONLY, MODE_SWITCHABLE,
+  new Choice(line, rect_t{}, STR_HATS_OPT, HATS_MODE_TRIMS_ONLY, HATS_MODE_SWITCHABLE,
              GET_SET_DEFAULT(g_eeGeneral.hatsMode));
 #endif
 

diff --git a/radio/src/gui/colorlcd/trims_setup.cpp b/radio/src/gui/colorlcd/trims_setup.cpp
@@ -59,7 +59,7 @@ TrimsSetup::TrimsSetup() : Page(ICON_MODEL_SETUP)
   // Hats mode for NV14/EL18
   line = body.newLine(&grid);
   new StaticText(line, rect_t{}, STR_HATS_MODE, 0, COLOR_THEME_PRIMARY1);
-  new Choice(line, rect_t{}, STR_HATS_OPT, MODE_TRIMS_ONLY, MODE_GLOBAL, 
+  new Choice(line, rect_t{}, STR_HATS_OPT, HATS_MODE_TRIMS_ONLY, HATS_MODE_GLOBAL, 
             GET_SET_DEFAULT(g_model.hatsMode));
 #endif
 

diff --git a/radio/src/keys.cpp b/radio/src/keys.cpp
@@ -348,8 +348,8 @@ static void transpose_trims(uint32_t *keys)
   static uint8_t state = 0;
 
   bool allowModeSwitch =
-    ((g_model.hatsMode == MODE_GLOBAL && g_eeGeneral.hatsMode == MODE_SWITCHABLE) ||
-     (g_model.hatsMode == MODE_SWITCHABLE)) &&
+    ((g_model.hatsMode == HATS_MODE_GLOBAL && g_eeGeneral.hatsMode == HATS_MODE_SWITCHABLE) ||
+     (g_model.hatsMode == HATS_MODE_SWITCHABLE)) &&
     !getTransposeTrimsForLUA();
 
   if(allowModeSwitch) {

diff --git a/radio/src/main.cpp b/radio/src/main.cpp
@@ -268,15 +268,15 @@ void checkSpeakerVolume()
 
 #if defined(USE_TRIMS_AS_BUTTONS)
 void checkTrimsAsButtons() {
-  uint8_t hatsMode = g_model.hatsMode == MODE_GLOBAL ? g_eeGeneral.hatsMode : g_model.hatsMode;
+  uint8_t hatsMode = g_model.hatsMode == HATS_MODE_GLOBAL ? g_eeGeneral.hatsMode : g_model.hatsMode;
 
-  static bool oldHatsModeButtons = hatsMode == MODE_KEYS_ONLY;
+  static bool oldHatsModeButtons = hatsMode == HATS_MODE_KEYS_ONLY;
 
-  if(hatsMode == MODE_TRIMS_ONLY) {
+  if(hatsMode == HATS_MODE_TRIMS_ONLY) {
     setTrimsAsButtons(false);
   }
 
-  if(hatsMode == MODE_KEYS_ONLY) {
+  if(hatsMode == HATS_MODE_KEYS_ONLY) {
     setTrimsAsButtons(true);
   }
 

diff --git a/radio/src/storage/yaml/yaml_datastructs_nv14.cpp b/radio/src/storage/yaml/yaml_datastructs_nv14.cpp
@@ -5,10 +5,10 @@
 //
 
 const struct YamlIdStr enum_HatsMode[] = {
-    {  MODE_TRIMS_ONLY, "TRIMS_ONLY"  },
-    {  MODE_KEYS_ONLY, "KEYS_ONLY"  },
-    {  MODE_SWITCHABLE, "SWITCHABLE " },
-    {  MODE_GLOBAL, "GLOBAL"  },
+    {  HATS_MODE_TRIMS_ONLY, "TRIMS_ONLY"  },
+    {  HATS_MODE_KEYS_ONLY, "KEYS_ONLY"  },
+    {  HATS_MODE_SWITCHABLE, "SWITCHABLE" },
+    {  HATS_MODE_GLOBAL, "GLOBAL"  },
     {  0, NULL  }
 };