From 4ba4c2a9428e714b53d6eeb2d6e528e572b65878 Mon Sep 17 00:00:00 2001 From: Marco van der Kolk Date: Fri, 7 Jul 2023 00:28:07 +0200 Subject: [PATCH] Renamed 'datas' to 'data_pins' to keep codespell happy Signed-off-by: Marco van der Kolk --- shared-module/keypad/ShiftRegisterKeys.c | 17 ++++++----------- shared-module/keypad/ShiftRegisterKeys.h | 2 +- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/shared-module/keypad/ShiftRegisterKeys.c b/shared-module/keypad/ShiftRegisterKeys.c index ee42c2c4b3..ae5fa35636 100644 --- a/shared-module/keypad/ShiftRegisterKeys.c +++ b/shared-module/keypad/ShiftRegisterKeys.c @@ -70,7 +70,7 @@ void common_hal_keypad_shiftregisterkeys_construct(keypad_shiftregisterkeys_obj_ } // Allocate a tuple object with the data pins - self->data = mp_obj_new_tuple(num_data_pins, dios); + self->data_pins = mp_obj_new_tuple(num_data_pins, dios); self->key_counts = (mp_uint_t *)gc_alloc(sizeof(mp_uint_t) * num_key_counts, false, false); self->num_key_counts = num_key_counts; @@ -109,18 +109,13 @@ void common_hal_keypad_shiftregisterkeys_deinit(keypad_shiftregisterkeys_obj_t * common_hal_digitalio_digitalinout_deinit(self->clock); self->clock = MP_ROM_NONE; -/* - common_hal_digitalio_digitalinout_deinit(self->data); - self->data = MP_ROM_NONE; -*/ - common_hal_digitalio_digitalinout_deinit(self->latch); self->latch = MP_ROM_NONE; - for (size_t key = 0; key < self->datas->len; key++) { - common_hal_digitalio_digitalinout_deinit(self->datas->items[key]); + for (size_t key = 0; key < self->data_pins->len; key++) { + common_hal_digitalio_digitalinout_deinit(self->data_pins->items[key]); } - self->data = MP_ROM_NONE; + self->data_pins = MP_ROM_NONE; common_hal_keypad_deinit_core(self); } @@ -153,7 +148,7 @@ static void shiftregisterkeys_scan_now(void *self_in, mp_obj_t timestamp) { // Loop through all the data pins that share the latch mp_uint_t index = 0; - for (mp_uint_t i = 0; i < self->datas->len; i++) { + for (mp_uint_t i = 0; i < self->data_pins->len; i++) { // When this data pin has less shiftable bits, ignore it if (scan_number >= self->key_counts[i]) { @@ -168,7 +163,7 @@ static void shiftregisterkeys_scan_now(void *self_in, mp_obj_t timestamp) { // Get the current state. const bool current = - common_hal_digitalio_digitalinout_get_value(self->datas->items[i]) == self->value_when_pressed; + common_hal_digitalio_digitalinout_get_value(self->data_pins->items[i]) == self->value_when_pressed; self->currently_pressed[key_number] = current; // Record any transitions. diff --git a/shared-module/keypad/ShiftRegisterKeys.h b/shared-module/keypad/ShiftRegisterKeys.h index 9ce9692cda..0c2ccfb63b 100644 --- a/shared-module/keypad/ShiftRegisterKeys.h +++ b/shared-module/keypad/ShiftRegisterKeys.h @@ -38,7 +38,7 @@ typedef struct { KEYPAD_SCANNER_COMMON_FIELDS; digitalio_digitalinout_obj_t *clock; digitalio_digitalinout_obj_t *latch; - mp_obj_tuple_t *data; + mp_obj_tuple_t *data_pins; mp_uint_t *key_counts; mp_uint_t num_key_counts; mp_uint_t max_key_count;