Merge branch 'next' into kilrah/FAS_Offset_compensation
Conflicts: radio/src/translations/es.h radio/src/translations/es.h.txt radio/src/translations/fr.h radio/src/translations/fr.h.txt
This commit is contained in:
@@ -48,6 +48,12 @@ PACK(typedef struct {
|
||||
int8_t curveParam;
|
||||
}) ExpoData_v215;
|
||||
|
||||
#if defined(PCBTARANIS)
|
||||
#define LIMITDATA_V215_EXTRA char name[LEN_CHANNEL_NAME];
|
||||
#else
|
||||
#define LIMITDATA_V215_EXTRA
|
||||
#endif
|
||||
|
||||
PACK(typedef struct {
|
||||
int8_t min;
|
||||
int8_t max;
|
||||
@@ -55,9 +61,7 @@ PACK(typedef struct {
|
||||
int16_t offset:14;
|
||||
uint16_t symetrical:1;
|
||||
uint16_t revert:1;
|
||||
#if defined(PCBTARANIS)
|
||||
char name[LEN_CHANNEL_NAME];
|
||||
#endif
|
||||
LIMITDATA_V215_EXTRA
|
||||
}) LimitData_v215;
|
||||
|
||||
#if defined(PCBTARANIS)
|
||||
@@ -462,7 +466,7 @@ bool eeConvert()
|
||||
theFile.openRlc(0);
|
||||
theFile.readRlc((uint8_t*)&g_eeGeneral, sizeof(g_eeGeneral));
|
||||
#else
|
||||
#warning "TODO openRlc for sky9x"
|
||||
#pragma message("TODO openRlc for sky9x")
|
||||
#endif
|
||||
if (g_eeGeneral.version == 215) ConvertGeneralSettings_215_to_216(g_eeGeneral);
|
||||
s_eeDirtyMsk = EE_GENERAL;
|
||||
@@ -482,7 +486,7 @@ bool eeConvert()
|
||||
theFile.openRlc(FILE_MODEL(id));
|
||||
theFile.readRlc((uint8_t*)&g_model, sizeof(g_model));
|
||||
#else
|
||||
#warning "TODO openRlc for sky9x"
|
||||
#pragma message("TODO openRlc for sky9x")
|
||||
#endif
|
||||
int version = conversionVersionStart;
|
||||
if (version == 215) {
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -3934,7 +3934,7 @@ void menuModelLimits(uint8_t event)
|
||||
#if defined(PPM_CENTER_ADJUSTABLE)
|
||||
case ITEM_LIMITS_PPM_CENTER:
|
||||
lcd_outdezAtt(LIMITS_PPM_CENTER_POS, y, PPM_CENTER+ld->ppmCenter, attr);
|
||||
#warning "could be less restrictive!"
|
||||
#pragma message("could be less restrictive!")
|
||||
if (active && ld->max <= 0 && ld->min >= 0) {
|
||||
CHECK_INCDEC_MODELVAR(event, ld->ppmCenter, -125, +125);
|
||||
}
|
||||
|
||||
@@ -1038,7 +1038,7 @@ int16_t gvarMenuItem(uint8_t x, uint8_t y, int16_t value, int16_t min, int16_t m
|
||||
return value;
|
||||
}
|
||||
#else
|
||||
int8_t gvarMenuItem(uint8_t x, uint8_t y, int8_t value, int16_t min, int16_t max, LcdFlags attr, uint8_t event)
|
||||
int16_t gvarMenuItem(uint8_t x, uint8_t y, int16_t value, int16_t min, int16_t max, LcdFlags attr, uint8_t event)
|
||||
{
|
||||
lcd_outdezAtt(x, y, value, attr);
|
||||
if (attr&INVERS) value = checkIncDec(event, value, min, max, EE_MODEL);
|
||||
|
||||
@@ -291,7 +291,7 @@ int8_t switchMenuItem(uint8_t x, uint8_t y, int8_t value, LcdFlags attr, uint8_t
|
||||
#endif
|
||||
#define displayGVar(x, y, v, min, max) GVAR_MENU_ITEM(x, y, v, min, max, 0, 0, 0)
|
||||
#else
|
||||
int8_t gvarMenuItem(uint8_t x, uint8_t y, int8_t value, int16_t min, int16_t max, LcdFlags attr, uint8_t event);
|
||||
int16_t gvarMenuItem(uint8_t x, uint8_t y, int16_t value, int16_t min, int16_t max, LcdFlags attr, uint8_t event);
|
||||
#define displayGVar(x, y, v, min, max) lcd_outdez8(x, y, v)
|
||||
#endif
|
||||
|
||||
|
||||
+11
-4
@@ -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
|
||||
@@ -770,7 +770,7 @@ PACK(typedef struct t_CustomFnData { // Function Switches data
|
||||
#define CFN_CH_NUMBER(p) (CFN_FUNC(p))
|
||||
#define CFN_PLAY_REPEAT(p) ((p)->active)
|
||||
#define CFN_PLAY_REPEAT_MUL 1
|
||||
#define CFN_PLAY_REPEAT_NOSTART 0b111111
|
||||
#define CFN_PLAY_REPEAT_NOSTART 0x3F
|
||||
#define CFN_GVAR_MODE(p) ((p)->mode)
|
||||
#define CFN_PARAM(p) ((p)->param.composite.val)
|
||||
#define CFN_RESET(p) (p->active = 0, memset(&(p)->param, 0, sizeof((p)->param)))
|
||||
@@ -1411,6 +1411,12 @@ PACK(typedef struct t_ModelHeader {
|
||||
MODELDATA_BITMAP
|
||||
}) ModelHeader;
|
||||
|
||||
#if defined (CPUARM)
|
||||
#define ARM_OR_AVR(x, y) x
|
||||
#else
|
||||
#define ARM_OR_AVR(x, y) y
|
||||
#endif
|
||||
|
||||
PACK(typedef struct t_ModelData {
|
||||
ModelHeader header;
|
||||
TimerData timers[MAX_TIMERS];
|
||||
@@ -1419,7 +1425,7 @@ 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 */
|
||||
uint8_t ARM_OR_AVR(displayText, pulsePol):1;
|
||||
uint8_t extendedLimits:1;
|
||||
uint8_t extendedTrims:1;
|
||||
uint8_t throttleReversed:1;
|
||||
@@ -1441,6 +1447,7 @@ PACK(typedef struct t_ModelData {
|
||||
uint8_t thrTraceSrc;
|
||||
|
||||
swstate_t switchWarningStates;
|
||||
uint8_t nSwToWarn;
|
||||
|
||||
MODEL_GVARS_DATA
|
||||
|
||||
|
||||
@@ -568,7 +568,7 @@ void telemetryWakeup()
|
||||
if (alarmsCheckStep == 0) {
|
||||
if (frskyData.rssi[1].value > 0x33) {
|
||||
AUDIO_SWR_RED();
|
||||
s_global_warning = PSTR(CENTER "Antenna problem!");
|
||||
s_global_warning = STR_ANTENNAPROBLEM;
|
||||
alarmsCheckTime = get_tmr10ms() + 300; /* next check in 3seconds */
|
||||
}
|
||||
}
|
||||
|
||||
@@ -204,7 +204,7 @@ void applyTemplate(uint8_t idx)
|
||||
case TMPL_ELEVON_DELTA:
|
||||
defaultInputs();
|
||||
#if defined(PCBTARANIS)
|
||||
#warning "Templates below are not implemented (only V-TAIL has been done). Feel free to help!"
|
||||
#pragma message("Templates below are not implemented (only V-TAIL has been done). Feel free to help!")
|
||||
#endif
|
||||
setDest(ICC(STK_ELE), MIXSRC_Ele, true);
|
||||
setDest(ICC(STK_ELE), MIXSRC_Ail);
|
||||
|
||||
@@ -659,7 +659,7 @@
|
||||
#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)
|
||||
|
||||
@@ -659,7 +659,7 @@
|
||||
#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)
|
||||
|
||||
@@ -659,7 +659,7 @@
|
||||
#define TR_CHANNELRANGE INDENT "Plage de canaux"
|
||||
#define TR_LOWALARM INDENT "Alarme basse"
|
||||
#define TR_CRITICALALARM INDENT "Alarme critique"
|
||||
#define TR_PERSISTENT_MAH INDENT "Store mAh"
|
||||
#define TR_PERSISTENT_MAH TR(INDENT "Enr. mAh",INDENT "Enregistrer mAh")
|
||||
#define TR_FAS_OFFSET TR(INDENT "Corr FAS", INDENT "Correction FAS")
|
||||
|
||||
#if defined(MAVLINK)
|
||||
|
||||
@@ -659,7 +659,7 @@
|
||||
#define TR_CHANNELRANGE INDENT "Plage de canaux"
|
||||
#define TR_LOWALARM INDENT "Alarme basse"
|
||||
#define TR_CRITICALALARM INDENT "Alarme critique"
|
||||
#define TR_PERSISTENT_MAH INDENT "Store mAh"
|
||||
#define TR_PERSISTENT_MAH TR(INDENT "Enr. mAh",INDENT "Enregistrer mAh")
|
||||
#define TR_FAS_OFFSET TR(INDENT "Corr FAS", INDENT "Correction FAS")
|
||||
|
||||
#if defined(MAVLINK)
|
||||
|
||||
Reference in New Issue
Block a user