Skip to content

Commit 83e1b5b

Browse files
dhalbertdhalbert
authored
Merge pull request #6248 from jepler/refactor-keypad
refactor keypad to share more code; fix initial keys pressed
2 parents 359d8e5 + d7c86c0 commit 83e1b5b

File tree

18 files changed

+214
-366
lines changed

18 files changed

+214
-366
lines changed

‎locale/circuitpython.pot

Lines changed: 2 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -4067,63 +4067,8 @@ msgstr ""
40674067
msgid "pow() with 3 arguments requires integers"
40684068
msgstr ""
40694069

4070-
#: ports/espressif/boards/adafruit_esp32s2_camera/mpconfigboard.h
4071-
#: ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.h
4072-
#: ports/espressif/boards/adafruit_feather_esp32s2_tft/mpconfigboard.h
4073-
#: ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h
4074-
#: ports/espressif/boards/adafruit_funhouse/mpconfigboard.h
4075-
#: ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h
4076-
#: ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h
4077-
#: ports/espressif/boards/adafruit_qtpy_esp32s2/mpconfigboard.h
4078-
#: ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h
4079-
#: ports/espressif/boards/ai_thinker_esp32-c3s-2m/mpconfigboard.h
4080-
#: ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h
4081-
#: ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h
4082-
#: ports/espressif/boards/artisense_rd00/mpconfigboard.h
4083-
#: ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.h
4084-
#: ports/espressif/boards/crumpspace_crumps2/mpconfigboard.h
4085-
#: ports/espressif/boards/electroniccats_bastwifi/mpconfigboard.h
4086-
#: ports/espressif/boards/espressif_esp32c3_devkitm_1_n4/mpconfigboard.h
4087-
#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4/mpconfigboard.h
4088-
#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n4r2/mpconfigboard.h
4089-
#: ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.h
4090-
#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8/mpconfigboard.h
4091-
#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2/mpconfigboard.h
4092-
#: ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r8/mpconfigboard.h
4093-
#: ports/espressif/boards/espressif_esp32s3_devkitm_1_n8/mpconfigboard.h
4094-
#: ports/espressif/boards/espressif_hmi_devkit_1/mpconfigboard.h
4095-
#: ports/espressif/boards/espressif_kaluga_1.3/mpconfigboard.h
4096-
#: ports/espressif/boards/espressif_kaluga_1/mpconfigboard.h
4097-
#: ports/espressif/boards/espressif_saola_1_wroom/mpconfigboard.h
4098-
#: ports/espressif/boards/espressif_saola_1_wrover/mpconfigboard.h
4099-
#: ports/espressif/boards/franzininho_wifi_wroom/mpconfigboard.h
4100-
#: ports/espressif/boards/franzininho_wifi_wrover/mpconfigboard.h
4101-
#: ports/espressif/boards/gravitech_cucumber_m/mpconfigboard.h
4102-
#: ports/espressif/boards/gravitech_cucumber_ms/mpconfigboard.h
4103-
#: ports/espressif/boards/gravitech_cucumber_r/mpconfigboard.h
4104-
#: ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h
4105-
#: ports/espressif/boards/hexky_s2/mpconfigboard.h
4106-
#: ports/espressif/boards/hiibot_iots2/mpconfigboard.h
4107-
#: ports/espressif/boards/lilygo_ttgo_t8_esp32_s2_wroom/mpconfigboard.h
4108-
#: ports/espressif/boards/lilygo_ttgo_t8_s2/mpconfigboard.h
4109-
#: ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h
4110-
#: ports/espressif/boards/lolin_s2_mini/mpconfigboard.h
4111-
#: ports/espressif/boards/lolin_s2_pico/mpconfigboard.h
4112-
#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
4113-
#: ports/espressif/boards/microdev_micro_s2/mpconfigboard.h
4114-
#: ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.h
4115-
#: ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h
4116-
#: ports/espressif/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h
4117-
#: ports/espressif/boards/odt_pixelwing_esp32_s2/mpconfigboard.h
4118-
#: ports/espressif/boards/targett_module_clip_wroom/mpconfigboard.h
4119-
#: ports/espressif/boards/targett_module_clip_wrover/mpconfigboard.h
4120-
#: ports/espressif/boards/unexpectedmaker_feathers2/mpconfigboard.h
4121-
#: ports/espressif/boards/unexpectedmaker_feathers2_neo/mpconfigboard.h
4122-
#: ports/espressif/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
4123-
#: ports/espressif/boards/unexpectedmaker_feathers3/mpconfigboard.h
4124-
#: ports/espressif/boards/unexpectedmaker_pros3/mpconfigboard.h
4125-
#: ports/espressif/boards/unexpectedmaker_tinys2/mpconfigboard.h
4126-
#: ports/espressif/boards/unexpectedmaker_tinys3/mpconfigboard.h
4070+
#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
4071+
#: supervisor/shared/safe_mode.c
41274072
msgid "pressing boot button at start up.\n"
41284073
msgstr ""
41294074

