gomaomao/DIY-Multiprotocol-TX-Module
1
0
Fork 0
mirror of https://github.com/pascallanger/DIY-Multiprotocol-TX-Module.git synced 2025-07-01 10:17:53 +00:00
Code Issues Projects Releases Wiki Activity

STM32 final timer fix

Browse Source
This commit is contained in:
Pascal Langer 2017-12-19 14:27:39 +01:00
parent 3fc5be111b
commit 334e49c4ca
2 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Multiprotocol/Multiprotocol.h
View File

@ -19,7 +19,7 @@
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 1 #define VERSION_MINOR 1
#define VERSION_REVISION 6 #define VERSION_REVISION 6
#define VERSION_PATCH_LEVEL 45 #define VERSION_PATCH_LEVEL 46
//****************** //******************
// Protocols // Protocols
//****************** //******************

48
Multiprotocol/Multiprotocol.ino
View File

@ -54,7 +54,6 @@
#include <SPI.h> #include <SPI.h>
#include <EEPROM.h> #include <EEPROM.h>
HardwareTimer HWTimer2(2); HardwareTimer HWTimer2(2);
HardwareTimer HWTimer3(3);
void PPM_decode(); void PPM_decode();
void ISR_COMPB(); void ISR_COMPB();
extern "C" extern "C"
@ -495,7 +494,7 @@ void loop()
#ifndef STM32_BOARD #ifndef STM32_BOARD
TIFR1=OCF1A_bm; // clear compare A=callback flag TIFR1=OCF1A_bm; // clear compare A=callback flag
#else #else
TIMER2_BASE->SR &= ~TIMER_SR_CC1IF; // clear compare flag on channel 1 TIMER2_BASE->SR = 0x1E5F & ~TIMER_SR_CC1IF; // Clear Timer2/Comp1 interrupt flag
#endif #endif
sei(); // enable global int sei(); // enable global int
if(Update_All()) // Protocol changed? if(Update_All()) // Protocol changed?
@ -516,7 +515,7 @@ void loop()
#ifndef STM32_BOARD #ifndef STM32_BOARD
TIFR1=OCF1A_bm; // clear compare A=callback flag TIFR1=OCF1A_bm; // clear compare A=callback flag
#else #else
TIMER2_BASE->SR &= ~TIMER_SR_CC1IF; // clear compare flag on channel 1 TIMER2_BASE->SR = 0x1E5F & ~TIMER_SR_CC1IF; // Clear Timer2/Comp1 interrupt flag
#endif #endif
diff=OCR1A-TCNT1; // compare timer and comparator diff=OCR1A-TCNT1; // compare timer and comparator
sei(); // enable global int sei(); // enable global int
@ -1047,7 +1046,7 @@ static void protocol_init()
#ifndef STM32_BOARD #ifndef STM32_BOARD
TIFR1 = OCF1A_bm ; // clear compare A flag TIFR1 = OCF1A_bm ; // clear compare A flag
#else #else
TIMER2_BASE->SR &= ~TIMER_SR_CC1IF; //clear compare Flag write zero TIMER2_BASE->SR = 0x1E5F & ~TIMER_SR_CC1IF; // Clear Timer2/Comp1 interrupt flag
#endif #endif
sei(); // enable global int sei(); // enable global int
BIND_BUTTON_FLAG_off; // do not bind/reset id anymore even if protocol change BIND_BUTTON_FLAG_off; // do not bind/reset id anymore even if protocol change
@ -1268,25 +1267,20 @@ void modules_reset()
} }
void init_HWTimer() void init_HWTimer()
{ {
// Pause the timer while we're configuring it HWTimer2.pause(); // Pause the timer2 while we're configuring it
HWTimer2.pause();
TIMER2_BASE->PSC = 35; //36-1;for 72 MHZ /0.5sec/(35+1)
TIMER2_BASE->ARR = 0xFFFF; //count till max
HWTimer2.setMode(TIMER_CH1, TIMER_OUTPUT_COMPARE);
// Refresh the timer's count, prescale, and overflow
HWTimer2.refresh();
HWTimer2.resume();
HWTimer3.pause(); TIMER2_BASE->PSC = 35; // 36-1;for 72 MHZ /0.5sec/(35+1)
TIMER3_BASE->PSC = 35; //36-1;for 72 MHZ /0.5sec/(35+1) TIMER2_BASE->ARR = 0xFFFF; // Count until 0xFFFF
TIMER3_BASE->ARR = 0xFFFF; //count till max
HWTimer3.setMode(TIMER_CH2, TIMER_OUTPUT_COMPARE); HWTimer2.setMode(TIMER_CH1, TIMER_OUTPUT_COMPARE); // Main scheduler
TIMER3_BASE->SR &= ~TIMER_SR_CC2IF; // Clear Timer3/Comp2 interrupt flag HWTimer2.setMode(TIMER_CH2, TIMER_OUTPUT_COMPARE); // Serial check
HWTimer3.attachInterrupt(TIMER_CH2,ISR_COMPB); // assign function to Timer2/Comp2 interrupt
TIMER3_BASE->DIER &= ~TIMER_DIER_CC2IE; // disable Timer2/Comp2 interrupt TIMER2_BASE->SR = 0x1E5F & ~TIMER_SR_CC2IF; // Clear Timer2/Comp2 interrupt flag
// Refresh the timer's count, prescale, and overflow HWTimer2.attachInterrupt(TIMER_CH2,ISR_COMPB); // Assign function to Timer2/Comp2 interrupt
HWTimer3.refresh(); TIMER2_BASE->DIER &= ~TIMER_DIER_CC2IE; // Disable Timer2/Comp2 interrupt
HWTimer3.resume();
HWTimer2.refresh(); // Refresh the timer's count, prescale, and overflow
HWTimer2.resume();
} }
#endif #endif
@ -1508,9 +1502,9 @@ static uint32_t random_id(uint16_t address, uint8_t create_new)
TX_RX_PAUSE_on; TX_RX_PAUSE_on;
tx_pause(); tx_pause();
#if defined STM32_BOARD #if defined STM32_BOARD
TIMER3_BASE->CCR2=TIMER2_BASE->CNT+(6500L); // Full message should be received within timer of 3250us TIMER2_BASE->CCR2=TIMER2_BASE->CNT+(6500L); // Full message should be received within timer of 3250us
TIMER3_BASE->SR &= ~TIMER_SR_CC2IF; // Clear Timer3/Comp2 interrupt flag TIMER2_BASE->SR = 0x1E5F & ~TIMER_SR_CC2IF; // Clear Timer2/Comp2 interrupt flag
TIMER3_BASE->DIER |= TIMER_DIER_CC2IE; // Enable Timer3/Comp2 interrupt TIMER2_BASE->DIER |= TIMER_DIER_CC2IE; // Enable Timer2/Comp2 interrupt
#else #else
OCR1B = TCNT1+(6500L) ; // Full message should be received within timer of 3250us OCR1B = TCNT1+(6500L) ; // Full message should be received within timer of 3250us
TIFR1 = OCF1B_bm ; // clear OCR1B match flag TIFR1 = OCF1B_bm ; // clear OCR1B match flag
@ -1544,7 +1538,7 @@ static uint32_t random_id(uint16_t address, uint8_t create_new)
if(discard_frame==1) if(discard_frame==1)
{ {
#ifdef STM32_BOARD #ifdef STM32_BOARD
TIMER3_BASE->DIER &= ~TIMER_DIER_CC2IE; // Disable Timer3/Comp2 interrupt TIMER2_BASE->DIER &= ~TIMER_DIER_CC2IE; // Disable Timer2/Comp2 interrupt
#else #else
CLR_TIMSK1_OCIE1B; // Disable interrupt on compare B match CLR_TIMSK1_OCIE1B; // Disable interrupt on compare B match
#endif #endif
@ -1568,7 +1562,7 @@ static uint32_t random_id(uint16_t address, uint8_t create_new)
{ // Timer1 compare B interrupt { // Timer1 compare B interrupt
discard_frame=1; discard_frame=1;
#ifdef STM32_BOARD #ifdef STM32_BOARD
TIMER3_BASE->DIER &= ~TIMER_DIER_CC2IE; // Disable Timer3/Comp2 interrupt TIMER2_BASE->DIER &= ~TIMER_DIER_CC2IE; // Disable Timer2/Comp2 interrupt
debugln("Bad frame timer"); debugln("Bad frame timer");
#else #else
CLR_TIMSK1_OCIE1B; // Disable interrupt on compare B match CLR_TIMSK1_OCIE1B; // Disable interrupt on compare B match