Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-14 03:49:52 +03:00
Code Issues Wiki Activity

Cosmetics

Browse source
This commit is contained in:
Bertrand Songis 2016-01-30 11:14:43 +01:00
parent 45cdfac22b
commit fe865dfdae
1 changed files with 67 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

94
radio/src/mixer.cpp
View file

@ -231,7 +231,9 @@ int16_t applyLimits(uint8_t channel, int32_t value)
getvalue_t getValue(mixsrc_t i) getvalue_t getValue(mixsrc_t i)
{ {
if (i==MIXSRC_NONE) return 0; if (i == MIXSRC_NONE) {
return 0;
}
#if defined(VIRTUALINPUTS) #if defined(VIRTUALINPUTS)
else if (i <= MIXSRC_LAST_INPUT) { else if (i <= MIXSRC_LAST_INPUT) {
@ -240,7 +242,7 @@ getvalue_t getValue(mixsrc_t i)
#endif #endif
#if defined(LUAINPUTS) #if defined(LUAINPUTS)
else if (i<MIXSRC_LAST_LUA) { else if (i < MIXSRC_LAST_LUA) {
#if defined(LUA_MODEL_SCRIPTS) #if defined(LUA_MODEL_SCRIPTS)
div_t qr = div(i-MIXSRC_FIRST_LUA, MAX_SCRIPT_OUTPUTS); div_t qr = div(i-MIXSRC_FIRST_LUA, MAX_SCRIPT_OUTPUTS);
return scriptInputsOutputs[qr.quot].outputs[qr.rem].value; return scriptInputsOutputs[qr.quot].outputs[qr.rem].value;
@ -251,25 +253,37 @@ getvalue_t getValue(mixsrc_t i)
#endif #endif
#if defined(LUAINPUTS) #if defined(LUAINPUTS)
else if (i<=MIXSRC_LAST_POT) return calibratedStick[i-MIXSRC_Rud]; else if (i <= MIXSRC_LAST_POT) {
return calibratedStick[i-MIXSRC_Rud];
}
#else #else
else if (i>=MIXSRC_FIRST_STICK && i<=MIXSRC_LAST_POT) return calibratedStick[i-MIXSRC_Rud]; else if (i>=MIXSRC_FIRST_STICK && i<=MIXSRC_LAST_POT) {
return calibratedStick[i-MIXSRC_Rud];
}
}
#endif #endif
#if defined(PCBGRUVIN9X) || defined(PCBMEGA2560) || defined(ROTARY_ENCODERS) #if defined(PCBGRUVIN9X) || defined(PCBMEGA2560) || defined(ROTARY_ENCODERS)
else if (i<=MIXSRC_LAST_ROTARY_ENCODER) return getRotaryEncoder(i-MIXSRC_REa); else if (i <= MIXSRC_LAST_ROTARY_ENCODER) {
return getRotaryEncoder(i-MIXSRC_REa);
}
#endif #endif
else if (i==MIXSRC_MAX) return 1024; else if (i == MIXSRC_MAX) {
return 1024;
}
else if (i<=MIXSRC_CYC3) else if (i <= MIXSRC_CYC3) {
#if defined(HELI) #if defined(HELI)
return cyc_anas[i-MIXSRC_CYC1]; return cyc_anas[i - MIXSRC_CYC1];
#else #else
return 0; return 0;
#endif #endif
}
else if (i<=MIXSRC_TrimAil) return calc1000toRESX((int16_t)8 * getTrimValue(mixerCurrentFlightMode, i-MIXSRC_TrimRud)); else if (i <= MIXSRC_TrimAil) {
return calc1000toRESX((int16_t)8 * getTrimValue(mixerCurrentFlightMode, i-MIXSRC_TrimRud));
}
#if defined(PCBFLAMENCO) #if defined(PCBFLAMENCO)
else if (i==MIXSRC_SA) return (switchState(SW_SA0) ? -1024 : (switchState(SW_SA1) ? 0 : 1024)); else if (i==MIXSRC_SA) return (switchState(SW_SA0) ? -1024 : (switchState(SW_SA1) ? 0 : 1024));
@ -289,35 +303,61 @@ getvalue_t getValue(mixsrc_t i)
} }
} }
#else #else
else if (i==MIXSRC_3POS) return (getSwitch(SW_ID0-SW_BASE+1) ? -1024 : (getSwitch(SW_ID1-SW_BASE+1) ? 0 : 1024)); else if (i == MIXSRC_3POS) {
return (getSwitch(SW_ID0-SW_BASE+1) ? -1024 : (getSwitch(SW_ID1-SW_BASE+1) ? 0 : 1024));
}
// don't use switchState directly to give getSwitch possibility to hack values if needed for switch warning // don't use switchState directly to give getSwitch possibility to hack values if needed for switch warning
else if (i<MIXSRC_SW1) return getSwitch(SWSRC_THR+i-MIXSRC_THR) ? 1024 : -1024; else if (i < MIXSRC_SW1) {
return getSwitch(SWSRC_THR+i-MIXSRC_THR) ? 1024 : -1024;
}
#endif #endif
else if (i<=MIXSRC_LAST_LOGICAL_SWITCH) 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]; } return x*2; } else if (i <= MIXSRC_LAST_LOGICAL_SWITCH) {
else if (i<=MIXSRC_LAST_CH) return ex_chans[i-MIXSRC_CH1]; 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];
}
return x*2;
}
else if (i <= MIXSRC_LAST_CH) {
return ex_chans[i-MIXSRC_CH1];
}
#if defined(GVARS) #if defined(GVARS)
else if (i<=MIXSRC_LAST_GVAR) return GVAR_VALUE(i-MIXSRC_GVAR1, else if (i <= MIXSRC_LAST_GVAR) {
getGVarFlightMode(mixerCurrentFlightMode, i - MIXSRC_GVAR1)); return GVAR_VALUE(i-MIXSRC_GVAR1, getGVarFlightMode(mixerCurrentFlightMode, i - MIXSRC_GVAR1));
}
#endif #endif
#if defined(CPUARM) #if defined(CPUARM)
else if (i==MIXSRC_TX_VOLTAGE) return g_vbat100mV; else if (i == MIXSRC_TX_VOLTAGE) {
else if (i<MIXSRC_FIRST_TIMER) // TX_TIME + SPARES return g_vbat100mV;
#if defined(RTCLOCK) }
return (g_rtcTime % SECS_PER_DAY) / 60; // number of minutes from midnight else if (i < MIXSRC_FIRST_TIMER) {
#else // TX_TIME + SPARES
return 0; #if defined(RTCLOCK)
#endif return (g_rtcTime % SECS_PER_DAY) / 60; // number of minutes from midnight
else if (i<=MIXSRC_LAST_TIMER) return timersStates[i-MIXSRC_FIRST_TIMER].val;
#else #else
else if (i==MIXSRC_FIRST_TELEM-1+TELEM_TX_VOLTAGE) return g_vbat100mV; return 0;
else if (i<=MIXSRC_FIRST_TELEM-1+TELEM_TIMER2) return timersStates[i-MIXSRC_FIRST_TELEM+1-TELEM_TIMER1].val; #endif
}
else if (i <= MIXSRC_LAST_TIMER) {
return timersStates[i-MIXSRC_FIRST_TIMER].val;
}
#else
else if (i == MIXSRC_FIRST_TELEM-1+TELEM_TX_VOLTAGE) {
return g_vbat100mV;
}
else if (i <= MIXSRC_FIRST_TELEM-1+TELEM_TIMER2) {
return timersStates[i-MIXSRC_FIRST_TELEM+1-TELEM_TIMER1].val;
}
#endif #endif
#if defined(CPUARM) #if defined(CPUARM)
else if (i<=MIXSRC_LAST_TELEM) { else if (i <= MIXSRC_LAST_TELEM) {
i -= MIXSRC_FIRST_TELEM; i -= MIXSRC_FIRST_TELEM;
div_t qr = div(i, 3); div_t qr = div(i, 3);
TelemetryItem & telemetryItem = telemetryItems[qr.quot]; TelemetryItem & telemetryItem = telemetryItems[qr.quot];