Disable source 'Invert' option for 'Play Value' SF/GF.

EdgeTX · Mar 4, 2025 · f04c93b · f04c93b
1 parent a220ea3
commit f04c93b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/radio/src/gui/128x64/model_special_functions.cpp b/radio/src/gui/128x64/model_special_functions.cpp
@@ -375,7 +375,7 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
             val_max = MIXSRC_LAST_TELEM;
             drawSource(MODEL_SPECIAL_FUNC_3RD_COLUMN - (val_displayed == 0 ? 0 : 2 * FW), y, val_displayed, attr);
             if (active) {
-              INCDEC_SET_FLAG(eeFlags | INCDEC_SOURCE | INCDEC_SOURCE_INVERT);
+              INCDEC_SET_FLAG(eeFlags | INCDEC_SOURCE);
               INCDEC_ENABLE_CHECK(functionsContext == &globalFunctionsContext ? isSourceAvailableInGlobalFunctions : isSourceAvailable);
             }
           }

diff --git a/radio/src/gui/212x64/model_special_functions.cpp b/radio/src/gui/212x64/model_special_functions.cpp
@@ -347,7 +347,7 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
             val_max = MIXSRC_LAST_TELEM;
             drawSource(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr);
             if (active) {
-              INCDEC_SET_FLAG(eeFlags | INCDEC_SOURCE | INCDEC_SOURCE_INVERT);
+              INCDEC_SET_FLAG(eeFlags | INCDEC_SOURCE);
               INCDEC_ENABLE_CHECK(functionsContext == &globalFunctionsContext ? isSourceAvailableInGlobalFunctions : isSourceAvailable);
             }
           }

diff --git a/radio/src/gui/colorlcd/model/special_functions.cpp b/radio/src/gui/colorlcd/model/special_functions.cpp
@@ -346,10 +346,10 @@ void FunctionEditPage::buildHeader(Window *window, const char *title,
 }
 
 void FunctionEditPage::addSourceChoice(FormLine *line, const char *title,
-                                       CustomFunctionData *cfn, int16_t vmax)
+                                       CustomFunctionData *cfn, int16_t vmax, bool allowInvert)
 {
   new StaticText(line, rect_t{}, title);
-  new SourceChoice(line, rect_t{}, 0, vmax, GET_SET_DEFAULT(CFN_PARAM(cfn)), true);
+  new SourceChoice(line, rect_t{}, 0, vmax, GET_SET_DEFAULT(CFN_PARAM(cfn)), allowInvert);
 }
 
 NumberEdit *FunctionEditPage::addNumberEdit(FormLine *line, const char *title,
@@ -486,7 +486,7 @@ void FunctionEditPage::updateSpecialFunctionOneWindow()
       break;
 
     case FUNC_PLAY_VALUE:
-      addSourceChoice(line, STR_VALUE, cfn, MIXSRC_LAST_TELEM);
+      addSourceChoice(line, STR_VALUE, cfn, MIXSRC_LAST_TELEM, false);
       break;
 
     case FUNC_HAPTIC:

diff --git a/radio/src/gui/colorlcd/model/special_functions.h b/radio/src/gui/colorlcd/model/special_functions.h
@@ -114,7 +114,7 @@ class FunctionEditPage : public Page
   void buildHeader(Window *window, const char *title, const char *prefix);
 
   void addSourceChoice(FormLine *line, const char *title,
-                       CustomFunctionData *cfn, int16_t vmax);
+                       CustomFunctionData *cfn, int16_t vmax, bool allowInvert = true);
 
   NumberEdit *addNumberEdit(FormLine *line, const char *title,
                             CustomFunctionData *cfn, int16_t vmin, int16_t vmax);