Fully split gamepadshift from gamepad

5 files changed, 68 insertions, 31 deletions

diff --git a/shared-module/gamepad/__init__.c b/shared-module/gamepad/__init__.c
index 8a4f4eae9..46630fd32 100644
--- a/shared-module/gamepad/__init__.c
+++ b/shared-module/gamepad/__init__.c
@@ -30,10 +30,6 @@
 #include "shared-bindings/gamepad/__init__.h"
 #include "shared-bindings/gamepad/GamePad.h"
 
-#if CIRCUITPY_GAMEPADSHIFT
-#include "shared-bindings/gamepadshift/GamePadShift.h"
-#endif
-
 #include "shared-bindings/digitalio/DigitalInOut.h"
 
 
@@ -62,12 +58,6 @@ void gamepad_tick(void) {
         self->pressed |= self->last & current;
         self->last = current;
     }
-    #if CIRCUITPY_GAMEPADSHIFT
-    else if (MP_OBJ_IS_TYPE(MP_OBJ_FROM_PTR(singleton), &gamepadshift_type)) {
-        // buttons connected to a shift register
-        gamepadshift_tick(singleton);
-    }
-    #endif
 }
 
 void gamepad_reset(void) {
diff --git a/shared-module/gamepadshift/GamePadShift.c b/shared-module/gamepadshift/GamePadShift.c
index 1dadfb9b2..f9303938f 100644
--- a/shared-module/gamepadshift/GamePadShift.c
+++ b/shared-module/gamepadshift/GamePadShift.c
@@ -29,8 +29,8 @@
 #include "shared-module/gamepadshift/GamePadShift.h"
 
 void common_hal_gamepadshift_gamepadshift_init(gamepadshift_obj_t *gamepadshift,
-                                                digitalio_digitalinout_obj_t *data_pin,
                                                 digitalio_digitalinout_obj_t *clock_pin,
+                                                digitalio_digitalinout_obj_t *data_pin,
                                                 digitalio_digitalinout_obj_t *latch_pin) {
     common_hal_digitalio_digitalinout_switch_to_input(data_pin, PULL_NONE);
     gamepadshift->data_pin = data_pin;
@@ -45,20 +45,3 @@ void common_hal_gamepadshift_gamepadshift_init(gamepadshift_obj_t *gamepadshift,
 void common_hal_gamepadshift_gamepadshift_deinit(gamepadshift_obj_t *gamepadshift) {
     MP_STATE_VM(gamepad_singleton) = NULL;
 }
-
-void gamepadshift_tick(gamepadshift_obj_t *self) {
-    uint8_t current = 0;
-    uint8_t bit = 1;
-    common_hal_digitalio_digitalinout_set_value(self->latch_pin, 1);
-    for (int i = 0; i < 8; ++i) {
-        common_hal_digitalio_digitalinout_set_value(self->clock_pin, 0);
-        if (common_hal_digitalio_digitalinout_get_value(self->data_pin)) {
-            current |= bit;
-        }
-        common_hal_digitalio_digitalinout_set_value(self->clock_pin, 1);
-        bit <<= 1;
-    }
-    common_hal_digitalio_digitalinout_set_value(self->latch_pin, 0);
-    self->pressed |= self->last & current;
-    self->last = current;
-}
diff --git a/shared-module/gamepadshift/GamePadShift.h b/shared-module/gamepadshift/GamePadShift.h
index ccbf5ca06..b4b26b7a9 100644
--- a/shared-module/gamepadshift/GamePadShift.h
+++ b/shared-module/gamepadshift/GamePadShift.h
@@ -40,6 +40,4 @@ typedef struct {
     volatile uint8_t last;
 } gamepadshift_obj_t;
 
-void gamepadshift_tick(gamepadshift_obj_t *self);
-
 #endif  // MICROPY_INCLUDED_GAMEPADSHIFT_GAMEPADSHIFT_H
diff --git a/shared-module/gamepadshift/__init__.c b/shared-module/gamepadshift/__init__.c
index c3bb83e34..728c2187e 100644
--- a/shared-module/gamepadshift/__init__.c
+++ b/shared-module/gamepadshift/__init__.c
@@ -24,4 +24,37 @@
  * THE SOFTWARE.
  */
 
-// Nothing now.
+#include "shared-module/gamepadshift/__init__.h"
+
+#include "py/mpstate.h"
+#include "shared-bindings/gamepadshift/GamePadShift.h"
+
+void gamepadshift_tick(void) {
+    void* singleton = MP_STATE_VM(gamepad_singleton);
+    if (!singleton) {
+        return;
+    }
+
+    if (MP_OBJ_IS_TYPE(MP_OBJ_FROM_PTR(singleton), &gamepadshift_type)) {
+        // buttons connected to a shift register
+        gamepadshift_obj_t *self = MP_OBJ_TO_PTR(singleton);
+        uint8_t current = 0;
+        uint8_t bit = 1;
+        common_hal_digitalio_digitalinout_set_value(self->latch_pin, 1);
+        for (int i = 0; i < 8; ++i) {
+            common_hal_digitalio_digitalinout_set_value(self->clock_pin, 0);
+            if (common_hal_digitalio_digitalinout_get_value(self->data_pin)) {
+                current |= bit;
+            }
+            common_hal_digitalio_digitalinout_set_value(self->clock_pin, 1);
+            bit <<= 1;
+        }
+        common_hal_digitalio_digitalinout_set_value(self->latch_pin, 0);
+        self->pressed |= self->last & current;
+        self->last = current;
+    }
+}
+
+void gamepadshift_reset(void) {
+    MP_STATE_VM(gamepad_singleton) = NULL;
+}
diff --git a/shared-module/gamepadshift/__init__.h b/shared-module/gamepadshift/__init__.h
new file mode 100644
index 000000000..225db7336
--- /dev/null
+++ b/shared-module/gamepadshift/__init__.h
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_GAMEPADSHIFT___INIT___H
+#define MICROPY_INCLUDED_GAMEPADSHIFT___INIT___H
+
+void gamepadshift_tick(void);
+void gamepadshift_reset(void);
+
+#endif  // MICROPY_INCLUDED_GAMEPADSHIFT___INIT___H