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

nrf5/i2c: Updating i2c machine module with new constructor parameters to set scl and sda pins. Also updating print funciton to debug pin number and port number for the gpio set.

Browse Source
This commit is contained in:
Glenn Ruben Bakke 2017-01-29 16:38:13 +01:00
parent 1421ca4adc
commit f529aa9e67
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
nrf5/i2c.c
View File

@ -69,7 +69,12 @@ STATIC int i2c_find(mp_obj_t id) {
STATIC void i2c_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) { STATIC void i2c_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
machine_i2c_obj_t *self = o; machine_i2c_obj_t *self = o;
mp_printf(print, "I2C(%u)", self->i2c->init.id); mp_printf(print, "I2C(%u, scl=(port=%u, pin=%u), sda=(port=%u, pin=%u))",
self->i2c->init.id,
self->i2c->init.scl_pin->port,
self->i2c->init.scl_pin->pin,
self->i2c->init.sda_pin->port,
self->i2c->init.sda_pin->pin);
} }
/******************************************************************************/ /******************************************************************************/
@ -77,27 +82,39 @@ STATIC void i2c_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind)
// for make_new // for make_new
enum { enum {
ARG_NEW_id, ARG_NEW_ID,
ARG_NEW_SCL,
ARG_NEW_SDA,
}; };
STATIC mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { STATIC mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
static const mp_arg_t allowed_args[] = { static const mp_arg_t allowed_args[] = {
{ MP_QSTR_id, MP_ARG_OBJ, {.u_obj = MP_OBJ_NEW_SMALL_INT(-1)} }, { MP_QSTR_ID, MP_ARG_OBJ, {.u_obj = MP_OBJ_NEW_SMALL_INT(-1)} },
{ ARG_NEW_SCL, MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
{ ARG_NEW_SDA, MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
}; };
// parse args // parse args
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
if (args[ARG_NEW_id].u_obj == MP_OBJ_NEW_SMALL_INT(-1)) { // get static peripheral object
// index -1 does not exist int i2c_id = i2c_find(args[ARG_NEW_ID].u_obj);
return mp_const_none; const machine_i2c_obj_t *self = &machine_i2c_obj[i2c_id];
// TODO: raise exception
if (args[ARG_NEW_SCL].u_obj != MP_OBJ_NULL) {
self->i2c->init.scl_pin = args[ARG_NEW_SCL].u_obj;
} else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
"I2C SCL Pin not set"));
} }
// get static peripheral object if (args[ARG_NEW_SDA].u_obj != MP_OBJ_NULL) {
int i2c_id = i2c_find(args[ARG_NEW_id].u_obj); self->i2c->init.sda_pin = args[ARG_NEW_SDA].u_obj;
const machine_i2c_obj_t *self = &machine_i2c_obj[i2c_id]; } else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
"I2C SDA Pin not set"));
}
hal_twi_master_init(self->i2c->instance, &self->i2c->init); hal_twi_master_init(self->i2c->instance, &self->i2c->init);