summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAyke van Laethem <aykevanlaethem@gmail.com>2018-08-02 18:51:34 +0200
committerDamien George <damien.p.george@gmail.com>2019-01-31 17:31:58 +1100
commit2d293873a6be67b43c4315d70418138a95edb8ff (patch)
tree073608611eb24c0fb1976bcb9f89fd271ced639a
parent4e1c2fc8318480dded4a4a031a9986d8db578030 (diff)
nrf/pin: Cleanup Pin.__str__ to print relevant information.
Code size change: nrf51: -44 nrf52: -52
-rw-r--r--ports/nrf/modules/machine/pin.c58
1 files changed, 2 insertions, 56 deletions
diff --git a/ports/nrf/modules/machine/pin.c b/ports/nrf/modules/machine/pin.c
index d3458d0ae..12bc9b0c6 100644
--- a/ports/nrf/modules/machine/pin.c
+++ b/ports/nrf/modules/machine/pin.c
@@ -215,62 +215,8 @@ const pin_obj_t *pin_find(mp_obj_t user_obj) {
STATIC void pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
pin_obj_t *self = self_in;
- // pin name
- mp_printf(print, "Pin(Pin.cpu.%q, mode=Pin.", self->name);
- mp_printf(print, "port=0x%x, ", self->pin / 32);
- mp_printf(print, "pin=0x%x, ", self->pin);
-/*
- uint32_t mode = pin_get_mode(self);
-
- if (mode == GPIO_MODE_ANALOG) {
- // analog
- mp_print_str(print, "ANALOG)");
-
- } else {
- // IO mode
- bool af = false;
- qstr mode_qst;
- if (mode == GPIO_MODE_INPUT) {
- mode_qst = MP_QSTR_IN;
- } else if (mode == GPIO_MODE_OUTPUT_PP) {
- mode_qst = MP_QSTR_OUT;
- } else if (mode == GPIO_MODE_OUTPUT_OD) {
- mode_qst = MP_QSTR_OPEN_DRAIN;
- } else {
- af = true;
- if (mode == GPIO_MODE_AF_PP) {
- mode_qst = MP_QSTR_ALT;
- } else {
- mode_qst = MP_QSTR_ALT_OPEN_DRAIN;
- }
- }
- mp_print_str(print, qstr_str(mode_qst));
- // pull mode
- qstr pull_qst = MP_QSTR_NULL;
- uint32_t pull = pin_get_pull(self);
- if (pull == GPIO_PULLUP) {
- pull_qst = MP_QSTR_PULL_UP;
- } else if (pull == GPIO_PULLDOWN) {
- pull_qst = MP_QSTR_PULL_DOWN;
- }
- if (pull_qst != MP_QSTR_NULL) {
- mp_printf(print, ", pull=Pin.%q", pull_qst);
- }
- // AF mode
- if (af) {
- mp_uint_t af_idx = pin_get_af(self);
- const pin_af_obj_t *af_obj = pin_find_af_by_index(self, af_idx);
- if (af_obj == NULL) {
- mp_printf(print, ", af=%d)", af_idx);
- } else {
- mp_printf(print, ", af=Pin.%q)", af_obj->name);
- }
- } else {
-*/
- mp_print_str(print, ")");
- /* }
- }*/
-
+ mp_printf(print, "Pin(%d, mode=%s)", self->pin,
+ (nrf_gpio_pin_dir_get(self->pin) == NRF_GPIO_PIN_DIR_OUTPUT) ? "OUT" : "IN");
}
STATIC mp_obj_t pin_obj_init_helper(const pin_obj_t *pin, mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kw_args);