‎shared-bindings/keypad/KeyMatrix.c

Lines changed: 6 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include "py/binary.h"
2929
#include "py/objproperty.h"
3030
#include "py/runtime.h"
31+
#include "shared-bindings/keypad/__init__.h"
3132
#include "shared-bindings/keypad/Event.h"
3233
#include "shared-bindings/keypad/KeyMatrix.h"
3334
#include "shared-bindings/microcontroller/Pin.h"
@@ -138,7 +139,7 @@ STATIC mp_obj_t keypad_keymatrix___exit__(size_t n_args, const mp_obj_t *args) {
138139
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(keypad_keymatrix___exit___obj, 4, 4, keypad_keymatrix___exit__);
139140

140141
STATIC void check_for_deinit(keypad_keymatrix_obj_t *self) {
141-
if (common_hal_keypad_keymatrix_deinited(self)) {
142+
if (common_hal_keypad_deinited(self)) {
142143
raise_deinited_error();
143144
}
144145
}
@@ -150,33 +151,11 @@ STATIC void check_for_deinit(keypad_keymatrix_obj_t *self) {
150151
//| """
151152
//| ...
152153
//|
153-
STATIC mp_obj_t keypad_keymatrix_reset(mp_obj_t self_in) {
154-
keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in);
155-
check_for_deinit(self);
156-
157-
common_hal_keypad_keymatrix_reset(self);
158-
return MP_ROM_NONE;
159-
}
160-
MP_DEFINE_CONST_FUN_OBJ_1(keypad_keymatrix_reset_obj, keypad_keymatrix_reset);
161154

162155
//| key_count: int
163156
//| """The number of keys that are being scanned. (read-only)
164157
//| """
165158
//|
166-
STATIC mp_obj_t keypad_keymatrix_get_key_count(mp_obj_t self_in) {
167-
keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in);
168-
check_for_deinit(self);
169-
170-
return MP_OBJ_NEW_SMALL_INT(common_hal_keypad_keymatrix_get_key_count(self));
171-
}
172-
MP_DEFINE_CONST_FUN_OBJ_1(keypad_keymatrix_get_key_count_obj, keypad_keymatrix_get_key_count);
173-
174-
const mp_obj_property_t keypad_keymatrix_key_count_obj = {
175-
.base.type = &mp_type_property,
176-
.proxy = {(mp_obj_t)&keypad_keymatrix_get_key_count_obj,
177-
MP_ROM_NONE,
178-
MP_ROM_NONE},
179-
};
180159

181160
//| def key_number_to_row_column(self, row: int, column: int) -> Tuple[int]:
182161
//| """Return the row and column for the given key number.
@@ -194,7 +173,7 @@ STATIC mp_obj_t keypad_keymatrix_key_number_to_row_column(mp_obj_t self_in, mp_o
194173

195174
const mp_uint_t key_number = (mp_uint_t)mp_arg_validate_int_range(
196175
mp_obj_get_int(key_number_in),
197-
0, (mp_int_t)common_hal_keypad_keymatrix_get_key_count(self),
176+
0, (mp_int_t)common_hal_keypad_generic_get_key_count(self),
198177
MP_QSTR_key_number);
199178

200179
mp_uint_t row;
@@ -234,29 +213,15 @@ MP_DEFINE_CONST_FUN_OBJ_3(keypad_keymatrix_row_column_to_key_number_obj, keypad_
234213
//| """The `EventQueue` associated with this `Keys` object. (read-only)
235214
//| """
236215
//|
237-
STATIC mp_obj_t keypad_keymatrix_get_events(mp_obj_t self_in) {
238-
keypad_keymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in);
239-
check_for_deinit(self);
240-
241-
return common_hal_keypad_keymatrix_get_events(self);
242-
}
243-
MP_DEFINE_CONST_FUN_OBJ_1(keypad_keymatrix_get_events_obj, keypad_keymatrix_get_events);
244-
245-
const mp_obj_property_t keypad_keymatrix_events_obj = {
246-
.base.type = &mp_type_property,
247-
.proxy = {(mp_obj_t)&keypad_keymatrix_get_events_obj,
248-
MP_ROM_NONE,
249-
MP_ROM_NONE},
250-
};
251216

252217
STATIC const mp_rom_map_elem_t keypad_keymatrix_locals_dict_table[] = {
253218
{ MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&keypad_keymatrix_deinit_obj) },
254219
{ MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) },
255220
{ MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&keypad_keymatrix___exit___obj) },
256221

