diff options
| author | Dan Halbert <halbert@halwitz.org> | 2019-06-13 22:01:46 -0400 |
|---|---|---|
| committer | Dan Halbert <halbert@halwitz.org> | 2019-06-13 22:01:46 -0400 |
| commit | cfa8b4b5a94f236df0b1ea185a8a5a0ab25babd8 (patch) | |
| tree | 3f5694934327644d325d5c809a69cddaff288d85 | |
| parent | bed6d43a768838fd3bc5d2048bf7acdc6e9b0a33 (diff) | |
| parent | 6d388a34eb909e27acd508dc001ae1fe94a530de (diff) | |
Merge remote-tracking branch 'adafruit/master' into ble-scanner
| -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); |