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

esp32/machine_timer: Support all init arguments in Timer constructor.

Browse Source 
Following the usual style of instantiation and init().
This commit is contained in:
robert-hh 2022-08-17 08:44:03 +02:00 committed by Damien George
parent 13dceaa4ea
commit 8139cbcf6b
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ports/esp32/machine_timer.c
View File

@ -68,6 +68,7 @@ typedef struct _machine_timer_obj_t {
const mp_obj_type_t machine_timer_type; const mp_obj_type_t machine_timer_type;
STATIC void machine_timer_disable(machine_timer_obj_t *self); STATIC void machine_timer_disable(machine_timer_obj_t *self);
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);
void machine_timer_deinit_all(void) { void machine_timer_deinit_all(void) {
// Disable, deallocate and remove all timers from list // Disable, deallocate and remove all timers from list
@ -94,24 +95,35 @@ STATIC void machine_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_pr
} }
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) {
mp_arg_check_num(n_args, n_kw, 1, 1, false); mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
mp_uint_t group = (mp_obj_get_int(args[0]) >> 1) & 1; mp_uint_t group = (mp_obj_get_int(args[0]) >> 1) & 1;
mp_uint_t index = mp_obj_get_int(args[0]) & 1; mp_uint_t index = mp_obj_get_int(args[0]) & 1;
// Check whether the timer is already initialized, if so return it machine_timer_obj_t *self = NULL;
// Check whether the timer is already initialized, if so use it
for (machine_timer_obj_t *t = MP_STATE_PORT(machine_timer_obj_head); t; t = t->next) { for (machine_timer_obj_t *t = MP_STATE_PORT(machine_timer_obj_head); t; t = t->next) {
if (t->group == group && t->index == index) { if (t->group == group && t->index == index) {
return t; self = t;
break;
} }
} }
// The timer does not exist, create it.
if (self == NULL) {
self = mp_obj_malloc(machine_timer_obj_t, &machine_timer_type);
self->group = group;
self->index = index;
machine_timer_obj_t *self = mp_obj_malloc(machine_timer_obj_t, &machine_timer_type); // Add the timer to the linked-list of timers
self->group = group; self->next = MP_STATE_PORT(machine_timer_obj_head);
self->index = index; MP_STATE_PORT(machine_timer_obj_head) = self;
}
// Add the timer to the linked-list of timers if (n_args > 1 || n_kw > 0) {
self->next = MP_STATE_PORT(machine_timer_obj_head); mp_map_t kw_args;
MP_STATE_PORT(machine_timer_obj_head) = self; mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
machine_timer_init_helper(self, n_args - 1, args + 1, &kw_args);
}
return self; return self;
} }