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) diff --git a/src/myeeprom.h b/src/myeeprom.h index c40cfbbb2..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 @@ -1419,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; 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"