Bug introduced in Text View (Taranis)

radio/src/gui/9X/helpers.cpp

@@ -255,10 +255,8 @@ bool isAssignableFunctionAvailable(int function)
 
 bool isModuleAvailable(int module)
 {
-#if defined(PCBSKY9X)
   if (module == MODULE_TYPE_NONE)
     return false;
-#endif
 
 #if !defined(PXX)
   if (module == MODULE_TYPE_XJT)

radio/src/gui/Taranis/view_text.cpp

@@ -120,15 +120,14 @@ void menuTextView(uint8_t event)
         break;
       else
         s_pgOfs--;
-        // no break;
+      readTextFile(lines_count);
+      break;
 
     case EVT_KEY_FIRST(KEY_DOWN):
-      // if (event == EVT_KEY_BREAK(KEY_DOWN)) {
-        if (s_pgOfs+LCD_LINES-1 >= lines_count)
-          break;
-        else
-          ++s_pgOfs;
-      // }
+      if (s_pgOfs+LCD_LINES-1 >= lines_count)
+        break;
+      else
+        ++s_pgOfs;
       readTextFile(lines_count);
       break;
 

radio/src/translations/en.h.txt

@@ -711,15 +711,9 @@
 #else
   #define TR_TRIMS2OFFSETS     "\006Trims => Subtrims"
 #endif
-#if defined(COLORLCD)
-  #define TR_MENUMODELSEL      "Model Selection"
-  #define TR_MENUSETUP         "Model Setup"
-  #define TR_MENUFLIGHTPHASES  "Flight Modes"
-#else
-  #define TR_MENUMODELSEL      TR("MODELSEL", "MODEL SELECTION")
-  #define TR_MENUSETUP         TR("SETUP", "MODEL SETUP")
-  #define TR_MENUFLIGHTPHASES  "FLIGHT MODES"
-#endif
+#define TR_MENUMODELSEL        TR("MODELSEL", "MODEL SELECTION")
+#define TR_MENUSETUP           TR("SETUP", "MODEL SETUP")
+#define TR_MENUFLIGHTPHASES    "FLIGHT MODES"
 #define TR_MENUFLIGHTPHASE     "FLIGHT MODE"
 #define TR_MENUHELISETUP       "HELI SETUP"