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

esp32/machine_timer: Switch from legacy driver to timer HAL.

Browse Source 
The legacy driver was deprecated in IDF v5, and crashes when the ISR
handler is called.  Instead of fixing the legacy code, this commit reworks
the machine.Timer class to use the low-level HAL driver.

Tested on ESP32, ESP32S2, ESP32S3 and ESP32C3.  Behaviour is the same as it
was before this commit, except the way the Timer object is printed, it now
gives more useful information (timer id, mode, period in ms).

Fixes issue #11970.

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George 2023-07-12 16:39:26 +10:00
parent 671b35ceae
commit 7d66ae603d
2 changed files with 51 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ports/esp32/boards/sdkconfig.base
View File

@ -75,6 +75,5 @@ CONFIG_UART_ISR_IN_IRAM=y
# IDF 5 deprecated # IDF 5 deprecated
CONFIG_ADC_SUPPRESS_DEPRECATE_WARN=y CONFIG_ADC_SUPPRESS_DEPRECATE_WARN=y
CONFIG_GPTIMER_SUPPRESS_DEPRECATE_WARN=y
CONFIG_RMT_SUPPRESS_DEPRECATE_WARN=y CONFIG_RMT_SUPPRESS_DEPRECATE_WARN=y
CONFIG_I2S_SUPPRESS_DEPRECATE_WARN=y CONFIG_I2S_SUPPRESS_DEPRECATE_WARN=y

95
ports/esp32/machine_timer.c
View File

