Merge branch 'bsongis/Taranis_audio_freeze' of https://github.com/opentx/opentx into next

This commit is contained in:
Andre Bernet
2014-01-05 12:26:14 +01:00
9 changed files with 28 additions and 4 deletions
+3 -1
View File
@@ -108,7 +108,9 @@ ISR(TIMER1_COMPA_vect) //2MHz pulse generation (BLOCKING ISR)
// Call setupPulses only after REST pulse had been sent.
// Must do this before toggle PORTB to keep timing accurate
if (IS_DSM2_SERIAL_PROTOCOL(s_current_protocol[0]) || *((uint16_t*)pulses2MHzRPtr) == 0) {
OCR1A = SETUP_PULSES_DURATION;
if (!IS_DSM2_SERIAL_PROTOCOL(s_current_protocol[0])) {
OCR1A = SETUP_PULSES_DURATION;
}
setupPulses(); // does not sei() for setupPulsesPPM
heartbeat |= HEART_TIMER_PULSES;
return;