change to use language strings for MIN/MAX instead of instance

updated CN and TX language file for MIN�use -RESX for MIN instead of magi number�code cleanup
EdgeTX · Aug 5, 2023 · 32606b3 · 32606b3
1 parent af57d0f
commit 32606b3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/radio/src/gui/gui_common.cpp b/radio/src/gui/gui_common.cpp
@@ -313,9 +313,7 @@ bool isSourceAvailableInInputs(int source)
   if (source >= MIXSRC_FIRST_SPACEMOUSE && source <= MIXSRC_LAST_SPACEMOUSE)
     return true;
 #endif
-  if (source == MIXSRC_MIN)
-    return true;
-  if (source == MIXSRC_MAX)
+  if (source == MIXSRC_MIN || source == MIXSRC_MAX)
     return true;
 
   if (source >= MIXSRC_FIRST_TRIM && source <= MIXSRC_LAST_TRIM) {

diff --git a/radio/src/mixer.cpp b/radio/src/mixer.cpp
@@ -361,7 +361,7 @@ getvalue_t getValue(mixsrc_t i, bool* valid)
 #endif
 
   else if (i == MIXSRC_MIN) {
-    return -1024;
+    return -RESX;
   }
   else if (i == MIXSRC_MAX) {
     return RESX;

diff --git a/radio/src/strhelpers.cpp b/radio/src/strhelpers.cpp
@@ -700,10 +700,10 @@ char *getSourceString(char (&dest)[L], mixsrc_t idx)
   }
 #endif
   else if (idx == MIXSRC_MIN) {
-    copyToTerminated(dest, "MIN");
+    strncpy(dest, STR_MENU_MIN, dest_len - 1);
   }
   else if (idx == MIXSRC_MAX) {
-    copyToTerminated(dest, "MAX");
+    strncpy(dest, STR_MENU_MAX, dest_len - 1);
   } else if (idx <= MIXSRC_LAST_HELI) {
     idx -= MIXSRC_FIRST_HELI;
     getStringAtIndex(dest, STR_CYC_VSRCRAW, idx);

diff --git a/radio/src/translations/tw.h b/radio/src/translations/tw.h
@@ -1096,7 +1096,7 @@
 #define TR_MENU_LUA                     STR_CHAR_LUA "LUA腳本"
 #define TR_MENU_STICKS                  STR_CHAR_STICK "搖桿"
 #define TR_MENU_POTS                    STR_CHAR_POT "旋鈕"
-#define TR_MENU_MIN                     STR_CHAR_FUNCTION ""固定值MIN"
+#define TR_MENU_MIN                     STR_CHAR_FUNCTION "固定值MIN"
 #define TR_MENU_MAX                     STR_CHAR_FUNCTION "固定值MAX"
 #define TR_MENU_HELI                    STR_CHAR_CYC "斜盤混控CYC"
 #define TR_MENU_TRIMS                   STR_CHAR_TRIM "微調"