mirror of
https://github.com/espressif/esp-idf.git
synced 2025-12-11 02:07:46 +00:00
Merge branch 'master' into feature/esp32s2beta_update
This commit is contained in:
@@ -141,7 +141,7 @@ static timer_isr_handle_t isr_handle;
|
||||
static bool test_set_bits;
|
||||
static bool test_clear_bits;
|
||||
|
||||
static void IRAM_ATTR event_group_isr()
|
||||
static void IRAM_ATTR event_group_isr(void *arg)
|
||||
{
|
||||
portBASE_TYPE task_woken = pdFALSE;
|
||||
TIMERG0.int_clr_timers.t0 = 1;
|
||||
@@ -163,7 +163,7 @@ static void IRAM_ATTR event_group_isr()
|
||||
}
|
||||
}
|
||||
|
||||
static void setup_timer()
|
||||
static void setup_timer(void)
|
||||
{
|
||||
//Setup timer for ISR
|
||||
int timer_group = TIMER_GROUP_0;
|
||||
@@ -184,7 +184,7 @@ static void setup_timer()
|
||||
timer_isr_register(timer_group, timer_idx, event_group_isr, NULL, ESP_INTR_FLAG_IRAM, &isr_handle); //Set ISR handler
|
||||
}
|
||||
|
||||
static void cleanup_timer()
|
||||
static void cleanup_timer(void)
|
||||
{
|
||||
timer_disable_intr(TIMER_GROUP_0, TIMER_NUMBER);
|
||||
esp_intr_free(isr_handle);
|
||||
|
||||
Reference in New Issue
Block a user