Issue with function "Trainer Chans" (#7104)

TRAINER(Channels) had a 50% weight
This commit is contained in:
Bertrand Songis
2019-11-20 21:10:30 +01:00
committed by GitHub
parent 4ffd859b05
commit c0a94505b6
18 changed files with 52 additions and 33 deletions
+3 -3
View File
@@ -169,14 +169,14 @@ void evalFunctions(const CustomFunctionData * functions, CustomFunctionsContext
if (param == 0)
newActiveFunctions |= 0x0F;
else if (param <= NUM_STICKS)
newActiveFunctions |= (1 << (param-1));
newActiveFunctions |= (1 << (param - 1));
else if (param == NUM_STICKS + 1)
newActiveFunctions |= (1 << FUNCTION_TRAINER_CHANNELS);
newActiveFunctions |= (1u << FUNCTION_TRAINER_CHANNELS);
break;
}
case FUNC_INSTANT_TRIM:
newActiveFunctions |= (1 << FUNCTION_INSTANT_TRIM);
newActiveFunctions |= (1u << FUNCTION_INSTANT_TRIM);
if (!isFunctionActive(FUNCTION_INSTANT_TRIM)) {
if (IS_INSTANT_TRIM_ALLOWED()) {
instantTrim();
@@ -224,15 +224,17 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
if (func == FUNC_TRAINER) {
maxParam = NUM_STICKS + 1;
uint8_t param = CFN_CH_INDEX(cfn);
if (param == NUM_STICKS + 1)
lcdDrawText(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, "Chans", attr);
if (param == 0)
lcdDrawText(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, STR_STICKS, attr);
else if (param == NUM_STICKS + 1)
lcdDrawText(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, STR_CHANS, attr);
else
drawSource(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, CFN_CH_INDEX(cfn) == 0 ? 0 : MIXSRC_Rud + CFN_CH_INDEX(cfn) - 1, attr);
drawSource(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, MIXSRC_Rud + param - 1, attr);
}
#if defined(GVARS)
else if (func == FUNC_ADJUST_GVAR) {
maxParam = MAX_GVARS-1;
drawStringWithIndex(lcdNextPos, y, STR_GV, CFN_GVAR_INDEX(cfn)+1, attr);
drawStringWithIndex(lcdNextPos + 2, y, STR_GV, CFN_GVAR_INDEX(cfn)+1, attr);
if (active) CFN_GVAR_INDEX(cfn) = checkIncDec(event, CFN_GVAR_INDEX(cfn), 0, maxParam, eeFlags);
break;
}
@@ -216,15 +216,17 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
if (func == FUNC_TRAINER) {
maxParam = NUM_STICKS + 1;
uint8_t param = CFN_CH_INDEX(cfn);
if (param == NUM_STICKS + 1)
lcdDrawText(lcdNextPos, y, "Chans", attr);
if (param == 0)
lcdDrawText(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, STR_STICKS, attr);
else if (param == NUM_STICKS + 1)
lcdDrawText(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, STR_CHANS, attr);
else
drawSource(lcdNextPos, y, CFN_CH_INDEX(cfn)==0 ? 0 : MIXSRC_Rud+CFN_CH_INDEX(cfn)-1, attr);
drawSource(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, MIXSRC_Rud + param - 1, attr);
}
#if defined(GVARS)
else if (func == FUNC_ADJUST_GVAR) {
maxParam = MAX_GVARS-1;
drawStringWithIndex(lcdNextPos, y, STR_GV, CFN_GVAR_INDEX(cfn)+1, attr);
drawStringWithIndex(lcdNextPos + 2, y, STR_GV, CFN_GVAR_INDEX(cfn)+1, attr);
if (active) CFN_GVAR_INDEX(cfn) = checkIncDec(event, CFN_GVAR_INDEX(cfn), 0, maxParam, eeFlags);
break;
}
@@ -217,10 +217,12 @@ bool menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
if (func == FUNC_TRAINER) {
maxParam = NUM_STICKS + 1;
uint8_t param = CFN_CH_INDEX(cfn);
if (param == NUM_STICKS + 1)
lcdDrawText(MODEL_SPECIAL_FUNC_2ND_COLUMN_EXT, y, "Chans", attr);
if (param == 0)
lcdDrawText(MODEL_SPECIAL_FUNC_2ND_COLUMN_EXT, y, STR_STICKS, attr);
else if (param == NUM_STICKS + 1)
lcdDrawText(MODEL_SPECIAL_FUNC_2ND_COLUMN_EXT, y, STR_CHANS, attr);
else
drawSource(MODEL_SPECIAL_FUNC_2ND_COLUMN_EXT, y, CFN_CH_INDEX(cfn)==0 ? 0 : MIXSRC_Rud+CFN_CH_INDEX(cfn)-1, attr);
drawSource(MODEL_SPECIAL_FUNC_2ND_COLUMN_EXT, y, MIXSRC_Rud + param - 1, attr);
}
#if defined(GVARS)
else if (func == FUNC_ADJUST_GVAR) {
+10 -10
View File
@@ -232,7 +232,7 @@ int16_t applyLimits(uint8_t channel, int32_t value)
#endif
if (isFunctionActive(FUNCTION_TRAINER_CHANNELS) && IS_TRAINER_INPUT_VALID()) {
return ppmInput[channel];
return ppmInput[channel] * 2;
}
LimitData * lim = limitAddress(channel);
@@ -369,22 +369,22 @@ getvalue_t getValue(mixsrc_t i)
#endif
else if (i <= MIXSRC_LAST_LOGICAL_SWITCH) {
return getSwitch(SWSRC_FIRST_LOGICAL_SWITCH+i-MIXSRC_FIRST_LOGICAL_SWITCH) ? 1024 : -1024;
return getSwitch(SWSRC_FIRST_LOGICAL_SWITCH + i - MIXSRC_FIRST_LOGICAL_SWITCH) ? 1024 : -1024;
}
else if (i <= MIXSRC_LAST_TRAINER) {
int16_t x = ppmInput[i-MIXSRC_FIRST_TRAINER];
if (i<MIXSRC_FIRST_TRAINER+NUM_CAL_PPM) {
x -= g_eeGeneral.trainer.calib[i-MIXSRC_FIRST_TRAINER];
int16_t x = ppmInput[i - MIXSRC_FIRST_TRAINER];
if (i < MIXSRC_FIRST_TRAINER + NUM_CAL_PPM) {
x -= g_eeGeneral.trainer.calib[i - MIXSRC_FIRST_TRAINER];
}
return x*2;
return x * 2;
}
else if (i <= MIXSRC_LAST_CH) {
return ex_chans[i-MIXSRC_CH1];
return ex_chans[i - MIXSRC_CH1];
}
else if (i <= MIXSRC_LAST_GVAR) {
#if defined(GVARS)
return GVAR_VALUE(i-MIXSRC_GVAR1, getGVarFlightMode(mixerCurrentFlightMode, i - MIXSRC_GVAR1));
return GVAR_VALUE(i - MIXSRC_GVAR1, getGVarFlightMode(mixerCurrentFlightMode, i - MIXSRC_GVAR1));
#else
return 0;
#endif
@@ -402,11 +402,11 @@ getvalue_t getValue(mixsrc_t i)
#endif
}
else if (i <= MIXSRC_LAST_TIMER) {
return timersStates[i-MIXSRC_FIRST_TIMER].val;
return timersStates[i - MIXSRC_FIRST_TIMER].val;
}
else if (i <= MIXSRC_LAST_TELEM) {
if(IS_FAI_FORBIDDEN(i)) {
if (IS_FAI_FORBIDDEN(i)) {
return 0;
}
i -= MIXSRC_FIRST_TELEM;
+1
View File
@@ -439,6 +439,7 @@ const char STR_MIXNAME[] = TR_MIXNAME;
const char STR_INPUTNAME[] = TR_INPUTNAME;
const char STR_EXPONAME[] = TR_EXPONAME;
const char STR_TRAINER[] = TR_TRAINER;
const char STR_CHANS[] = TR_CHANS;
const char STR_MODULE_BIND[] = TR_MODULE_BIND;
const char STR_POWERMETER_ATTN_NEEDED[] = TR_POWERMETER_ATTN_NEEDED;
const char STR_PXX2_SELECT_RX[] = TR_PXX2_SELECT_RX;
+1
View File
@@ -722,6 +722,7 @@ extern const char STR_EXPONAME[];
#endif
extern const char STR_TRAINER[];
extern const char STR_CHANS[];
extern const char STR_MODULE_BIND[];
extern const char STR_POWERMETER_ATTN_NEEDED[];
extern const char STR_PXX2_SELECT_RX[];
+2 -1
View File
@@ -207,7 +207,7 @@
#endif
#ifdef GVARS
#define TR_ADJUST_GVAR "Nastav \0 "
#define TR_ADJUST_GVAR "Nastav\0 "
#else
#define TR_ADJUST_GVAR "[Nastav GP]"
#endif
@@ -913,6 +913,7 @@
#define TR_CALIBRATION "Kalibrace"
#define TR_SET BUTTON("Nast")
#define TR_TRAINER "Trenér"
#define TR_CHANS "Chans"
#define TR_ANTENNAPROBLEM CENTER "Problém s TX anténou!"
#define TR_MODELIDUSED TR("ID již použito","ID modelu je již použito")
#define TR_MODULE "Modul"
+2 -1
View File
@@ -208,7 +208,7 @@
#endif
#if defined(GVARS)
#define TR_ADJUST_GVAR "Ändere \0 "
#define TR_ADJUST_GVAR "Ändere\0 "
#else
#define TR_ADJUST_GVAR "[ÄndereGV]"
#endif
@@ -915,6 +915,7 @@
#define TR_CALIBRATION "Kalibrieren"
#define TR_SET BUTTON("Set")
#define TR_TRAINER "DSC Buchse PPM In/Out"
#define TR_CHANS "Chans"
#define TR_ANTENNAPROBLEM CENTER "TX-Antennenproblem!"
#if defined(COLORLCD)
#define TR_MODELIDUSED "ID used in:"
+2 -1
View File
@@ -208,7 +208,7 @@
#endif
#if defined(GVARS)
#define TR_ADJUST_GVAR "Adjust \0 "
#define TR_ADJUST_GVAR "Adjust\0 "
#else
#define TR_ADJUST_GVAR "[AdjustGV]"
#endif
@@ -914,6 +914,7 @@
#define TR_CALIBRATION "Calibration"
#define TR_SET BUTTON("Set")
#define TR_TRAINER "Trainer"
#define TR_CHANS "Chans"
#define TR_ANTENNAPROBLEM CENTER "TX antenna problem!"
#if defined(COLORLCD)
#define TR_MODELIDUSED "ID used in:"
+1
View File
@@ -938,6 +938,7 @@
#define TR_CALIBRATION "Calibration"
#define TR_SET "[Ajuste]"
#define TR_TRAINER "Aprendiz"
#define TR_CHANS "Chans"
#define TR_ANTENNAPROBLEM CENTER "¡Problema antena TX!"
#define TR_MODELIDUSED TR("ID en uso", "ID modelo en uso")
#define TR_MODULE "Modulo"
+2 -1
View File
@@ -208,7 +208,7 @@
#endif
#if defined(GVARS)
#define TR_ADJUST_GVAR "Adjust \0 "
#define TR_ADJUST_GVAR "Adjust\0 "
#else
#define TR_ADJUST_GVAR "[AdjustGV]"
#endif
@@ -932,6 +932,7 @@
#define TR_CALIBRATION "Calibration"
#define TR_SET "[Set]"
#define TR_TRAINER "Trainer"
#define TR_CHANS "Chans"
#define TR_ANTENNAPROBLEM CENTER "TX Antenna problem!"
#define TR_MODELIDUSED TR("ID used in:", "Receiver ID used in:")
#define TR_MODULE "Module"
+1
View File
@@ -934,6 +934,7 @@
#define TR_CALIBRATION "Calibration"
#define TR_SET BUTTON("Déf")
#define TR_TRAINER "Ecolage"
#define TR_CHANS "Chans"
#define TR_ANTENNAPROBLEM CENTER "Antenne radio défect.!"
#define TR_MODELIDUSED TR("ID affecté à :", "No de récepteur utilisé par :")
#define TR_MODULE "Module"
+2 -1
View File
@@ -209,7 +209,7 @@
#endif
#if defined(GVARS)
#define TR_ADJUST_GVAR "Regola \0 "
#define TR_ADJUST_GVAR "Regola\0 "
#else
#define TR_ADJUST_GVAR "[RegolaVG]\0 "
#endif
@@ -934,6 +934,7 @@
#define TR_CALIBRATION TR("Calibraz.", "Calibrazione")
#define TR_SET "[Set]"
#define TR_TRAINER TR("Trainer", "Maestro/Allievo")
#define TR_CHANS "Chans"
#define TR_ANTENNAPROBLEM CENTER "Problemi antenna TX!"
#define TR_MODELIDUSED TR("ID già usato", "ID Modello già usato")
#define TR_MODULE "Modulo"
+2 -1
View File
@@ -209,7 +209,7 @@
#endif
#if defined(GVARS)
#define TR_ADJUST_GVAR "Wijzig \0 "
#define TR_ADJUST_GVAR "Wijzig\0 "
#else
#define TR_ADJUST_GVAR "[WijzigGV]"
#endif
@@ -920,6 +920,7 @@
#define TR_CALIBRATION "Calibration"
#define TR_SET "[Set]"
#define TR_TRAINER "Trainer Poort"
#define TR_CHANS "Chans"
#define TR_ANTENNAPROBLEM CENTER "TX-Antenneprobleem!"
#define TR_MODELIDUSED TR("ID al gebruikt", "Model-ID al gebruikt")
#define TR_MODULE "Module-Type"
+2 -1
View File
@@ -209,7 +209,7 @@
#endif
#if defined(GVARS)
#define TR_ADJUST_GVAR "Ustaw \0 "
#define TR_ADJUST_GVAR "Ustaw\0 "
#else
#define TR_ADJUST_GVAR "[UstawZG] "
#endif
@@ -933,6 +933,7 @@
#define TR_CALIBRATION "Calibration"
#define TR_SET "[Set]"
#define TR_TRAINER "Port Trenera"
#define TR_CHANS "Chans"
#define TR_ANTENNAPROBLEM CENTER "Problem z anteną TX"
#define TR_MODELIDUSED TR("ID zajęte","ID modelu zajęte")
#define TR_MODULE "Moduł "
+3 -2
View File
@@ -207,9 +207,9 @@
#endif
#ifdef GVARS
#define TR_ADJUST_GVAR "Ajuste\0 "
#define TR_ADJUST_GVAR "Ajuste\0 "
#else
#define TR_ADJUST_GVAR "[AdjustGV]\0 "
#define TR_ADJUST_GVAR "[AdjustGV]\0 "
#endif
#if defined(LUA)
@@ -923,6 +923,7 @@
#define TR_CALIBRATION "Calibration"
#define TR_SET "[Set]"
#define TR_TRAINER "Trainer"
#define TR_CHANS "Chans"
#define TR_ANTENNAPROBLEM CENTER "TX Antenna problem!"
#define TR_MODELIDUSED TR("ID used in:", "Receiver ID used in:")
#define TR_MODULE "Module"
+1
View File
@@ -933,6 +933,7 @@
#define TR_CALIBRATION "Calibration"
#define TR_SET "[Spara]"
#define TR_TRAINER "Trainer"
#define TR_CHANS "Chans"
#define TR_ANTENNAPROBLEM CENTER "Fel på TX-antennen"
#define TR_MODELIDUSED TR("ID finns redan","ModellID används redan")
#define TR_MODULE "Modul"