"Inputs" should be selectable as a source option for an Input.

EdgeTX · Jul 5, 2024 · 8bd8281 · 8bd8281
1 parent fb66630
commit 8bd8281
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/radio/src/gui/128x64/widgets.cpp b/radio/src/gui/128x64/widgets.cpp
@@ -178,7 +178,7 @@ uint16_t editSrcVarFieldValue(coord_t x, coord_t y, const char* title, uint16_t
   } else {
     lcdDrawNumber(x, y, v.value, attr);
     if (attr & (~RIGHT)) {
-      value = checkIncDec(event, value, min, max, EE_MODEL|INCDEC_SOURCE_VALUE|NO_INCDEC_MARKS);
+      value = checkIncDec(event, value, min, max, EE_MODEL|INCDEC_SOURCE_VALUE|NO_INCDEC_MARKS, isValueAvailable);
     }
   }
   return value;

diff --git a/radio/src/gui/212x64/widgets.cpp b/radio/src/gui/212x64/widgets.cpp
@@ -136,7 +136,7 @@ uint16_t editSrcVarFieldValue(coord_t x, coord_t y, const char* title, uint16_t
   } else {
     lcdDrawNumber(x, y, v.value, attr);
     if (attr & (~RIGHT)) {
-      value = checkIncDec(event, value, min, max, EE_MODEL|INCDEC_SOURCE_VALUE|NO_INCDEC_MARKS);
+      value = checkIncDec(event, value, min, max, EE_MODEL|INCDEC_SOURCE_VALUE|NO_INCDEC_MARKS, isValueAvailable);
     }
   }
   return value;

diff --git a/radio/src/gui/navigation/navigation_9x.cpp b/radio/src/gui/navigation/navigation_9x.cpp
@@ -157,7 +157,8 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
       }
 
       if (i_min <= MIXSRC_FIRST_INPUT && i_max >= MIXSRC_FIRST_INPUT) {
-        if (getFirstAvailable(MIXSRC_FIRST_INPUT, MIXSRC_LAST_INPUT, isInputAvailable) != MIXSRC_NONE) {
+        if (getFirstAvailable(MIXSRC_FIRST_INPUT, MIXSRC_LAST_INPUT, isInputAvailable) != MIXSRC_NONE &&
+            (!isValueAvailable || isValueAvailable(MIXSRC_FIRST_INPUT))) {
           POPUP_MENU_ADD_ITEM(STR_MENU_INPUTS);
         }
       }

diff --git a/radio/src/gui/navigation/navigation_x7.cpp b/radio/src/gui/navigation/navigation_x7.cpp
@@ -167,7 +167,8 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
       }
 
       if (i_min <= MIXSRC_FIRST_INPUT && i_max >= MIXSRC_FIRST_INPUT) {
-        if (getFirstAvailable(MIXSRC_FIRST_INPUT, MIXSRC_LAST_INPUT, isInputAvailable) != MIXSRC_NONE) {
+        if (getFirstAvailable(MIXSRC_FIRST_INPUT, MIXSRC_LAST_INPUT, isInputAvailable) != MIXSRC_NONE &&
+            (!isValueAvailable || isValueAvailable(MIXSRC_FIRST_INPUT))) {
           POPUP_MENU_ADD_ITEM(STR_MENU_INPUTS);
         }
       }

diff --git a/radio/src/gui/navigation/navigation_x9d.cpp b/radio/src/gui/navigation/navigation_x9d.cpp
@@ -167,7 +167,8 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
       }
 
       if (i_min <= MIXSRC_FIRST_INPUT && i_max >= MIXSRC_FIRST_INPUT) {
-        if (getFirstAvailable(MIXSRC_FIRST_INPUT, MIXSRC_LAST_INPUT, isInputAvailable) != MIXSRC_NONE) {
+        if (getFirstAvailable(MIXSRC_FIRST_INPUT, MIXSRC_LAST_INPUT, isInputAvailable) != MIXSRC_NONE &&
+            (!isValueAvailable || isValueAvailable(MIXSRC_FIRST_INPUT))) {
           POPUP_MENU_ADD_ITEM(STR_MENU_INPUTS);
         }
       }

diff --git a/radio/src/gui/navigation/navigation_xlite.cpp b/radio/src/gui/navigation/navigation_xlite.cpp
@@ -176,7 +176,8 @@ int checkIncDec(event_t event, int val, int i_min, int i_max,
       }
 
       if (i_min <= MIXSRC_FIRST_INPUT && i_max >= MIXSRC_FIRST_INPUT) {
-        if (getFirstAvailable(MIXSRC_FIRST_INPUT, MIXSRC_LAST_INPUT, isInputAvailable) != MIXSRC_NONE) {
+        if (getFirstAvailable(MIXSRC_FIRST_INPUT, MIXSRC_LAST_INPUT, isInputAvailable) != MIXSRC_NONE &&
+            (!isValueAvailable || isValueAvailable(MIXSRC_FIRST_INPUT))) {
           POPUP_MENU_ADD_ITEM(STR_MENU_INPUTS);
         }
       }