summaryrefslogtreecommitdiff
path: root/shared-bindings
diff options
context:
space:
mode:
authorDan Halbert <halbert@halwitz.org>2019-06-13 22:01:46 -0400
committerDan Halbert <halbert@halwitz.org>2019-06-13 22:01:46 -0400
commitcfa8b4b5a94f236df0b1ea185a8a5a0ab25babd8 (patch)
tree3f5694934327644d325d5c809a69cddaff288d85 /shared-bindings
parentbed6d43a768838fd3bc5d2048bf7acdc6e9b0a33 (diff)
parent6d388a34eb909e27acd508dc001ae1fe94a530de (diff)
Merge remote-tracking branch 'adafruit/master' into ble-scanner
Diffstat (limited to 'shared-bindings')
-rw-r--r--shared-bindings/gamepad/GamePad.c2
-rw-r--r--shared-bindings/gamepadshift/GamePadShift.c2
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);