StackRduino
diff --git a/‎shared-module/gamepad/GamePad.c‎
Lines changed: 7 additions & 1 deletion b/‎shared-module/gamepad/GamePad.c‎
Lines changed: 7 additions & 1 deletion
diff --git a/‎shared-module/gamepad/__init__.c‎
Lines changed: 4 additions & 2 deletions b/‎shared-module/gamepad/__init__.c‎
Lines changed: 4 additions & 2 deletions
@@ -31,6 +31,7 @@
 
 #include "shared-bindings/digitalio/Pull.h"
 #include "shared-bindings/digitalio/DigitalInOut.h"
+#include "shared-bindings/util.h"
 
 
 void gamepad_init(size_t n_pins, const mp_obj_t* pins) {
@@ -39,8 +40,13 @@ void gamepad_init(size_t n_pins, const mp_obj_t* pins) {
     }
     for (size_t i=0; i<n_pins; ++i) {
         digitalio_digitalinout_obj_t *pin = MP_OBJ_TO_PTR(pins[i]);
+        raise_error_if_deinited(common_hal_digitalio_digitalinout_deinited(pin));
+        digitalio_direction_t direction = common_hal_digitalio_digitalinout_get_direction(pin);
+        digitalio_pull_t pull = common_hal_digitalio_digitalinout_get_pull(pin);
+        if (direction != DIRECTION_INPUT || pull == PULL_NONE) {
+            common_hal_digitalio_digitalinout_switch_to_input(pin, PULL_UP);
+        }
         gamepad_singleton->pins[i] = pin;
-        common_hal_digitalio_digitalinout_switch_to_input(pin, PULL_UP);
     }
     gamepad_singleton->last = 0;
 }
@@ -42,8 +42,10 @@ void gamepad_tick(void) {
         if (!pin) {
             break;
         }
-        if (!common_hal_digitalio_digitalinout_get_value(pin)) {
-            gamepad_current |= 1<<i;
+        digitalio_pull_t pull = common_hal_digitalio_digitalinout_get_pull(pin);
+        bool value = common_hal_digitalio_digitalinout_get_value(pin);
+        if ((pull == PULL_UP && !value) || (pull == PULL_DOWN && value)) {
+            gamepad_current |= 1 << i;
         }
     }
     gamepad_singleton->pressed |= gamepad_singleton->last & gamepad_current;
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`
`32`	`32`	`#include "shared-bindings/digitalio/Pull.h"`
`33`	`33`	`#include "shared-bindings/digitalio/DigitalInOut.h"`
	`34`	`+#include "shared-bindings/util.h"`
`34`	`35`
`35`	`36`
`36`	`37`	`void gamepad_init(size_t n_pins, const mp_obj_t* pins) {`
`@@ -39,8 +40,13 @@ void gamepad_init(size_t n_pins, const mp_obj_t* pins) {`
`39`	`40`	`}`
`40`	`41`	`for (size_t i=0; i<n_pins; ++i) {`
`41`	`42`	`digitalio_digitalinout_obj_t *pin = MP_OBJ_TO_PTR(pins[i]);`
	`43`	`+ raise_error_if_deinited(common_hal_digitalio_digitalinout_deinited(pin));`
	`44`	`+ digitalio_direction_t direction = common_hal_digitalio_digitalinout_get_direction(pin);`
	`45`	`+ digitalio_pull_t pull = common_hal_digitalio_digitalinout_get_pull(pin);`
	`46`	`+ if (direction != DIRECTION_INPUT \|\| pull == PULL_NONE) {`
	`47`	`+ common_hal_digitalio_digitalinout_switch_to_input(pin, PULL_UP);`
	`48`	`+ }`
`42`	`49`	`gamepad_singleton->pins[i] = pin;`
`43`		`- common_hal_digitalio_digitalinout_switch_to_input(pin, PULL_UP);`
`44`	`50`	`}`
`45`	`51`	`gamepad_singleton->last = 0;`
`46`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,10 @@ void gamepad_tick(void) {`
`42`	`42`	`if (!pin) {`
`43`	`43`	`break;`
`44`	`44`	`}`
`45`		`- if (!common_hal_digitalio_digitalinout_get_value(pin)) {`
`46`		`- gamepad_current \|= 1<<i;`
	`45`	`+ digitalio_pull_t pull = common_hal_digitalio_digitalinout_get_pull(pin);`
	`46`	`+ bool value = common_hal_digitalio_digitalinout_get_value(pin);`
	`47`	`+ if ((pull == PULL_UP && !value) \|\| (pull == PULL_DOWN && value)) {`
	`48`	`+ gamepad_current \|= 1 << i;`
`47`	`49`	`}`
`48`	`50`	`}`
`49`	`51`	`gamepad_singleton->pressed \|= gamepad_singleton->last & gamepad_current;`