djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Gamepad & GamepadShift: Enable ticks while object exists 

Otherwise, button presses might not be noticed.
This commit is contained in:
Jeff Epler 2020-05-13 10:04:19 -05:00
parent 75f9969860
commit fbf052bb27
5 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shared-bindings/gamepad/GamePad.c
View File

@ -33,6 +33,7 @@
#include "shared-bindings/gamepad/__init__.h" #include "shared-bindings/gamepad/__init__.h"
#include "shared-bindings/digitalio/DigitalInOut.h" #include "shared-bindings/digitalio/DigitalInOut.h"
#include "supervisor/shared/translate.h" #include "supervisor/shared/translate.h"
#include "supervisor/shared/tick.h"
//| .. currentmodule:: gamepad //| .. currentmodule:: gamepad
@ -108,6 +109,9 @@ STATIC mp_obj_t gamepad_make_new(const mp_obj_type_t *type, size_t n_args,
gamepad_singleton = m_new_obj(gamepad_obj_t); gamepad_singleton = m_new_obj(gamepad_obj_t);
gamepad_singleton->base.type = &gamepad_type; gamepad_singleton->base.type = &gamepad_type;
gamepad_singleton = gc_make_long_lived(gamepad_singleton); gamepad_singleton = gc_make_long_lived(gamepad_singleton);
if (!MP_STATE_VM(gamepad_singleton)) {
supervisor_enable_tick();
}
MP_STATE_VM(gamepad_singleton) = gamepad_singleton; MP_STATE_VM(gamepad_singleton) = gamepad_singleton;
} }
common_hal_gamepad_gamepad_init(gamepad_singleton, args, n_args); common_hal_gamepad_gamepad_init(gamepad_singleton, args, n_args);

4
shared-bindings/gamepadshift/GamePadShift.c
View File

@ -31,6 +31,7 @@
#include "shared-bindings/gamepadshift/GamePadShift.h" #include "shared-bindings/gamepadshift/GamePadShift.h"
#include "shared-bindings/gamepadshift/__init__.h" #include "shared-bindings/gamepadshift/__init__.h"
#include "supervisor/shared/translate.h" #include "supervisor/shared/translate.h"
#include "supervisor/shared/tick.h"
//| .. currentmodule:: gamepadshift //| .. currentmodule:: gamepadshift
//| //|
@ -75,6 +76,9 @@ STATIC mp_obj_t gamepadshift_make_new(const mp_obj_type_t *type, size_t n_args,
gamepad_singleton = m_new_obj(gamepadshift_obj_t); gamepad_singleton = m_new_obj(gamepadshift_obj_t);
gamepad_singleton->base.type = &gamepadshift_type; gamepad_singleton->base.type = &gamepadshift_type;
gamepad_singleton = gc_make_long_lived(gamepad_singleton); gamepad_singleton = gc_make_long_lived(gamepad_singleton);
if (!MP_STATE_VM(gamepad_singleton)) {
supervisor_enable_tick();
}
MP_STATE_VM(gamepad_singleton) = gamepad_singleton; MP_STATE_VM(gamepad_singleton) = gamepad_singleton;
} }
common_hal_gamepadshift_gamepadshift_init(gamepad_singleton, clock_pin, data_pin, latch_pin); common_hal_gamepadshift_gamepadshift_init(gamepad_singleton, clock_pin, data_pin, latch_pin);

2
shared-module/gamepad/GamePad.c
View File

@ -27,6 +27,7 @@
#include "py/mpstate.h" #include "py/mpstate.h"
#include "shared-bindings/digitalio/DigitalInOut.h" #include "shared-bindings/digitalio/DigitalInOut.h"
#include "shared-bindings/gamepad/GamePad.h" #include "shared-bindings/gamepad/GamePad.h"
#include "supervisor/shared/tick.h"
void common_hal_gamepad_gamepad_init(gamepad_obj_t *gamepad, void common_hal_gamepad_gamepad_init(gamepad_obj_t *gamepad,
const mp_obj_t pins[], size_t n_pins) { const mp_obj_t pins[], size_t n_pins) {
@ -54,4 +55,5 @@ void common_hal_gamepad_gamepad_init(gamepad_obj_t *gamepad,
void common_hal_gamepad_gamepad_deinit(gamepad_obj_t *self) { void common_hal_gamepad_gamepad_deinit(gamepad_obj_t *self) {
MP_STATE_VM(gamepad_singleton) = NULL; MP_STATE_VM(gamepad_singleton) = NULL;
supervisor_disable_tick();
} }

4
shared-module/gamepad/__init__.c
View File

@ -29,6 +29,7 @@
#include "py/mpstate.h" #include "py/mpstate.h"
#include "shared-bindings/gamepad/__init__.h" #include "shared-bindings/gamepad/__init__.h"
#include "shared-bindings/gamepad/GamePad.h" #include "shared-bindings/gamepad/GamePad.h"
#include "supervisor/shared/tick.h"
#include "shared-bindings/digitalio/DigitalInOut.h" #include "shared-bindings/digitalio/DigitalInOut.h"
@ -59,5 +60,8 @@ void gamepad_tick(void) {
} }
void gamepad_reset(void) { void gamepad_reset(void) {
if (MP_STATE_VM(gamepad_singleton)) {
supervisor_disable_tick();
}
MP_STATE_VM(gamepad_singleton) = NULL; MP_STATE_VM(gamepad_singleton) = NULL;
} }

2
shared-module/gamepadshift/GamePadShift.c
View File

@ -27,6 +27,7 @@
#include "py/mpstate.h" #include "py/mpstate.h"
#include "shared-bindings/digitalio/DigitalInOut.h" #include "shared-bindings/digitalio/DigitalInOut.h"
#include "shared-module/gamepadshift/GamePadShift.h" #include "shared-module/gamepadshift/GamePadShift.h"
#include "supervisor/shared/tick.h"
void common_hal_gamepadshift_gamepadshift_init(gamepadshift_obj_t *gamepadshift, void common_hal_gamepadshift_gamepadshift_init(gamepadshift_obj_t *gamepadshift,
digitalio_digitalinout_obj_t *clock_pin, digitalio_digitalinout_obj_t *clock_pin,
@ -46,4 +47,5 @@ void common_hal_gamepadshift_gamepadshift_init(gamepadshift_obj_t *gamepadshift,
void common_hal_gamepadshift_gamepadshift_deinit(gamepadshift_obj_t *gamepadshift) { void common_hal_gamepadshift_gamepadshift_deinit(gamepadshift_obj_t *gamepadshift) {
MP_STATE_VM(gamepad_singleton) = NULL; MP_STATE_VM(gamepad_singleton) = NULL;
supervisor_disable_tick();
} }