Bug introduced in Text View (Taranis)

This commit is contained in:
bsongis
2015-01-22 22:49:29 +01:00
parent 90e7264a40
commit db722da7c5
3 changed files with 9 additions and 18 deletions
-2
View File
@@ -255,10 +255,8 @@ bool isAssignableFunctionAvailable(int function)
bool isModuleAvailable(int module) bool isModuleAvailable(int module)
{ {
#if defined(PCBSKY9X)
if (module == MODULE_TYPE_NONE) if (module == MODULE_TYPE_NONE)
return false; return false;
#endif
#if !defined(PXX) #if !defined(PXX)
if (module == MODULE_TYPE_XJT) if (module == MODULE_TYPE_XJT)
+6 -7
View File
@@ -120,15 +120,14 @@ void menuTextView(uint8_t event)
break; break;
else else
s_pgOfs--; s_pgOfs--;
// no break; readTextFile(lines_count);
break;
case EVT_KEY_FIRST(KEY_DOWN): case EVT_KEY_FIRST(KEY_DOWN):
// if (event == EVT_KEY_BREAK(KEY_DOWN)) { if (s_pgOfs+LCD_LINES-1 >= lines_count)
if (s_pgOfs+LCD_LINES-1 >= lines_count) break;
break; else
else ++s_pgOfs;
++s_pgOfs;
// }
readTextFile(lines_count); readTextFile(lines_count);
break; break;
+3 -9
View File
@@ -711,15 +711,9 @@
#else #else
#define TR_TRIMS2OFFSETS "\006Trims => Subtrims" #define TR_TRIMS2OFFSETS "\006Trims => Subtrims"
#endif #endif
#if defined(COLORLCD) #define TR_MENUMODELSEL TR("MODELSEL", "MODEL SELECTION")
#define TR_MENUMODELSEL "Model Selection" #define TR_MENUSETUP TR("SETUP", "MODEL SETUP")
#define TR_MENUSETUP "Model Setup" #define TR_MENUFLIGHTPHASES "FLIGHT MODES"
#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_MENUFLIGHTPHASE "FLIGHT MODE" #define TR_MENUFLIGHTPHASE "FLIGHT MODE"
#define TR_MENUHELISETUP "HELI SETUP" #define TR_MENUHELISETUP "HELI SETUP"