257-
{ MP_ROM_QSTR(MP_QSTR_events), MP_ROM_PTR(&keypad_keymatrix_events_obj) },
258-
{ MP_ROM_QSTR(MP_QSTR_key_count), MP_ROM_PTR(&keypad_keymatrix_key_count_obj) },
259-
{ MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&keypad_keymatrix_reset_obj) },
222+
{ MP_ROM_QSTR(MP_QSTR_events), MP_ROM_PTR(&keypad_generic_events_obj) },
223+
{ MP_ROM_QSTR(MP_QSTR_key_count), MP_ROM_PTR(&keypad_generic_key_count_obj) },
224+
{ MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&keypad_generic_reset_obj) },
260225
{ MP_ROM_QSTR(MP_QSTR_key_number_to_row_column), MP_ROM_PTR(&keypad_keymatrix_key_number_to_row_column_obj) },
261226
{ MP_ROM_QSTR(MP_QSTR_row_column_to_key_number), MP_ROM_PTR(&keypad_keymatrix_row_column_to_key_number_obj) },
262227
};

‎shared-bindings/keypad/KeyMatrix.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,11 @@ extern const mp_obj_type_t keypad_keymatrix_type;
3535
void common_hal_keypad_keymatrix_construct(keypad_keymatrix_obj_t *self, mp_uint_t num_row_pins, const mcu_pin_obj_t *row_pins[], mp_uint_t num_column_pins, const mcu_pin_obj_t *column_pins[], bool columns_to_anodes, mp_float_t interval, size_t max_events);
3636

3737
void common_hal_keypad_keymatrix_deinit(keypad_keymatrix_obj_t *self);
38-
bool common_hal_keypad_keymatrix_deinited(keypad_keymatrix_obj_t *self);
3938

4039
void common_hal_keypad_keymatrix_key_number_to_row_column(keypad_keymatrix_obj_t *self, mp_uint_t key_number, mp_uint_t *row, mp_uint_t *column);
4140
mp_uint_t common_hal_keypad_keymatrix_row_column_to_key_number(keypad_keymatrix_obj_t *self, mp_uint_t row, mp_uint_t column);
4241

43-
size_t common_hal_keypad_keymatrix_get_key_count(keypad_keymatrix_obj_t *self);
4442
size_t common_hal_keypad_keymatrix_get_column_count(keypad_keymatrix_obj_t *self);
4543
size_t common_hal_keypad_keymatrix_get_row_count(keypad_keymatrix_obj_t *self);
4644

