Disabled DemuxKeyMatrix in all atmel-samd boards. Some boards do not have enuogh flash space

CDarius · CDarius · commit d7bc2c26d736 · 2024-03-13T12:12:38.000+01:00
diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk
@@ -11,6 +11,8 @@ CIRCUITPY_ROTARYIO_SOFTENCODER = 1
 CIRCUITPY_OPTIMIZE_PROPERTY_FLASH_SIZE ?= 1
 CIRCUITPY_LTO = 1
 
+CIRCUITPY_KEYPAD_DEMUXKEYMATRIX ?= 0
+
 ######################################################################
 # Put samd21-only choices here.
 
@@ -33,7 +35,6 @@ CIRCUITPY_BUILTINS_POW3 ?= 0
 CIRCUITPY_BUSDEVICE ?= 0
 CIRCUITPY_COMPUTED_GOTO_SAVE_SPACE ?= 1
 CIRCUITPY_COUNTIO ?= 0
-CIRCUITPY_KEYPAD_DEMUXKEYMATRIX ?= 0
 # Not enough RAM for framebuffers
 CIRCUITPY_FRAMEBUFFERIO ?= 0
 CIRCUITPY_FREQUENCYIO ?= 0
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
@@ -659,7 +659,6 @@ SRC_SHARED_MODULE_ALL = \
 	keypad/Event.c \
 	keypad/EventQueue.c \
 	keypad/KeyMatrix.c \
-	keypad/DemuxKeyMatrix.c \
 	keypad/ShiftRegisterKeys.c \
 	keypad/Keys.c \
 	memorymonitor/__init__.c \
@@ -740,6 +739,11 @@ SRC_SHARED_MODULE_ALL += \
 	ssl/SSLSocket.c
 endif
 
+ifeq ($(CIRCUITPY_KEYPAD_DEMUXKEYMATRIX),1)
+SRC_SHARED_MODULE_ALL += \
+	keypad/DemuxKeyMatrix.c
+endif
+
 # If supporting _bleio via HCI, make devices/ble_hci/common-hal/_bleio be includable,
 # and use C source files in devices/ble_hci/common-hal.
 ifeq ($(CIRCUITPY_BLEIO_HCI),1)
diff --git a/shared-bindings/keypad/DemuxKeyMatrix.c b/shared-bindings/keypad/DemuxKeyMatrix.c
@@ -81,7 +81,6 @@
 //|         ...
 
 STATIC mp_obj_t keypad_demuxkeymatrix_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    #if CIRCUITPY_KEYPAD_DEMUXKEYMATRIX
     keypad_demuxkeymatrix_obj_t *self = mp_obj_malloc(keypad_demuxkeymatrix_obj_t, &keypad_demuxkeymatrix_type);
     enum { ARG_row_addr_pins, ARG_column_pins, ARG_interval, ARG_max_events };
     static const mp_arg_t allowed_args[] = {
@@ -123,13 +122,8 @@ STATIC mp_obj_t keypad_demuxkeymatrix_make_new(const mp_obj_type_t *type, size_t
 
     common_hal_keypad_demuxkeymatrix_construct(self, num_row_addr_pins, row_addr_pins_array, num_column_pins, column_pins_array, interval, max_events);
     return MP_OBJ_FROM_PTR(self);
-    #else
-    mp_raise_NotImplementedError_varg(MP_ERROR_TEXT("%q"), MP_QSTR_DemuxKeyMatrix);
-
-    #endif
 }
 
-#if CIRCUITPY_KEYPAD_DEMUXKEYMATRIX
 //|     def deinit(self) -> None:
 //|         """Stop scanning and release the pins."""
 //|         ...
@@ -242,14 +236,10 @@ STATIC const mp_rom_map_elem_t keypad_demuxkeymatrix_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(keypad_demuxkeymatrix_locals_dict, keypad_demuxkeymatrix_locals_dict_table);
 
-#endif
-
 MP_DEFINE_CONST_OBJ_TYPE(
     keypad_demuxkeymatrix_type,
     MP_QSTR_KeyMatrix,
     MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS,
-    make_new, keypad_demuxkeymatrix_make_new
-    #if CIRCUITPY_KEYPAD_DEMUXKEYMATRIX
-    , locals_dict, &keypad_demuxkeymatrix_locals_dict
-    #endif
+    make_new, keypad_demuxkeymatrix_make_new,
+    locals_dict, &keypad_demuxkeymatrix_locals_dict
     );
diff --git a/shared-bindings/keypad/__init__.c b/shared-bindings/keypad/__init__.c
@@ -101,7 +101,9 @@ STATIC mp_rom_map_elem_t keypad_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_KeyMatrix),         MP_OBJ_FROM_PTR(&keypad_keymatrix_type) },
     { MP_ROM_QSTR(MP_QSTR_Keys),              MP_OBJ_FROM_PTR(&keypad_keys_type) },
     { MP_ROM_QSTR(MP_QSTR_ShiftRegisterKeys), MP_OBJ_FROM_PTR(&keypad_shiftregisterkeys_type) },
+    #if CIRCUITPY_KEYPAD_DEMUXKEYMATRIX
     { MP_ROM_QSTR(MP_QSTR_DemuxKeyMatrix),    MP_OBJ_FROM_PTR(&keypad_demuxkeymatrix_type) },
+    #endif
 };
 
 STATIC MP_DEFINE_CONST_DICT(keypad_module_globals, keypad_module_globals_table);
