piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

[X-LiteS] Gyro added

Browse Source
This commit is contained in:
Bertrand Songis
2019-04-02 20:12:50 +02:00
parent b967d5b08a
commit a13ee14bbb
18 changed files with 468 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/mixer.cpp
+12 -10
View File
@@ -301,7 +301,7 @@ getvalue_t getValue(mixsrc_t i)
return anas[i-MIXSRC_FIRST_INPUT];
}
#if defined(LUA_INPUTS)
else if (i < MIXSRC_LAST_LUA) {
else if (i <= MIXSRC_LAST_LUA) {
#if defined(LUA_MODEL_SCRIPTS)
div_t qr = div(i-MIXSRC_FIRST_LUA, MAX_SCRIPT_OUTPUTS);
return scriptInputsOutputs[qr.quot].outputs[qr.rem].value;
@@ -311,19 +311,19 @@ getvalue_t getValue(mixsrc_t i)
}
#endif
#if defined(LUA_INPUTS)
else if (i <= MIXSRC_LAST_POT+NUM_MOUSE_ANALOGS) {
return calibratedAnalogs[i-MIXSRC_Rud];
return calibratedAnalogs[i - MIXSRC_Rud];
}
#else
else if (i>=MIXSRC_FIRST_STICK && i<=MIXSRC_LAST_POT+NUM_MOUSE_ANALOGS) {
return calibratedAnalogs[i-MIXSRC_Rud];
#if defined(GYRO)
else if (i <= MIXSRC_GYRO2) {
return gyro.outputs[i - MIXSRC_GYRO1];
}
#endif
#if defined(PCBGRUVIN9X) || defined(PCBMEGA2560) || defined(ROTARY_ENCODERS)
#if defined(PCBSKY9X)
else if (i <= MIXSRC_LAST_ROTARY_ENCODER) {
return getRotaryEncoder(i-MIXSRC_REa);
return getRotaryEncoder(i - MIXSRC_REa);
}
#endif
@@ -377,11 +377,13 @@ getvalue_t getValue(mixsrc_t i)
return ex_chans[i-MIXSRC_CH1];
}
#if defined(GVARS)
else if (i <= MIXSRC_LAST_GVAR) {
#if defined(GVARS)
return GVAR_VALUE(i-MIXSRC_GVAR1, getGVarFlightMode(mixerCurrentFlightMode, i - MIXSRC_GVAR1));
}
#else
return 0;
#endif
}
else if (i == MIXSRC_TX_VOLTAGE) {
return g_vbat100mV;