47-
mp_obj_t common_hal_keypad_keymatrix_get_events(keypad_keymatrix_obj_t *self);
48-
void common_hal_keypad_keymatrix_reset(keypad_keymatrix_obj_t *self);
49-
5045
#endif // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_KEYMATRIX_H

‎shared-bindings/keypad/Keys.c

Lines changed: 4 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include "py/binary.h"
2929
#include "py/objproperty.h"
3030
#include "py/runtime.h"
31+
#include "shared-bindings/keypad/__init__.h"
3132
#include "shared-bindings/keypad/Event.h"
3233
#include "shared-bindings/keypad/Keys.h"
3334
#include "shared-bindings/microcontroller/Pin.h"
@@ -129,11 +130,6 @@ STATIC mp_obj_t keypad_keys___exit__(size_t n_args, const mp_obj_t *args) {
129130
}
130131
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(keypad_keys___exit___obj, 4, 4, keypad_keys___exit__);
131132

132-
STATIC void check_for_deinit(keypad_keys_obj_t *self) {
133-
if (common_hal_keypad_keys_deinited(self)) {
134-
raise_deinited_error();
135-
}
136-
}
137133

138134
//| def reset(self) -> None:
139135
//| """Reset the internal state of the scanner to assume that all keys are now released.
@@ -142,61 +138,24 @@ STATIC void check_for_deinit(keypad_keys_obj_t *self) {
142138
//| """
143139
//| ...
144140
//|
145-
STATIC mp_obj_t keypad_keys_reset(mp_obj_t self_in) {
146-
keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
147-
check_for_deinit(self);
148-
149-
common_hal_keypad_keys_reset(self);
150-
return MP_ROM_NONE;
151-
}
152-
MP_DEFINE_CONST_FUN_OBJ_1(keypad_keys_reset_obj, keypad_keys_reset);
153141

154142
//| key_count: int
155143
//| """The number of keys that are being scanned. (read-only)
156144
//| """
157145
//|
158-
STATIC mp_obj_t keypad_keys_get_key_count(mp_obj_t self_in) {
159-
keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
160-
check_for_deinit(self);
161-
162-
return MP_OBJ_NEW_SMALL_INT(common_hal_keypad_keys_get_key_count(self));
163-
}
164-
MP_DEFINE_CONST_FUN_OBJ_1(keypad_keys_get_key_count_obj, keypad_keys_get_key_count);
165-
166-
const mp_obj_property_t keypad_keys_key_count_obj = {
167-
.base.type = &mp_type_property,
168-
.proxy = {(mp_obj_t)&keypad_keys_get_key_count_obj,
169-
MP_ROM_NONE,
170-
MP_ROM_NONE},
171-
};
172146

173147
//| events: EventQueue
174148
//| """The `EventQueue` associated with this `Keys` object. (read-only)
175149
//| """
176150
//|
177-
STATIC mp_obj_t keypad_keys_get_events(mp_obj_t self_in) {
178-
keypad_keys_obj_t *self = MP_OBJ_TO_PTR(self_in);
179-
check_for_deinit(self);
180-
181-
return common_hal_keypad_keys_get_events(self);
182-
}
183-
MP_DEFINE_CONST_FUN_OBJ_1(keypad_keys_get_events_obj, keypad_keys_get_events);
184-
185-
const mp_obj_property_t keypad_keys_events_obj = {
186-
.base.type = &mp_type_property,
187-
.proxy = {(mp_obj_t)&keypad_keys_get_events_obj,
188-
MP_ROM_NONE,
189-
MP_ROM_NONE},
190-
};
191-
192151
STATIC const mp_rom_map_elem_t keypad_keys_locals_dict_table[] = {
193152
{ MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&keypad_keys_deinit_obj) },
194153
{ MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) },
195154
{ MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&keypad_keys___exit___obj) },
196155

