Merge branch 'next' into projectkk2glider/9xe_adc3_driver

Conflicts:
	radio/src/myeeprom.h
This commit is contained in:
Damjan Adamic
2014-12-27 16:20:14 +01:00
parent 6304679582
commit eca81904d2
18 changed files with 43414 additions and 1224 deletions
+4 -1
View File
@@ -1811,7 +1811,10 @@ void doMixerCalculations()
timerState->cnt=0;
}
else if (tm == TMRMODE_THR_TRG) {
if (val || newTimerVal > 0) {
if (val) {
timerState->state = TMR_TRIGGED;
}
if (timerState->state == TMR_TRIGGED) {
newTimerVal++;
}
}