diff options
| author | Scott Shawcroft <scott@adafruit.com> | 2019-06-13 12:26:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-13 12:26:04 -0700 |
| commit | 6d388a34eb909e27acd508dc001ae1fe94a530de (patch) | |
| tree | 8826c7f952bc988279c35e98e22c4a4e7ddee1eb | |
| parent | 6be7cf7440acb827d4b0f767b6083a859499b045 (diff) | |
| parent | 076a3f8a9b1a80d5a038aa181e4a4ac6e317ba8c (diff) | |
Merge pull request #1943 from adafruit/4.0.x4.1.0-beta.0
Merge in gamepadshift fix to master.
| -rw-r--r-- | shared-bindings/gamepad/GamePad.c | 2 | ||||
| -rw-r--r-- | shared-bindings/gamepadshift/GamePadShift.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/shared-bindings/gamepad/GamePad.c b/shared-bindings/gamepad/GamePad.c index 15304d6a2..d3c29019a 100644 --- a/shared-bindings/gamepad/GamePad.c +++ b/shared-bindings/gamepad/GamePad.c @@ -127,7 +127,7 @@ STATIC mp_obj_t gamepad_make_new(const mp_obj_type_t *type, size_t n_args, STATIC mp_obj_t gamepad_get_pressed(mp_obj_t self_in) { gamepad_obj_t* gamepad_singleton = MP_STATE_VM(gamepad_singleton); mp_obj_t pressed = MP_OBJ_NEW_SMALL_INT(gamepad_singleton->pressed); - gamepad_singleton->pressed = 0; + gamepad_singleton->pressed = gamepad_singleton->last; return pressed; } MP_DEFINE_CONST_FUN_OBJ_1(gamepad_get_pressed_obj, gamepad_get_pressed); diff --git a/shared-bindings/gamepadshift/GamePadShift.c b/shared-bindings/gamepadshift/GamePadShift.c index d6f365388..91203ad20 100644 --- a/shared-bindings/gamepadshift/GamePadShift.c +++ b/shared-bindings/gamepadshift/GamePadShift.c @@ -94,7 +94,7 @@ STATIC mp_obj_t gamepadshift_make_new(const mp_obj_type_t *type, size_t n_args, STATIC mp_obj_t gamepadshift_get_pressed(mp_obj_t self_in) { gamepadshift_obj_t* gamepad_singleton = MP_STATE_VM(gamepad_singleton); mp_obj_t pressed = MP_OBJ_NEW_SMALL_INT(gamepad_singleton->pressed); - gamepad_singleton->pressed = 0; + gamepad_singleton->pressed = gamepad_singleton->last; return pressed; } MP_DEFINE_CONST_FUN_OBJ_1(gamepadshift_get_pressed_obj, gamepadshift_get_pressed); |