mirror of
https://github.com/opentx/opentx.git
synced 2025-07-23 00:05:17 +03:00
SAFETY renamed to OVERRIDE
This commit is contained in:
parent
deed7fc20f
commit
eea1c3a84c
24 changed files with 38 additions and 38 deletions
|
@ -573,8 +573,8 @@ t_Open9xFuncSwData_v201::operator FuncSwData ()
|
|||
}
|
||||
|
||||
enum Functions {
|
||||
FUNC_SAFETY_CH1,
|
||||
FUNC_SAFETY_CH16=FUNC_SAFETY_CH1+15,
|
||||
FUNC_OVERRIDE_CH1,
|
||||
FUNC_OVERRIDE_CH16=FUNC_OVERRIDE_CH1+15,
|
||||
FUNC_TRAINER,
|
||||
FUNC_TRAINER_RUD,
|
||||
FUNC_TRAINER_ELE,
|
||||
|
|
|
@ -48,7 +48,7 @@
|
|||
#define GPS
|
||||
#define FAI_CHOICE
|
||||
#define FRSKY_STICKS
|
||||
#define SAFETY_CHANNEL_FUNCTION
|
||||
#define OVERRIDE_CHANNEL_FUNCTION
|
||||
|
||||
#define EEPROM_VARIANT 3
|
||||
|
||||
|
|
|
@ -48,7 +48,7 @@
|
|||
#define FRSKY_STICKS
|
||||
#define DSM2
|
||||
#define DSM2_PPM
|
||||
#define SAFETY_CHANNEL_FUNCTION
|
||||
#define OVERRIDE_CHANNEL_FUNCTION
|
||||
|
||||
#define EEPROM_VARIANT SIMU_M128_VARIANTS
|
||||
#define GAUGES
|
||||
|
|
|
@ -50,7 +50,7 @@
|
|||
#define GPS
|
||||
#define FAI_CHOICE
|
||||
#define FRSKY_STICKS
|
||||
#define SAFETY_CHANNEL_FUNCTION
|
||||
#define OVERRIDE_CHANNEL_FUNCTION
|
||||
#define FAS_OFFSET
|
||||
|
||||
#define EEPROM_VARIANT SIMU_STOCK_VARIANTS
|
||||
|
|
|
@ -54,7 +54,7 @@
|
|||
#define GPS
|
||||
#define FAI_CHOICE
|
||||
#define FRSKY_STICKS
|
||||
#define SAFETY_CHANNEL_FUNCTION
|
||||
#define OVERRIDE_CHANNEL_FUNCTION
|
||||
|
||||
#define NUM_POTS 3
|
||||
#define EEPROM_VARIANT 3
|
||||
|
|
|
@ -54,7 +54,7 @@
|
|||
#define EEPROM_VARIANT 3
|
||||
#define HAPTIC
|
||||
#define REVPLUS
|
||||
#define SAFETY_CHANNEL_FUNCTION
|
||||
#define OVERRIDE_CHANNEL_FUNCTION
|
||||
|
||||
#define NUM_POTS 5
|
||||
|
||||
|
|
|
@ -169,9 +169,9 @@ PPM_LIMITS_SYMETRICAL = NO
|
|||
# Values = PERCENT_PREC1, PERCENT_PREC0, US
|
||||
PPM_UNIT = PERCENT_PREC1
|
||||
|
||||
# SafetyCHxx functions enable
|
||||
# OverrideCHxx functions enable
|
||||
# Values = YES, NO
|
||||
SAFETY_CHANNEL_FUNCTION = YES
|
||||
OVERRIDE_CHANNEL_FUNCTION = YES
|
||||
|
||||
# FrSky Hub
|
||||
# Values = YES, NO
|
||||
|
@ -1024,8 +1024,8 @@ ifeq ($(PPM_LIMITS_SYMETRICAL), YES)
|
|||
CPPDEFS += -DPPM_LIMITS_SYMETRICAL
|
||||
endif
|
||||
|
||||
ifeq ($(SAFETY_CHANNEL_FUNCTION), YES)
|
||||
CPPDEFS += -DSAFETY_CHANNEL_FUNCTION
|
||||
ifeq ($(OVERRIDE_CHANNEL_FUNCTION), YES)
|
||||
CPPDEFS += -DOVERRIDE_CHANNEL_FUNCTION
|
||||
endif
|
||||
|
||||
ifeq ($(PPM_UNIT), US)
|
||||
|
|
|
@ -730,7 +730,7 @@ void ConvertModel_215_to_216(ModelData &model)
|
|||
fn.func = oldModel.funcSw[i].func;
|
||||
if (fn.func <= 15) {
|
||||
fn.all.param = fn.func;
|
||||
fn.func = FUNC_SAFETY_CHANNEL;
|
||||
fn.func = FUNC_OVERRIDE_CHANNEL;
|
||||
}
|
||||
else if (fn.func <= 20) {
|
||||
fn.all.param = fn.func - 16;
|
||||
|
|
|
@ -5068,8 +5068,8 @@ void menuModelCustomFunctions(uint8_t event)
|
|||
case 2:
|
||||
{
|
||||
int8_t maxParam = NUM_CHNOUT-1;
|
||||
#if defined(SAFETY_CHANNEL_FUNCTION)
|
||||
if (func == FUNC_SAFETY_CHANNEL) {
|
||||
#if defined(OVERRIDE_CHANNEL_FUNCTION)
|
||||
if (func == FUNC_OVERRIDE_CHANNEL) {
|
||||
putsChn(lcdNextPos, y, CFN_CH_INDEX(sd)+1, attr);
|
||||
}
|
||||
else
|
||||
|
@ -5120,8 +5120,8 @@ void menuModelCustomFunctions(uint8_t event)
|
|||
val_max = FUNC_RESET_PARAM_LAST;
|
||||
lcd_putsiAtt(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, STR_VFSWRESET, CFN_PARAM(sd), attr);
|
||||
}
|
||||
#if defined(SAFETY_CHANNEL_FUNCTION)
|
||||
else if (func == FUNC_SAFETY_CHANNEL) {
|
||||
#if defined(OVERRIDE_CHANNEL_FUNCTION)
|
||||
else if (func == FUNC_OVERRIDE_CHANNEL) {
|
||||
val_displayed = (int8_t)CFN_PARAM(sd);
|
||||
val_min = -125; val_max = 125;
|
||||
lcd_outdezAtt(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT);
|
||||
|
|
|
@ -1544,8 +1544,8 @@ bool isLogicalSwitchFunctionAvailable(int function)
|
|||
bool isAssignableFunctionAvailable(int function)
|
||||
{
|
||||
switch (function) {
|
||||
#if !defined(SAFETY_CHANNEL_FUNCTION)
|
||||
case FUNC_SAFETY_CHANNEL:
|
||||
#if !defined(OVERRIDE_CHANNEL_FUNCTION)
|
||||
case FUNC_OVERRIDE_CHANNEL:
|
||||
#endif
|
||||
#if !defined(HAPTIC)
|
||||
case FUNC_HAPTIC:
|
||||
|
|
|
@ -245,7 +245,7 @@ int16_t applyLimits(uint8_t channel, int32_t value)
|
|||
|
||||
if (lim->revert) ofs = -ofs; // finally do the reverse.
|
||||
|
||||
#if defined(SAFETY_CHANNEL_FUNCTION)
|
||||
#if defined(OVERRIDE_CHANNEL_FUNCTION)
|
||||
if (safetyCh[channel] != -128) // if safety channel available for channel check
|
||||
ofs = calc100toRESX(safetyCh[channel]);
|
||||
#endif
|
||||
|
|
|
@ -807,7 +807,7 @@ PACK(typedef struct t_LogicalSwitchData { // Logical Switches data
|
|||
|
||||
enum Functions {
|
||||
// first the functions which need a checkbox
|
||||
FUNC_SAFETY_CHANNEL,
|
||||
FUNC_OVERRIDE_CHANNEL,
|
||||
FUNC_TRAINER,
|
||||
FUNC_INSTANT_TRIM,
|
||||
FUNC_RESET,
|
||||
|
@ -849,10 +849,10 @@ enum Functions {
|
|||
FUNC_MAX
|
||||
};
|
||||
|
||||
#if defined(SAFETY_CHANNEL_FUNCTION)
|
||||
#if defined(OVERRIDE_CHANNEL_FUNCTION)
|
||||
#define HAS_ENABLE_PARAM(func) ((func) < FUNC_FIRST_WITHOUT_ENABLE)
|
||||
#else
|
||||
#define HAS_ENABLE_PARAM(func) ((func) < FUNC_FIRST_WITHOUT_ENABLE && (func) != FUNC_SAFETY_CHANNEL)
|
||||
#define HAS_ENABLE_PARAM(func) ((func) < FUNC_FIRST_WITHOUT_ENABLE && (func) != FUNC_OVERRIDE_CHANNEL)
|
||||
#endif
|
||||
|
||||
#if defined(VOICE)
|
||||
|
|
|
@ -147,7 +147,7 @@ uint8_t heartbeat;
|
|||
|
||||
uint8_t stickMode;
|
||||
|
||||
#if defined(SAFETY_CHANNEL_FUNCTION)
|
||||
#if defined(OVERRIDE_CHANNEL_FUNCTION)
|
||||
int8_t safetyCh[NUM_CHNOUT];
|
||||
#endif
|
||||
|
||||
|
@ -1867,7 +1867,7 @@ void evalFunctions()
|
|||
static rotenc_t rePreviousValues[ROTARY_ENCODERS];
|
||||
#endif
|
||||
|
||||
#if defined(SAFETY_CHANNEL_FUNCTION)
|
||||
#if defined(OVERRIDE_CHANNEL_FUNCTION)
|
||||
for (uint8_t i=0; i<NUM_CHNOUT; i++) {
|
||||
safetyCh[i] = -128; // not defined
|
||||
}
|
||||
|
@ -1900,8 +1900,8 @@ void evalFunctions()
|
|||
|
||||
switch (CFN_FUNC(sd)) {
|
||||
|
||||
#if defined(SAFETY_CHANNEL_FUNCTION)
|
||||
case FUNC_SAFETY_CHANNEL:
|
||||
#if defined(OVERRIDE_CHANNEL_FUNCTION)
|
||||
case FUNC_OVERRIDE_CHANNEL:
|
||||
safetyCh[CFN_CH_INDEX(sd)] = CFN_PARAM(sd);
|
||||
break;
|
||||
#endif
|
||||
|
|
|
@ -843,7 +843,7 @@ struct TimerState {
|
|||
|
||||
extern TimerState timersStates[MAX_TIMERS];
|
||||
|
||||
#if defined(SAFETY_CHANNEL_FUNCTION)
|
||||
#if defined(OVERRIDE_CHANNEL_FUNCTION)
|
||||
extern int8_t safetyCh[NUM_CHNOUT];
|
||||
#endif
|
||||
|
||||
|
|
|
@ -264,7 +264,7 @@
|
|||
#define TR_CFN_TEST
|
||||
#endif
|
||||
|
||||
#if defined(SAFETY_CHANNEL_FUNCTION)
|
||||
#if defined(OVERRIDE_CHANNEL_FUNCTION)
|
||||
#define TR_CFN_SAFETY "Zámek \0 "
|
||||
#else
|
||||
#define TR_CFN_SAFETY "---\0 "
|
||||
|
|
|
@ -264,7 +264,7 @@
|
|||
#define TR_CFN_TEST
|
||||
#endif
|
||||
|
||||
#if defined(SAFETY_CHANNEL_FUNCTION)
|
||||
#if defined(OVERRIDE_CHANNEL_FUNCTION)
|
||||
#define TR_CFN_SAFETY "Sicher\0 "
|
||||
#else
|
||||
#define TR_CFN_SAFETY "---\0 "
|
||||
|
|
|
@ -264,9 +264,9 @@
|
|||
#define TR_CFN_TEST
|
||||
#endif
|
||||
|
||||
#if defined(SAFETY_CHANNEL_FUNCTION) && LCD_W >= 212
|
||||
#if defined(OVERRIDE_CHANNEL_FUNCTION) && LCD_W >= 212
|
||||
#define TR_CFN_SAFETY "Override\0 "
|
||||
#elif defined(SAFETY_CHANNEL_FUNCTION)
|
||||
#elif defined(OVERRIDE_CHANNEL_FUNCTION)
|
||||
#define TR_CFN_SAFETY "Overr.\0 "
|
||||
#else
|
||||
#define TR_CFN_SAFETY "---\0 "
|
||||
|
|
|
@ -264,7 +264,7 @@
|
|||
#define TR_CFN_TEST
|
||||
#endif
|
||||
|
||||
#if defined(SAFETY_CHANNEL_FUNCTION)
|
||||
#if defined(OVERRIDE_CHANNEL_FUNCTION)
|
||||
#define TR_CFN_SAFETY "Seguro\0 "
|
||||
#else
|
||||
#define TR_CFN_SAFETY "---\0 "
|
||||
|
|
|
@ -264,7 +264,7 @@
|
|||
#define TR_CFN_TEST
|
||||
#endif
|
||||
|
||||
#if defined(SAFETY_CHANNEL_FUNCTION)
|
||||
#if defined(OVERRIDE_CHANNEL_FUNCTION)
|
||||
#define TR_CFN_SAFETY "Safety\0 "
|
||||
#else
|
||||
#define TR_CFN_SAFETY "---\0 "
|
||||
|
|
|
@ -264,7 +264,7 @@
|
|||
#define TR_CFN_TEST
|
||||
#endif
|
||||
|
||||
#if defined(SAFETY_CHANNEL_FUNCTION)
|
||||
#if defined(OVERRIDE_CHANNEL_FUNCTION)
|
||||
#define TR_CFN_SAFETY "Rempl.\0 "
|
||||
#else
|
||||
#define TR_CFN_SAFETY "---\0 "
|
||||
|
|
|
@ -264,7 +264,7 @@
|
|||
#define TR_CFN_TEST
|
||||
#endif
|
||||
|
||||
#if defined(SAFETY_CHANNEL_FUNCTION)
|
||||
#if defined(OVERRIDE_CHANNEL_FUNCTION)
|
||||
#define TR_CFN_SAFETY "Blocco\0 "
|
||||
#else
|
||||
#define TR_CFN_SAFETY "---\0 "
|
||||
|
|
|
@ -264,7 +264,7 @@
|
|||
#define TR_CFN_TEST
|
||||
#endif
|
||||
|
||||
#if defined(SAFETY_CHANNEL_FUNCTION)
|
||||
#if defined(OVERRIDE_CHANNEL_FUNCTION)
|
||||
#define TR_CFN_SAFETY "Bezp.\0 "
|
||||
#else
|
||||
#define TR_CFN_SAFETY "---\0 "
|
||||
|
|
|
@ -264,7 +264,7 @@
|
|||
#define TR_CFN_TEST
|
||||
#endif
|
||||
|
||||
#if defined(SAFETY_CHANNEL_FUNCTION)
|
||||
#if defined(OVERRIDE_CHANNEL_FUNCTION)
|
||||
#define TR_CFN_SAFETY "Seguro\0 "
|
||||
#else
|
||||
#define TR_CFN_SAFETY "---\0 "
|
||||
|
|
|
@ -264,7 +264,7 @@
|
|||
#define TR_CFN_TEST
|
||||
#endif
|
||||
|
||||
#if defined(SAFETY_CHANNEL_FUNCTION)
|
||||
#if defined(OVERRIDE_CHANNEL_FUNCTION)
|
||||
#define TR_CFN_SAFETY "Säkra \0 "
|
||||
#else
|
||||
#define TR_CFN_SAFETY "---\0 "
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue