Merge pull request adafruit#1939 from pewpew-game/gamepad-clear

tannewt · web-flow · commit 076a3f8a9b1a · 2019-06-12T13:22:00.000-07:00
When clearing gamepad buffer, use the last button state, not 0
diff --git 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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ STATIC mp_obj_t gamepad_make_new(const mp_obj_type_t *type, size_t n_args,`
`127`	`127`	`STATIC mp_obj_t gamepad_get_pressed(mp_obj_t self_in) {`
`128`	`128`	`gamepad_obj_t* gamepad_singleton = MP_STATE_VM(gamepad_singleton);`
`129`	`129`	`mp_obj_t pressed = MP_OBJ_NEW_SMALL_INT(gamepad_singleton->pressed);`
`130`		`- gamepad_singleton->pressed = 0;`
	`130`	`+ gamepad_singleton->pressed = gamepad_singleton->last;`
`131`	`131`	`return pressed;`
`132`	`132`	`}`
`133`	`133`	`MP_DEFINE_CONST_FUN_OBJ_1(gamepad_get_pressed_obj, gamepad_get_pressed);`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ STATIC mp_obj_t gamepadshift_make_new(const mp_obj_type_t *type, size_t n_args,`
`94`	`94`	`STATIC mp_obj_t gamepadshift_get_pressed(mp_obj_t self_in) {`
`95`	`95`	`gamepadshift_obj_t* gamepad_singleton = MP_STATE_VM(gamepad_singleton);`
`96`	`96`	`mp_obj_t pressed = MP_OBJ_NEW_SMALL_INT(gamepad_singleton->pressed);`
`97`		`- gamepad_singleton->pressed = 0;`
	`97`	`+ gamepad_singleton->pressed = gamepad_singleton->last;`
`98`	`98`	`return pressed;`
`99`	`99`	`}`
`100`	`100`	`MP_DEFINE_CONST_FUN_OBJ_1(gamepadshift_get_pressed_obj, gamepadshift_get_pressed);`