djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

re-add frequencyin to 'timer_handler' after upstream merge

Browse Source
This commit is contained in:
sommersoft 2019-03-01 21:47:23 -06:00
parent a44bfc2730
commit 438eadd63a
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/atmel-samd/timer_handler.c
View File

@ -31,6 +31,7 @@
#include "common-hal/pulseio/PulseOut.h" #include "common-hal/pulseio/PulseOut.h"
#include "shared-module/_pew/PewPew.h" #include "shared-module/_pew/PewPew.h"
#include "common-hal/frequencyio/FrequencyIn.h"
static uint8_t tc_handler[TC_INST_NUM]; static uint8_t tc_handler[TC_INST_NUM];
@ -54,6 +55,9 @@ void shared_timer_handler(bool is_tc, uint8_t index) {
pewpew_interrupt_handler(index); pewpew_interrupt_handler(index);
#endif #endif
break; break;
case TC_HANDLER_FREQUENCYIN:
frequencyin_interrupt_handler(index);
break;
default: default:
break; break;
} }

1
ports/atmel-samd/timer_handler.h
View File

@ -29,6 +29,7 @@
#define TC_HANDLER_NO_INTERRUPT 0x0 #define TC_HANDLER_NO_INTERRUPT 0x0
#define TC_HANDLER_PULSEOUT 0x1 #define TC_HANDLER_PULSEOUT 0x1
#define TC_HANDLER_PEW 0x2 #define TC_HANDLER_PEW 0x2
#define TC_HANDLER_FREQUENCYIN 0x3
void set_timer_handler(bool is_tc, uint8_t index, uint8_t timer_handler); void set_timer_handler(bool is_tc, uint8_t index, uint8_t timer_handler);
void shared_timer_handler(bool is_tc, uint8_t index); void shared_timer_handler(bool is_tc, uint8_t index);