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

nrf5/modules: Guarding callback to python event handler before issue the call in case it is not set.

Browse Source
This commit is contained in:
Glenn Ruben Bakke 2017-02-16 18:49:47 +01:00
parent 18365135f7
commit 2fd55feb0c
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
nrf5/modules/ubluepy/ubluepy_peripheral.c
View File

@ -42,18 +42,20 @@ STATIC void ubluepy_peripheral_print(const mp_print_t *print, mp_obj_t o, mp_pri
STATIC void event_handler(mp_obj_t self_in, uint16_t event_id, uint16_t length, uint8_t * data) { STATIC void event_handler(mp_obj_t self_in, uint16_t event_id, uint16_t length, uint8_t * data) {
ubluepy_peripheral_obj_t *self = MP_OBJ_TO_PTR(self_in); ubluepy_peripheral_obj_t *self = MP_OBJ_TO_PTR(self_in);
mp_obj_t args[3]; if (self->conn_handler != mp_const_none) {
mp_uint_t num_of_args = 3; mp_obj_t args[3];
args[0] = MP_OBJ_NEW_SMALL_INT(event_id); mp_uint_t num_of_args = 3;
args[1] = MP_OBJ_NEW_SMALL_INT(length); args[0] = MP_OBJ_NEW_SMALL_INT(event_id);
if (data != NULL) { args[1] = MP_OBJ_NEW_SMALL_INT(length);
args[2] = mp_obj_new_bytearray_by_ref(length, data); if (data != NULL) {
} else { args[2] = mp_obj_new_bytearray_by_ref(length, data);
args[2] = mp_const_none; } else {
} args[2] = mp_const_none;
}
// for now hard-code all events to conn_handler // for now hard-code all events to conn_handler
mp_call_function_n_kw(self->conn_handler, num_of_args, 0, args); mp_call_function_n_kw(self->conn_handler, num_of_args, 0, args);
}
(void)self; (void)self;
} }
@ -78,6 +80,10 @@ STATIC mp_obj_t ubluepy_peripheral_make_new(const mp_obj_type_t *type, size_t n_
sd_event_handler_set(MP_OBJ_FROM_PTR(s), event_handler); sd_event_handler_set(MP_OBJ_FROM_PTR(s), event_handler);
s->delegate = mp_const_none;
s->conn_handler = mp_const_none;
s->notif_handler = mp_const_none;
return MP_OBJ_FROM_PTR(s); return MP_OBJ_FROM_PTR(s);
} }