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

zephyr: Update machine.Pin class to use new zephyr gpio api.

Browse Source 
Zephyr v2.2 reworked its gpio api to support linux device tree bindings and
pin logical levels.  This commit updates the zephyr port's machine.Pin
class to replace the deprecated gpio api calls with the new supported gpio
api.  This resolves several build warnings.

Tested on frdm_k64f and mimxrt1050_evk boards.
This commit is contained in:
Maureen Helm 2020-03-19 13:22:18 -05:00 committed by Damien George
parent 40255aff23
commit 76a5b3a97a
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ports/zephyr/machine_pin.c
View File

@ -61,19 +61,20 @@ STATIC mp_obj_t machine_pin_obj_init_helper(machine_pin_obj_t *self, size_t n_ar
uint mode = args[ARG_mode].u_int; uint mode = args[ARG_mode].u_int;
// get pull mode // get pull mode
uint pull = GPIO_PUD_NORMAL; uint pull = 0;
if (args[ARG_pull].u_obj != mp_const_none) { if (args[ARG_pull].u_obj != mp_const_none) {
pull = mp_obj_get_int(args[ARG_pull].u_obj); pull = mp_obj_get_int(args[ARG_pull].u_obj);
} }
int ret = gpio_pin_configure(self->port, self->pin, mode | pull); // get initial value
if (ret) { uint init = 0;
mp_raise_ValueError("invalid pin"); if (args[ARG_value].u_obj != MP_OBJ_NULL) {
init = mp_obj_is_true(args[ARG_value].u_obj) ? GPIO_OUTPUT_INIT_HIGH : GPIO_OUTPUT_INIT_LOW;
} }
// get initial value int ret = gpio_pin_configure(self->port, self->pin, mode | pull | init);
if (args[ARG_value].u_obj != MP_OBJ_NULL) { if (ret) {
(void)gpio_pin_write(self->port, self->pin, mp_obj_is_true(args[ARG_value].u_obj)); mp_raise_ValueError("invalid pin");
} }
return mp_const_none; return mp_const_none;
@ -116,11 +117,10 @@ STATIC mp_obj_t machine_pin_call(mp_obj_t self_in, size_t n_args, size_t n_kw, c
mp_arg_check_num(n_args, n_kw, 0, 1, false); mp_arg_check_num(n_args, n_kw, 0, 1, false);
machine_pin_obj_t *self = self_in; machine_pin_obj_t *self = self_in;
if (n_args == 0) { if (n_args == 0) {
u32_t pin_val; int pin_val = gpio_pin_get_raw(self->port, self->pin);
(void)gpio_pin_read(self->port, self->pin, &pin_val);
return MP_OBJ_NEW_SMALL_INT(pin_val); return MP_OBJ_NEW_SMALL_INT(pin_val);
} else { } else {
(void)gpio_pin_write(self->port, self->pin, mp_obj_is_true(args[0])); (void)gpio_pin_set_raw(self->port, self->pin, mp_obj_is_true(args[0]));
return mp_const_none; return mp_const_none;
} }
} }
@ -139,14 +139,14 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pin_value_obj, 1, 2, machine_
STATIC mp_obj_t machine_pin_off(mp_obj_t self_in) { STATIC mp_obj_t machine_pin_off(mp_obj_t self_in) {
machine_pin_obj_t *self = self_in; machine_pin_obj_t *self = self_in;
(void)gpio_pin_write(self->port, self->pin, 0); (void)gpio_pin_set_raw(self->port, self->pin, 0);
return mp_const_none; return mp_const_none;
} }
STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_off_obj, machine_pin_off); STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_off_obj, machine_pin_off);
STATIC mp_obj_t machine_pin_on(mp_obj_t self_in) { STATIC mp_obj_t machine_pin_on(mp_obj_t self_in) {
machine_pin_obj_t *self = self_in; machine_pin_obj_t *self = self_in;
(void)gpio_pin_write(self->port, self->pin, 1); (void)gpio_pin_set_raw(self->port, self->pin, 1);
return mp_const_none; return mp_const_none;
} }
STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_on_obj, machine_pin_on); STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_on_obj, machine_pin_on);
@ -157,13 +157,10 @@ STATIC mp_uint_t machine_pin_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_
switch (request) { switch (request) {
case MP_PIN_READ: { case MP_PIN_READ: {
u32_t pin_val; return gpio_pin_get_raw(self->port, self->pin);
gpio_pin_read(self->port, self->pin, &pin_val);
return pin_val;
} }
case MP_PIN_WRITE: { case MP_PIN_WRITE: {
gpio_pin_write(self->port, self->pin, arg); return gpio_pin_set_raw(self->port, self->pin, arg);
return 0;
} }
} }
return -1; return -1;
@ -177,10 +174,10 @@ STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
{ MP_ROM_QSTR(MP_QSTR_on), MP_ROM_PTR(&machine_pin_on_obj) }, { MP_ROM_QSTR(MP_QSTR_on), MP_ROM_PTR(&machine_pin_on_obj) },
// class constants // class constants
{ MP_ROM_QSTR(MP_QSTR_IN), MP_ROM_INT(GPIO_DIR_IN) }, { MP_ROM_QSTR(MP_QSTR_IN), MP_ROM_INT(GPIO_INPUT) },
{ MP_ROM_QSTR(MP_QSTR_OUT), MP_ROM_INT(GPIO_DIR_OUT) }, { MP_ROM_QSTR(MP_QSTR_OUT), MP_ROM_INT(GPIO_OUTPUT) },
{ MP_ROM_QSTR(MP_QSTR_PULL_UP), MP_ROM_INT(GPIO_PUD_PULL_UP) }, { MP_ROM_QSTR(MP_QSTR_PULL_UP), MP_ROM_INT(GPIO_PULL_UP) },
{ MP_ROM_QSTR(MP_QSTR_PULL_DOWN), MP_ROM_INT(GPIO_PUD_PULL_DOWN) }, { MP_ROM_QSTR(MP_QSTR_PULL_DOWN), MP_ROM_INT(GPIO_PULL_DOWN) },
}; };
STATIC MP_DEFINE_CONST_DICT(machine_pin_locals_dict, machine_pin_locals_dict_table); STATIC MP_DEFINE_CONST_DICT(machine_pin_locals_dict, machine_pin_locals_dict_table);