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

fix: Throttle stick not being detected properly (#3733)

Browse Source 
* Fix thottle timer

* More THR source fixes
This commit is contained in:
3djc
2023-07-03 11:08:38 +10:00
committed by GitHub
parent 632eceba6d
commit d60b544e8c
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/opentx.cpp
+2 -2
View File
@@ -939,7 +939,7 @@ void checkTrims()
#else
phase = getTrimFlightMode(mixerCurrentFlightMode, idx);
before = getTrimValue(phase, idx);
thro = (idx==THR_STICK && g_model.thrTrim);
thro = (idx==inputMappingConvertMode(inputMappingGetThrottle()) && g_model.thrTrim);
#endif
int8_t trimInc = g_model.trimInc + 1;
int8_t v = (trimInc==-1) ? min(32, abs(before)/4+1) : (1 << trimInc); // TODO flash saving if (trimInc < 0)
@@ -1223,7 +1223,7 @@ void instantTrim()
auto controls = adcGetMaxInputs(ADC_INPUT_MAIN);
for (uint8_t stick = 0; stick < controls; stick++) {
if (stick != THR_STICK) { // don't instant trim the throttle stick
if (stick != inputMappingConvertMode(inputMappingGetThrottle())) { // don't instant trim the throttle stick
bool addTrim = false;
int16_t delta = 0;
uint8_t trimFlightMode = getTrimFlightMode(mixerCurrentFlightMode, stick);