Reorganize the gamepad code

1 files changed, 6 insertions, 93 deletions

diff --git a/shared-bindings/gamepad/GamePad.c b/shared-bindings/gamepad/GamePad.c
index f189437a1..8b88471ee 100644
--- a/shared-bindings/gamepad/GamePad.c
+++ b/shared-bindings/gamepad/GamePad.c
@@ -31,19 +31,10 @@
 #include "shared-module/gamepad/__init__.h"
 #include "shared-module/gamepad/GamePad.h"
 #include "shared-bindings/digitalio/DigitalInOut.h"
-#include "shared-bindings/util.h"
 #include "supervisor/shared/translate.h"
 #include "GamePad.h"
+#include "__init__.h"
 
-STATIC digitalio_digitalinout_obj_t *validate_pin(mp_obj_t obj) {
-    if (!MP_OBJ_IS_TYPE(obj, &digitalio_digitalinout_type)) {
-        mp_raise_TypeError(translate("argument num/types mismatch"));
-    }
-    digitalio_digitalinout_obj_t *pin = MP_OBJ_TO_PTR(obj);
-    raise_error_if_deinited(
-        common_hal_digitalio_digitalinout_deinited(pin));
-    return pin;
-}
 
 //| .. currentmodule:: gamepad
 //|
@@ -109,86 +100,20 @@ STATIC mp_obj_t gamepad_make_new(const mp_obj_type_t *type, size_t n_args,
         mp_raise_TypeError(translate("argument num/types mismatch"));
     }
     for (size_t i = 0; i < n_args; ++i) {
-        validate_pin(args[i]);
+        pin_io(args[i]);
     }
     gamepad_obj_t* gamepad_singleton = MP_STATE_VM(gamepad_singleton);
-    if (!gamepad_singleton) {
+    if (!gamepad_singleton ||
+        !MP_OBJ_IS_TYPE(MP_OBJ_FROM_PTR(gamepad_singleton), &gamepad_type)) {
         gamepad_singleton = m_new_obj(gamepad_obj_t);
         gamepad_singleton->base.type = &gamepad_type;
         gamepad_singleton = gc_make_long_lived(gamepad_singleton);
         MP_STATE_VM(gamepad_singleton) = gamepad_singleton;
     }
-    for (size_t i = 0; i < 8; ++i) {
-        gamepad_singleton->pins[i] = NULL;
-    }
-    gamepad_singleton->pulls = 0;
-    for (size_t i = 0; i < n_args; ++i) {
-        digitalio_digitalinout_obj_t *pin = MP_OBJ_TO_PTR(args[i]);
-        if (common_hal_digitalio_digitalinout_get_direction(pin) !=
-            DIRECTION_INPUT) {
-            common_hal_digitalio_digitalinout_switch_to_input(pin, PULL_UP);
-        }
-        digitalio_pull_t pull = common_hal_digitalio_digitalinout_get_pull(pin);
-        if (pull == PULL_NONE) {
-            common_hal_digitalio_digitalinout_set_pull(pin, PULL_UP);
-        }
-        if (pull != PULL_DOWN) {
-            gamepad_singleton->pulls |= 1 << i;
-        }
-        gamepad_singleton->pins[i] = pin;
-    }
-    return MP_OBJ_FROM_PTR(MP_STATE_VM(gamepad_singleton));
-}
-
-
-//| .. class:: GamePadShift(data, clock, latch)
-//|
-//|     Initializes button scanning routines.
-//|
-//|     The ``data``, ``clock`` and ``latch`` parameters are ``DigitalInOut``
-//|     objects connected to the shift register controlling the buttons.
-//|
-//|     They button presses are accumulated, until the ``get_pressed`` method
-//|     is called, at which point the button state is cleared, and the new
-//|     button presses start to be recorded.
-//|
-STATIC mp_obj_t gamepadshift_make_new(const mp_obj_type_t *type, size_t n_args,
-        const mp_obj_t *pos_args, mp_map_t *kw_args) {
-
-    enum { ARG_data, ARG_clock, ARG_latch };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_data, MP_ARG_REQUIRED | MP_ARG_OBJ },
-        { MP_QSTR_clock, MP_ARG_REQUIRED | MP_ARG_OBJ},
-        { MP_QSTR_latch, MP_ARG_REQUIRED | MP_ARG_OBJ},
-    };
-    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args),
-                     allowed_args, args);
-
-    digitalio_digitalinout_obj_t *data_pin = validate_pin(args[ARG_data].u_obj);
-    digitalio_digitalinout_obj_t *clock_pin = validate_pin(args[ARG_clock].u_obj);
-    digitalio_digitalinout_obj_t *latch_pin = validate_pin(args[ARG_latch].u_obj);
-
-    gamepad_obj_t* gamepad_singleton = MP_STATE_VM(gamepad_singleton);
-    if (!gamepad_singleton) {
-        gamepad_singleton = m_new_obj(gamepad_obj_t);
-        gamepad_singleton->base.type = &gamepadshift_type;
-        gamepad_singleton = gc_make_long_lived(gamepad_singleton);
-        MP_STATE_VM(gamepad_singleton) = gamepad_singleton;
-    }
-    gamepad_singleton->pins[0] = NULL;
-    common_hal_digitalio_digitalinout_switch_to_input(data_pin, PULL_NONE);
-    gamepad_singleton->pins[1] = data_pin;
-    common_hal_digitalio_digitalinout_switch_to_output(clock_pin, 0,
-                                                       DRIVE_MODE_PUSH_PULL);
-    gamepad_singleton->pins[2] = clock_pin;
-    common_hal_digitalio_digitalinout_switch_to_output(latch_pin, 1,
-                                                       DRIVE_MODE_PUSH_PULL);
-    gamepad_singleton->pins[3] = latch_pin;
-    return MP_OBJ_FROM_PTR(MP_STATE_VM(gamepad_singleton));
+    gamepad_init(gamepad_singleton, args, n_args);
+    return MP_OBJ_FROM_PTR(gamepad_singleton);
 }
 
-
 //|     .. method:: get_pressed()
 //|
 //|         Get the status of buttons pressed since the last call and clear it.
@@ -230,15 +155,3 @@ const mp_obj_type_t gamepad_type = {
     .make_new = gamepad_make_new,
     .locals_dict = (mp_obj_dict_t*)&gamepad_locals_dict,
 };
-
-STATIC const mp_rom_map_elem_t gamepadshift_locals_dict_table[] = {
-    { MP_OBJ_NEW_QSTR(MP_QSTR_get_pressed),  MP_ROM_PTR(&gamepad_get_pressed_obj)},
-    { MP_OBJ_NEW_QSTR(MP_QSTR_deinit),  MP_ROM_PTR(&gamepad_deinit_obj)},
-};
-STATIC MP_DEFINE_CONST_DICT(gamepadshift_locals_dict, gamepadshift_locals_dict_table);
-const mp_obj_type_t gamepadshift_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_GamePadShift,
-    .make_new = gamepadshift_make_new,
-    .locals_dict = (mp_obj_dict_t*)&gamepadshift_locals_dict,
-};