@ -35,10 +35,10 @@
#include "modmachine.h" #include "modmachine.h"
#include "mphalport.h" #include "mphalport.h"
#include "driver/timer.h" #include "hal/timer_hal.h"
#include "hal/timer_ll.h" #include "hal/timer_ll.h"
#include "soc/timer_periph.h"
#define TIMER_INTR_SEL TIMER_INTR_LEVEL
#define TIMER_DIVIDER 8 #define TIMER_DIVIDER 8
// TIMER_BASE_CLK is normally 80MHz. TIMER_DIVIDER ought to divide this exactly // TIMER_BASE_CLK is normally 80MHz. TIMER_DIVIDER ought to divide this exactly
@ -48,6 +48,8 @@
typedef struct _machine_timer_obj_t { typedef struct _machine_timer_obj_t {
mp_obj_base_t base; mp_obj_base_t base;
timer_hal_context_t hal_context;
mp_uint_t group; mp_uint_t group;
mp_uint_t index; mp_uint_t index;
@ -80,15 +82,9 @@ void machine_timer_deinit_all(void) {
STATIC void machine_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { STATIC void machine_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
machine_timer_obj_t *self = self_in; machine_timer_obj_t *self = self_in;
qstr mode = self->repeat ? MP_QSTR_PERIODIC : MP_QSTR_ONE_SHOT;
timer_config_t config; uint64_t period = self->period / (TIMER_SCALE / 1000); // convert to ms
mp_printf(print, "Timer(%p; ", self); mp_printf(print, "Timer(%u, mode=%q, period=%lu)", (self->group << 1) | self->index, mode, period);
timer_get_config(self->group, self->index, &config);
mp_printf(print, "alarm_en=%d, ", config.alarm_en);
mp_printf(print, "auto_reload=%d, ", config.auto_reload);
mp_printf(print, "counter_en=%d)", config.counter_en);
} }
STATIC mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { STATIC mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
@ -126,8 +122,14 @@ STATIC mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args,
} }
STATIC void machine_timer_disable(machine_timer_obj_t *self) { STATIC void machine_timer_disable(machine_timer_obj_t *self) {
if (self->hal_context.dev != NULL) {
// Disable the counter and alarm.
timer_ll_enable_counter(self->hal_context.dev, self->index, false);
timer_ll_enable_alarm(self->hal_context.dev, self->index, false);
}
if (self->handle) { if (self->handle) {
timer_pause(self->group, self->index); // Free the interrupt handler.
esp_intr_free(self->handle); esp_intr_free(self->handle);
self->handle = NULL; self->handle = NULL;
} }
@ -138,39 +140,47 @@ STATIC void machine_timer_disable(machine_timer_obj_t *self) {
STATIC void machine_timer_isr(void *self_in) { STATIC void machine_timer_isr(void *self_in) {
machine_timer_obj_t *self = self_in; machine_timer_obj_t *self = self_in;
timg_dev_t *device = self->group ? &(TIMERG1) : &(TIMERG0);
#if CONFIG_IDF_TARGET_ESP32S3 uint32_t intr_status = timer_ll_get_intr_status(self->hal_context.dev);
device->hw_timer[self->index].update.tn_update = 1;
#else
device->hw_timer[self->index].update.tx_update = 1;
#endif
timer_ll_clear_intr_status(device, self->index); if (intr_status & TIMER_LL_EVENT_ALARM(self->index)) {
timer_ll_set_alarm_value(device, self->index, self->repeat); timer_ll_clear_intr_status(self->hal_context.dev, TIMER_LL_EVENT_ALARM(self->index));
if (self->repeat) {
mp_sched_schedule(self->callback, self); timer_ll_enable_alarm(self->hal_context.dev, self->index, true);
mp_hal_wake_main_task_from_isr(); }
mp_sched_schedule(self->callback, self);
mp_hal_wake_main_task_from_isr();
}
} }
STATIC void machine_timer_enable(machine_timer_obj_t *self) { STATIC void machine_timer_enable(machine_timer_obj_t *self) {
timer_config_t config; // Initialise the timer.
config.alarm_en = TIMER_ALARM_EN; timer_hal_init(&self->hal_context, self->group, self->index);
config.auto_reload = self->repeat; timer_ll_enable_counter(self->hal_context.dev, self->index, false);
config.counter_dir = TIMER_COUNT_UP; timer_ll_set_clock_source(self->hal_context.dev, self->index, GPTIMER_CLK_SRC_APB);
config.divider = TIMER_DIVIDER; timer_ll_set_clock_prescale(self->hal_context.dev, self->index, TIMER_DIVIDER);
config.intr_type = TIMER_INTR_LEVEL; timer_hal_set_counter_value(&self->hal_context, 0);
config.counter_en = TIMER_PAUSE; timer_ll_set_count_direction(self->hal_context.dev, self->index, GPTIMER_COUNT_UP);
#if SOC_TIMER_GROUP_SUPPORT_XTAL
config.clk_src = TIMER_SRC_CLK_APB;
#endif
check_esp_err(timer_init(self->group, self->index, &config)); // Allocate and enable the alarm interrupt.
check_esp_err(timer_set_counter_value(self->group, self->index, 0x00000000)); timer_ll_enable_intr(self->hal_context.dev, TIMER_LL_EVENT_ALARM(self->index), false);
check_esp_err(timer_set_alarm_value(self->group, self->index, self->period)); timer_ll_clear_intr_status(self->hal_context.dev, TIMER_LL_EVENT_ALARM(self->index));
check_esp_err(timer_enable_intr(self->group, self->index)); ESP_ERROR_CHECK(
check_esp_err(timer_isr_register(self->group, self->index, machine_timer_isr, (void *)self, TIMER_FLAGS, &self->handle)); esp_intr_alloc(timer_group_periph_signals.groups[self->group].timer_irq_id[self->index],
check_esp_err(timer_start(self->group, self->index)); TIMER_FLAGS, machine_timer_isr, self, &self->handle)
);
timer_ll_enable_intr(self->hal_context.dev, TIMER_LL_EVENT_ALARM(self->index), true);
// Enable the alarm to trigger at the given period.
timer_ll_set_alarm_value(self->hal_context.dev, self->index, self->period);
timer_ll_enable_alarm(self->hal_context.dev, self->index, true);
// Set the counter to reload at 0 if it's in repeat mode.
timer_ll_set_reload_value(self->hal_context.dev, self->index, 0);
timer_ll_enable_auto_reload(self->hal_context.dev, self->index, self->repeat);
// Enable the counter.
timer_ll_enable_counter(self->hal_context.dev, self->index, true);
} }
STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
@ -234,11 +244,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_timer_init_obj, 1, machine_timer_init)
STATIC mp_obj_t machine_timer_value(mp_obj_t self_in) { STATIC mp_obj_t machine_timer_value(mp_obj_t self_in) {
machine_timer_obj_t *self = self_in; machine_timer_obj_t *self = self_in;
double result; uint64_t result = timer_ll_get_counter_value(self->hal_context.dev, self->index);
return MP_OBJ_NEW_SMALL_INT((mp_uint_t)(result / (TIMER_SCALE / 1000))); // value in ms
timer_get_counter_time_sec(self->group, self->index, &result);
return MP_OBJ_NEW_SMALL_INT((mp_uint_t)(result * 1000)); // value in ms
} }
STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_value_obj, machine_timer_value); STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_value_obj, machine_timer_value);