diff options
| -rw-r--r-- | py/circuitpy_mpconfig.h | 2 | ||||
| -rw-r--r-- | shared-bindings/gamepad/GamePad.c | 7 | ||||
| -rw-r--r-- | shared-bindings/gamepadshift/GamePadShift.c | 2 | ||||
| -rw-r--r-- | shared-module/gamepad/GamePad.h | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h index a101aa527..f957886f4 100644 --- a/py/circuitpy_mpconfig.h +++ b/py/circuitpy_mpconfig.h @@ -567,7 +567,7 @@ extern const struct _mp_obj_module_t ustack_module; ERRNO_MODULE \ FREQUENCYIO_MODULE \ GAMEPAD_MODULE \ - GAMEPADSHIFT_MODULE \ + GAMEPADSHIFT_MODULE \ I2CSLAVE_MODULE \ JSON_MODULE \ MATH_MODULE \ diff --git a/shared-bindings/gamepad/GamePad.c b/shared-bindings/gamepad/GamePad.c index c80aa7f7c..c342cbbf9 100644 --- a/shared-bindings/gamepad/GamePad.c +++ b/shared-bindings/gamepad/GamePad.c @@ -23,17 +23,16 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "shared-bindings/gamepad/GamePad.h" + #include "py/obj.h" #include "py/runtime.h" #include "py/mphal.h" #include "py/gc.h" #include "py/mpstate.h" -#include "shared-module/gamepad/__init__.h" -#include "shared-module/gamepad/GamePad.h" +#include "shared-bindings/gamepad/__init__.h" #include "shared-bindings/digitalio/DigitalInOut.h" #include "supervisor/shared/translate.h" -#include "GamePad.h" -#include "__init__.h" //| .. currentmodule:: gamepad diff --git a/shared-bindings/gamepadshift/GamePadShift.c b/shared-bindings/gamepadshift/GamePadShift.c index de3813b08..d6f365388 100644 --- a/shared-bindings/gamepadshift/GamePadShift.c +++ b/shared-bindings/gamepadshift/GamePadShift.c @@ -28,10 +28,8 @@ #include "py/mphal.h" #include "py/gc.h" #include "py/mpstate.h" -#include "shared-bindings/gamepad/__init__.h" #include "shared-bindings/gamepadshift/GamePadShift.h" #include "shared-bindings/gamepadshift/__init__.h" -#include "shared-module/gamepadshift/GamePadShift.h" #include "supervisor/shared/translate.h" //| .. currentmodule:: gamepadshift diff --git a/shared-module/gamepad/GamePad.h b/shared-module/gamepad/GamePad.h index e8bfd9c6b..048fbcd2b 100644 --- a/shared-module/gamepad/GamePad.h +++ b/shared-module/gamepad/GamePad.h @@ -34,9 +34,9 @@ typedef struct { mp_obj_base_t base; digitalio_digitalinout_obj_t* pins[8]; + volatile uint8_t last; volatile uint8_t pressed; uint8_t pulls; - volatile uint8_t last; } gamepad_obj_t; #endif // MICROPY_INCLUDED_GAMEPAD_GAMEPAD_H |