jepler/circuitpython
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

esp32/machine_timer: Restrict timer numbers for ESP32C6 to 0 and 1.

Browse source 
The ESP32C6 has only one timer in each of the two groups.  Also add a check
for valid timer numbers.

Addresses issue #16438.

Signed-off-by: robert-hh <robert@hammelrath.com>
This commit is contained in:
robert-hh 2024-12-17 20:06:02 +01:00 committed by Damien George
parent 8b6bd43eab
commit 136058496f
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ports/esp32/machine_timer.c
View file

@ -66,7 +66,7 @@ static void machine_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_pr
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; qstr mode = self->repeat ? MP_QSTR_PERIODIC : MP_QSTR_ONE_SHOT;
uint64_t period = self->period / (TIMER_SCALE / 1000); // convert to ms uint64_t period = self->period / (TIMER_SCALE / 1000); // convert to ms
#if CONFIG_IDF_TARGET_ESP32C3 #if SOC_TIMER_GROUP_TIMERS_PER_GROUP == 1
mp_printf(print, "Timer(%u, mode=%q, period=%lu)", self->group, mode, period); mp_printf(print, "Timer(%u, mode=%q, period=%lu)", self->group, mode, period);
#else #else
mp_printf(print, "Timer(%u, mode=%q, period=%lu)", (self->group << 1) | self->index, mode, period); mp_printf(print, "Timer(%u, mode=%q, period=%lu)", (self->group << 1) | self->index, mode, period);
@ -76,7 +76,7 @@ static void machine_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_pr
machine_timer_obj_t *machine_timer_create(mp_uint_t timer) { machine_timer_obj_t *machine_timer_create(mp_uint_t timer) {
machine_timer_obj_t *self = NULL; machine_timer_obj_t *self = NULL;
#if CONFIG_IDF_TARGET_ESP32C3 #if SOC_TIMER_GROUP_TIMERS_PER_GROUP == 1
mp_uint_t group = timer & 1; mp_uint_t group = timer & 1;
mp_uint_t index = 0; mp_uint_t index = 0;
#else #else
@ -108,7 +108,11 @@ static mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args,
mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true); mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
// Create the new timer. // Create the new timer.
machine_timer_obj_t *self = machine_timer_create(mp_obj_get_int(args[0])); uint32_t timer_number = mp_obj_get_int(args[0]);
if (timer_number >= SOC_TIMER_GROUP_TOTAL_TIMERS) {
mp_raise_ValueError(MP_ERROR_TEXT("invalid Timer number"));
}
machine_timer_obj_t *self = machine_timer_create(timer_number);
if (n_args > 1 || n_kw > 0) { if (n_args > 1 || n_kw > 0) {
mp_map_t kw_args; mp_map_t kw_args;