Skip to content

Commit fbf052b

Browse files
committed
Gamepad & GamepadShift: Enable ticks while object exists
Otherwise, button presses might not be noticed.
1 parent 75f9969 commit fbf052b

File tree

5 files changed

+16
-0
lines changed

5 files changed

+16
-0
lines changed

shared-bindings/gamepad/GamePad.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include "shared-bindings/gamepad/__init__.h"
3434
#include "shared-bindings/digitalio/DigitalInOut.h"
3535
#include "supervisor/shared/translate.h"
36+
#include "supervisor/shared/tick.h"
3637

3738

3839
//| .. currentmodule:: gamepad
@@ -108,6 +109,9 @@ STATIC mp_obj_t gamepad_make_new(const mp_obj_type_t *type, size_t n_args,
108109
gamepad_singleton = m_new_obj(gamepad_obj_t);
109110
gamepad_singleton->base.type = &gamepad_type;
110111
gamepad_singleton = gc_make_long_lived(gamepad_singleton);
112+
if (!MP_STATE_VM(gamepad_singleton)) {
113+
supervisor_enable_tick();
114+
}
111115
MP_STATE_VM(gamepad_singleton) = gamepad_singleton;
112116
}
113117
common_hal_gamepad_gamepad_init(gamepad_singleton, args, n_args);

shared-bindings/gamepadshift/GamePadShift.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include "shared-bindings/gamepadshift/GamePadShift.h"
3232
#include "shared-bindings/gamepadshift/__init__.h"
3333
#include "supervisor/shared/translate.h"
34+
#include "supervisor/shared/tick.h"
3435

3536
//| .. currentmodule:: gamepadshift
3637
//|
@@ -75,6 +76,9 @@ STATIC mp_obj_t gamepadshift_make_new(const mp_obj_type_t *type, size_t n_args,
7576
gamepad_singleton = m_new_obj(gamepadshift_obj_t);
7677
gamepad_singleton->base.type = &gamepadshift_type;
7778
gamepad_singleton = gc_make_long_lived(gamepad_singleton);
79+
if (!MP_STATE_VM(gamepad_singleton)) {
80+
supervisor_enable_tick();
81+
}
7882
MP_STATE_VM(gamepad_singleton) = gamepad_singleton;
7983
}
8084
common_hal_gamepadshift_gamepadshift_init(gamepad_singleton, clock_pin, data_pin, latch_pin);

shared-module/gamepad/GamePad.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include "py/mpstate.h"
2828
#include "shared-bindings/digitalio/DigitalInOut.h"
2929
#include "shared-bindings/gamepad/GamePad.h"
30+
#include "supervisor/shared/tick.h"
3031

3132
void common_hal_gamepad_gamepad_init(gamepad_obj_t *gamepad,
3233
const mp_obj_t pins[], size_t n_pins) {
@@ -54,4 +55,5 @@ void common_hal_gamepad_gamepad_init(gamepad_obj_t *gamepad,
5455

5556
void common_hal_gamepad_gamepad_deinit(gamepad_obj_t *self) {
5657
MP_STATE_VM(gamepad_singleton) = NULL;
58+
supervisor_disable_tick();
5759
}

shared-module/gamepad/__init__.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include "py/mpstate.h"
3030
#include "shared-bindings/gamepad/__init__.h"
3131
#include "shared-bindings/gamepad/GamePad.h"
32+
#include "supervisor/shared/tick.h"
3233

3334
#include "shared-bindings/digitalio/DigitalInOut.h"
3435

@@ -59,5 +60,8 @@ void gamepad_tick(void) {
5960
}
6061

6162
void gamepad_reset(void) {
63+
if (MP_STATE_VM(gamepad_singleton)) {
64+
supervisor_disable_tick();
65+
}
6266
MP_STATE_VM(gamepad_singleton) = NULL;
6367
}

shared-module/gamepadshift/GamePadShift.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include "py/mpstate.h"
2828
#include "shared-bindings/digitalio/DigitalInOut.h"
2929
#include "shared-module/gamepadshift/GamePadShift.h"
30+
#include "supervisor/shared/tick.h"
3031

3132
void common_hal_gamepadshift_gamepadshift_init(gamepadshift_obj_t *gamepadshift,
3233
digitalio_digitalinout_obj_t *clock_pin,
@@ -46,4 +47,5 @@ void common_hal_gamepadshift_gamepadshift_init(gamepadshift_obj_t *gamepadshift,
4647

4748
void common_hal_gamepadshift_gamepadshift_deinit(gamepadshift_obj_t *gamepadshift) {
4849
MP_STATE_VM(gamepad_singleton) = NULL;
50+
supervisor_disable_tick();
4951
}

0 commit comments

Comments
 (0)