jacob.eva/arduino-esp32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OK Really change timer allocator

Browse Source
This commit is contained in:
me-no-dev 2017-09-28 18:38:07 +08:00
parent 17ece1bccd
commit af35773d65
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cores/esp32/esp32-hal-timer.c
View File

@ -213,14 +213,12 @@ void timerEnd(hw_timer_t *timer){
timerAttachInterrupt(timer, NULL, false); timerAttachInterrupt(timer, NULL, false);
} }
#define HWTIMER_INUM 10
void timerAttachInterrupt(hw_timer_t *timer, void (*fn)(void), bool edge){ void timerAttachInterrupt(hw_timer_t *timer, void (*fn)(void), bool edge){
static bool initialized = false; static bool initialized = false;
//static intr_handle_t intr_handle = NULL; static intr_handle_t intr_handle = NULL;
//if(intr_handle){ if(intr_handle){
// esp_intr_disable(intr_handle); esp_intr_disable(intr_handle);
//} }
ESP_INTR_DISABLE(HWTIMER_INUM);
if(fn == NULL){ if(fn == NULL){
timer->dev->config.level_int_en = 0; timer->dev->config.level_int_en = 0;
timer->dev->config.edge_int_en = 0; timer->dev->config.edge_int_en = 0;
@ -251,22 +249,19 @@ void timerAttachInterrupt(hw_timer_t *timer, void (*fn)(void), bool edge){
} }
if(!initialized){ if(!initialized){
initialized = true; initialized = true;
xt_set_interrupt_handler(HWTIMER_INUM, &__timerISR, NULL); esp_intr_alloc(intr_source, (int)(ESP_INTR_FLAG_IRAM|ESP_INTR_FLAG_LOWMED|ESP_INTR_FLAG_EDGE), __timerISR, NULL, &intr_handle);
//esp_intr_alloc(intr_source, (int)ESP_INTR_FLAG_IRAM, __timerISR, NULL, &intr_handle); } else {
}// else { intr_matrix_set(esp_intr_get_cpu(intr_handle), intr_source, esp_intr_get_intno(intr_handle));
// intr_matrix_set(esp_intr_get_cpu(intr_handle), intr_source, esp_intr_get_intno(intr_handle)); }
//}
intr_matrix_set(xPortGetCoreID(), intr_source, HWTIMER_INUM);
if(timer->group){ if(timer->group){
TIMERG1.int_ena.val |= BIT(timer->timer); TIMERG1.int_ena.val |= BIT(timer->timer);
} else { } else {
TIMERG0.int_ena.val |= BIT(timer->timer); TIMERG0.int_ena.val |= BIT(timer->timer);
} }
} }
//if(intr_handle){ if(intr_handle){
// esp_intr_enable(intr_handle); esp_intr_enable(intr_handle);
//} }
ESP_INTR_ENABLE(HWTIMER_INUM);
} }
void timerDetachInterrupt(hw_timer_t *timer){ void timerDetachInterrupt(hw_timer_t *timer){