197-
{ MP_ROM_QSTR(MP_QSTR_events), MP_ROM_PTR(&keypad_keys_events_obj) },
198-
{ MP_ROM_QSTR(MP_QSTR_key_count), MP_ROM_PTR(&keypad_keys_key_count_obj) },
199-
{ MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&keypad_keys_reset_obj) },
156+
{ MP_ROM_QSTR(MP_QSTR_events), MP_ROM_PTR(&keypad_generic_events_obj) },
157+
{ MP_ROM_QSTR(MP_QSTR_key_count), MP_ROM_PTR(&keypad_generic_key_count_obj) },
158+
{ MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&keypad_generic_reset_obj) },
200159
};
201160

202161
STATIC MP_DEFINE_CONST_DICT(keypad_keys_locals_dict, keypad_keys_locals_dict_table);

‎shared-bindings/keypad/Keys.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,5 @@ extern const mp_obj_type_t keypad_keys_type;
3535
void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pins, const mcu_pin_obj_t *pins[], bool value_when_pressed, bool pull, mp_float_t interval, size_t max_events);
3636

3737
void common_hal_keypad_keys_deinit(keypad_keys_obj_t *self);
38-
bool common_hal_keypad_keys_deinited(keypad_keys_obj_t *self);
39-
40-
mp_obj_t common_hal_keypad_keys_get_events(keypad_keys_obj_t *self);
41-
size_t common_hal_keypad_keys_get_key_count(keypad_keys_obj_t *self);
42-
void common_hal_keypad_keys_reset(keypad_keys_obj_t *self);
4338

4439
#endif // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_KEYS_H

‎shared-bindings/keypad/ShiftRegisterKeys.c

Lines changed: 4 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include "py/binary.h"
2929
#include "py/objproperty.h"
3030
#include "py/runtime.h"
31+
#include "shared-bindings/keypad/__init__.h"
3132
#include "shared-bindings/keypad/Event.h"
3233
#include "shared-bindings/keypad/ShiftRegisterKeys.h"
3334
#include "shared-bindings/microcontroller/Pin.h"
@@ -133,74 +134,32 @@ STATIC mp_obj_t keypad_shiftregisterkeys___exit__(size_t n_args, const mp_obj_t
133134
}
134135
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(keypad_shiftregisterkeys___exit___obj, 4, 4, keypad_shiftregisterkeys___exit__);
135136

136-
STATIC void check_for_deinit(keypad_shiftregisterkeys_obj_t *self) {
137-
if (common_hal_keypad_shiftregisterkeys_deinited(self)) {
138-
raise_deinited_error();
139-
}
140-
}
141-
142137
//| def reset(self) -> None:
143138
//| """Reset the internal state of the scanner to assume that all keys are now released.
144139
//| Any key that is already pressed at the time of this call will therefore immediately cause
145140
//| a new key-pressed event to occur.
146141
//| """
147142
//| ...
148143
//|
149-
STATIC mp_obj_t keypad_shiftregisterkeys_reset(mp_obj_t self_in) {
150-
keypad_shiftregisterkeys_obj_t *self = MP_OBJ_TO_PTR(self_in);
151-
check_for_deinit(self);
152-
153-
common_hal_keypad_shiftregisterkeys_reset(self);
154-
return MP_ROM_NONE;
155-
}
156-
MP_DEFINE_CONST_FUN_OBJ_1(keypad_shiftregisterkeys_reset_obj, keypad_shiftregisterkeys_reset);
157144

158145
//| key_count: int
159146
//| """The number of keys that are being scanned. (read-only)
160147
//| """
161148
//|
162-
STATIC mp_obj_t keypad_shiftregisterkeys_get_key_count(mp_obj_t self_in) {
163-
keypad_shiftregisterkeys_obj_t *self = MP_OBJ_TO_PTR(self_in);
164-
check_for_deinit(self);
165-
166-
return MP_OBJ_NEW_SMALL_INT(common_hal_keypad_shiftregisterkeys_get_key_count(self));
167-
}
168-
MP_DEFINE_CONST_FUN_OBJ_1(keypad_shiftregisterkeys_get_key_count_obj, keypad_shiftregisterkeys_get_key_count);
169-
170-
const mp_obj_property_t keypad_shiftregisterkeys_key_count_obj = {
171-
.base.type = &mp_type_property,
172-
.proxy = {(mp_obj_t)&keypad_shiftregisterkeys_get_key_count_obj,
173-
MP_ROM_NONE,
174-
MP_ROM_NONE},
175-
};
176149

