This commit is contained in:
midelic 2016-08-24 19:43:05 +03:00 committed by GitHub
parent 21cc9e4bc8
commit 2fe1e65720

View File

@ -700,19 +700,22 @@ static void protocol_init()
delayMicroseconds(next_callback-2000); delayMicroseconds(next_callback-2000);
next_callback=2000; next_callback=2000;
} }
cli(); // disable global int
#ifdef XMEGA #ifdef XMEGA
cli(); // disable global int
TCC1.CCA = TCC1.CNT + next_callback*2; // set compare A for callback TCC1.CCA = TCC1.CNT + next_callback*2; // set compare A for callback
sei(); // enable global int sei(); // enable global int
TCC1.INTFLAGS = TC1_CCAIF_bm ; // clear compare A flag TCC1.INTFLAGS = TC1_CCAIF_bm ; // clear compare A flag
#else #else
#if defined STM32_board #if defined STM32_board
cli(); // disable global int
TCNT1 = TIMER2_BASE->CNT; TCNT1 = TIMER2_BASE->CNT;
OCR1A=TCNT1+next_callback*2; OCR1A=TCNT1+next_callback*2;
TIMER2_BASE->CCR1 = OCR1A; TIMER2_BASE->CCR1 = OCR1A;
sei(); sei();
TIMER2_BASE->SR &= ~TIMER_SR_CC1IF;//clear compare Flag write zero TIMER2_BASE->SR &= ~TIMER_SR_CC1IF;//clear compare Flag write zero
#else #else
cli(); // disable global int
OCR1A=TCNT1+next_callback*2; // set compare A for callback OCR1A=TCNT1+next_callback*2; // set compare A for callback
sei(); // enable global int sei(); // enable global int
TIFR1=(1<<OCF1A); // clear compare A flag TIFR1=(1<<OCF1A); // clear compare A flag