From d563f64fe3b63f11c808279ba0dd6dccbdbc9468 Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Sat, 30 Nov 2013 11:51:11 +0100 Subject: [PATCH 1/3] [Taranis] Text display menu entry was inoperative --- src/gui/menu_general.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/menu_general.cpp b/src/gui/menu_general.cpp index e29d17c41..e6b7956ca 100644 --- a/src/gui/menu_general.cpp +++ b/src/gui/menu_general.cpp @@ -706,6 +706,7 @@ void onSdManagerMenu(const char *result) strcat(lfn, reusableBuffer.sdmanager.lines[index]); luaExec(lfn); } +#endif else if (result == STR_VIEW_TEXT) { f_getcwd(lfn, _MAX_LFN); strcat(lfn, "/"); @@ -713,7 +714,6 @@ void onSdManagerMenu(const char *result) pushMenuTextView(lfn); } #endif -#endif } void menuGeneralSdManager(uint8_t _event) From 11521c128c52a8f007600326a1dba298fab32ddb Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Sat, 30 Nov 2013 11:51:38 +0100 Subject: [PATCH 2/3] [ARM] Reserve EEPROM for stored pot positions and startup checklist display --- src/myeeprom.h | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/myeeprom.h b/src/myeeprom.h index 60238e09d..34347e299 100644 --- a/src/myeeprom.h +++ b/src/myeeprom.h @@ -274,12 +274,12 @@ PACK(typedef struct t_ScriptData { TRAINER_MODULE }; #define MODELDATA_BITMAP char bitmap[LEN_BITMAP_NAME]; - #define MODELDATA_EXTRA uint8_t externalModule; uint8_t trainerMode; ModuleData moduleData[NUM_MODULES+1]; char curveNames[MAX_CURVES][6]; ScriptData scriptsData[MAX_SCRIPTS]; char inputNames[MAX_INPUTS][4]; + #define MODELDATA_EXTRA uint8_t externalModule; uint8_t trainerMode; ModuleData moduleData[NUM_MODULES+1]; char curveNames[MAX_CURVES][6]; ScriptData scriptsData[MAX_SCRIPTS]; char inputNames[MAX_INPUTS][4]; uint8_t nPotsToWarn; int8_t potPosition[NUM_POTS]; #define LIMITDATA_EXTRA char name[LEN_CHANNEL_NAME]; int8_t curve; #define swstate_t uint16_t #elif defined(PCBSKY9X) #define MODELDATA_BITMAP - #define MODELDATA_EXTRA ModuleData moduleData[NUM_MODULES]; + #define MODELDATA_EXTRA ModuleData moduleData[NUM_MODULES]; uint8_t nPotsToWarn; int8_t potPosition[NUM_POTS]; #define LIMITDATA_EXTRA #define swstate_t uint8_t #else @@ -988,6 +988,8 @@ PACK(typedef struct t_FrSkyData { FrSkyRSSIAlarm rssiAlarms[2]; uint16_t mAhPersistent:1; uint16_t storedMah:15; + int8_t fasOffset:5; + uint8_t spare:3; }) FrSkyData; #else #define MAX_FRSKY_SCREENS 2 @@ -1005,6 +1007,8 @@ PACK(typedef struct t_FrSkyData { int8_t varioCenterMin:5; uint8_t currentSource:3; int8_t varioCenterMax:5; + int8_t fasOffset:5; + uint8_t spare:3; }) FrSkyData; #endif @@ -1415,7 +1419,11 @@ PACK(typedef struct t_ModelData { int8_t ppmNCH:4; /* spare on ARM */ uint8_t trimInc:3; // Trim Increments uint8_t disableThrottleWarning:1; - uint8_t pulsePol:1; /* spare on ARM */ +#if defined (CPUARM) + uint8_t displayText:1; +#else + uint8_t pulsePol:1; /* unused on ARM */ +#endif uint8_t extendedLimits:1; uint8_t extendedTrims:1; uint8_t throttleReversed:1; @@ -1437,6 +1445,7 @@ PACK(typedef struct t_ModelData { uint8_t thrTraceSrc; swstate_t switchWarningStates; + uint8_t nSwToWarn; MODEL_GVARS_DATA From 05be5429a2ae5d2fde14f606145f61f9b88a7f11 Mon Sep 17 00:00:00 2001 From: "josemoreno259@gmail.com" Date: Sat, 30 Nov 2013 11:55:53 +0100 Subject: [PATCH 3/3] Spanish translations --- src/translations/es.h | 3 ++- src/translations/es.h.txt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/translations/es.h b/src/translations/es.h index 6efdcf038..1b325121b 100644 --- a/src/translations/es.h +++ b/src/translations/es.h @@ -659,7 +659,8 @@ #define TR_CHANNELRANGE INDENT "Gama de canales" #define TR_LOWALARM INDENT "Alarma baja" #define TR_CRITICALALARM INDENT "Alarma Critica" -#define TR_PERSISTENT_MAH INDENT "Store mAh" +#define TR_PERSISTENT_MAH INDENT "Valor mAh" +#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI" diff --git a/src/translations/es.h.txt b/src/translations/es.h.txt index 49be12fc1..11f626168 100644 --- a/src/translations/es.h.txt +++ b/src/translations/es.h.txt @@ -659,7 +659,8 @@ #define TR_CHANNELRANGE INDENT "Gama de canales" #define TR_LOWALARM INDENT "Alarma baja" #define TR_CRITICALALARM INDENT "Alarma Critica" -#define TR_PERSISTENT_MAH INDENT "Store mAh" +#define TR_PERSISTENT_MAH INDENT "Valor mAh" +#define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") #if defined(MAVLINK) #define TR_MAVLINK_RC_RSSI_SCALE_LABEL "Max RSSI"