177150
//| events: EventQueue
178151
//| """The `EventQueue` associated with this `Keys` object. (read-only)
179152
//| """
180153
//|
181-
STATIC mp_obj_t keypad_shiftregisterkeys_get_events(mp_obj_t self_in) {
182-
keypad_shiftregisterkeys_obj_t *self = MP_OBJ_TO_PTR(self_in);
183-
check_for_deinit(self);
184-
185-
return common_hal_keypad_shiftregisterkeys_get_events(self);
186-
}
187-
MP_DEFINE_CONST_FUN_OBJ_1(keypad_shiftregisterkeys_get_events_obj, keypad_shiftregisterkeys_get_events);
188-
189-
const mp_obj_property_t keypad_shiftregisterkeys_events_obj = {
190-
.base.type = &mp_type_property,
191-
.proxy = {(mp_obj_t)&keypad_shiftregisterkeys_get_events_obj,
192-
MP_ROM_NONE,
193-
MP_ROM_NONE},
194-
};
195154

196155
STATIC const mp_rom_map_elem_t keypad_shiftregisterkeys_locals_dict_table[] = {
197156
{ MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&keypad_shiftregisterkeys_deinit_obj) },
198157
{ MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) },
199158
{ MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&keypad_shiftregisterkeys___exit___obj) },
200159

201-
{ MP_ROM_QSTR(MP_QSTR_events), MP_ROM_PTR(&keypad_shiftregisterkeys_events_obj) },
202-
{ MP_ROM_QSTR(MP_QSTR_key_count), MP_ROM_PTR(&keypad_shiftregisterkeys_key_count_obj) },
203-
{ MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&keypad_shiftregisterkeys_reset_obj) },
160+
{ MP_ROM_QSTR(MP_QSTR_events), MP_ROM_PTR(&keypad_generic_events_obj) },
161+
{ MP_ROM_QSTR(MP_QSTR_key_count), MP_ROM_PTR(&keypad_generic_key_count_obj) },
162+
{ MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&keypad_generic_reset_obj) },
204163
};
205164

206165
STATIC MP_DEFINE_CONST_DICT(keypad_shiftregisterkeys_locals_dict, keypad_shiftregisterkeys_locals_dict_table);

‎shared-bindings/keypad/ShiftRegisterKeys.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,5 @@ extern const mp_obj_type_t keypad_shiftregisterkeys_type;
3535
void common_hal_keypad_shiftregisterkeys_construct(keypad_shiftregisterkeys_obj_t *self, const mcu_pin_obj_t *clock_pin, const mcu_pin_obj_t *data_pin, const mcu_pin_obj_t *latch_pin, bool value_to_latch, size_t key_count, bool value_when_pressed, mp_float_t interval, size_t max_events);
3636

3737
void common_hal_keypad_shiftregisterkeys_deinit(keypad_shiftregisterkeys_obj_t *self);
38-
bool common_hal_keypad_shiftregisterkeys_deinited(keypad_shiftregisterkeys_obj_t *self);
39-
40-
mp_obj_t common_hal_keypad_shiftregisterkeys_get_events(keypad_shiftregisterkeys_obj_t *self);
41-
size_t common_hal_keypad_shiftregisterkeys_get_key_count(keypad_shiftregisterkeys_obj_t *self);
42-
void common_hal_keypad_shiftregisterkeys_reset(keypad_shiftregisterkeys_obj_t *self);
4338

4439
#endif // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_SHIFTREGISTERKEYS_H

0 commit comments

Comments
 (0)