Merge pull request #5068 from dhalbert/remove-gamepad

remove gamepad; deprecate gamepadshift

Author: kattni

docs/porting.rst

@@ -80,7 +80,7 @@ as a natural "TODO" list. An example minimal build list is shown below:
     # Requires DigitalIO:
     CIRCUITPY_BITBANGIO = 0
     # Requires DigitalIO
-    CIRCUITPY_GAMEPAD = 0
+    CIRCUITPY_GAMEPADSHIFT = 0
     # Requires neopixel_write or SPI (dotstar)
     CIRCUITPY_PIXELBUF = 0
     # Requires OS

frozen/Adafruit_CircuitPython_CircuitPlayground

@@ -12,8 +12,8 @@ EXTERNAL_FLASH_DEVICES = "W25Q128JVxQ"
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
 
-CIRCUITPY_GAMEPAD = 1
 CIRCUITPY_BUSDEVICE = 1
+CIRCUITPY_KEYPAD = 1
 
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID

frozen/Adafruit_CircuitPython_Requests

@@ -12,6 +12,7 @@ LONGINT_IMPL = NONE
 
 # To keep the build small
 CIRCUITPY_AUDIOBUSIO = 0
+CIRCUITPY_KEYPAD = 0
 
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH

ports/atmel-samd/boards/8086_commander/mpconfigboard.mk

@@ -10,37 +10,36 @@ INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 
 CIRCUITPY_FULL_BUILD = 0
+
+CIRCUIPTY_USB_CDC = 0
 CIRCUITPY_AUDIOBUSIO = 0
-CIRCUITPY_AUDIOPWMIO = 0
 CIRCUITPY_AUDIOMP3 = 0
+CIRCUITPY_AUDIOPWMIO = 0
 CIRCUITPY_BITBANGIO = 0
 CIRCUITPY_BITBANG_APA102 = 0
 CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_GAMEPADSHIFT = 0
 CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_NEOPIXEL_WRITE = 0
 CIRCUITPY_PIXELBUF = 0
 CIRCUITPY_PS2IO = 0
 CIRCUITPY_PULSEIO = 0
+CIRCUITPY_PWMIO = 0
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_RTC = 0
 CIRCUITPY_SAMD = 0
 CIRCUITPY_TOUCHIO = 0
-CIRCUIPTY_USB_CDC = 0
 CIRCUITPY_USB_HID = 0
 CIRCUITPY_USB_MIDI = 0
 CIRCUITPY_VECTORIO = 0
-CIRCUITPY_GAMEPAD = 0
-CIRCUITPY_PWMIO = 0
 
 CIRCUITPY_ANALOGIO = 1
-CIRCUITPY_AUDIOMIXER = 1
 CIRCUITPY_AUDIOIO = 1
-CIRCUITPY_SYNTHIO = 1
+CIRCUITPY_AUDIOMIXER = 1
 CIRCUITPY_DISPLAYIO = 1
+CIRCUITPY_KEYPAD = 1
 CIRCUITPY_MATH = 1
 CIRCUITPY_STAGE = 1
-CIRCUITPY_KEYPAD = 1
+CIRCUITPY_SYNTHIO = 1
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-stage/pewpew_m4
 CIRCUITPY_DISPLAY_FONT = $(TOP)/ports/atmel-samd/boards/ugame10/brutalist-6.bdf

ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.mk

@@ -10,7 +10,6 @@ QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = GD25Q16C
 LONGINT_IMPL = MPZ
 
-CIRCUITPY_GAMEPAD = 1
 CIRCUITPY_GAMEPADSHIFT = 1
 CIRCUITPY_STAGE = 1
 

ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk

@@ -16,8 +16,8 @@ CIRCUITPY_DRIVE_LABEL = "PYCUBED"
 CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_BITMAPTOOLS = 0
 CIRCUITPY_DISPLAYIO = 0
-CIRCUITPY_KEYPAD = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
+CIRCUITPY_KEYPAD = 0
 CIRCUITPY_RGBMATRIX = 0
 CIRCUITPY_PS2IO = 0
 

ports/atmel-samd/boards/pybadge/mpconfigboard.mk

@@ -10,7 +10,6 @@ QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = GD25Q64C
 LONGINT_IMPL = MPZ
 
-CIRCUITPY_GAMEPAD = 1
 CIRCUITPY_GAMEPADSHIFT = 1
 CIRCUITPY_STAGE = 1
 

ports/atmel-samd/boards/pycubed/mpconfigboard.mk

@@ -14,8 +14,8 @@ CIRCUITPY_STAGE = 1
 CIRCUITPY_MATH = 1
 CIRCUITPY_AUDIOIO = 1
 CIRCUITPY_ANALOGIO = 1
-CIRCUITPY_GAMEPAD = 1
 CIRCUITPY_DISPLAYIO = 1
+CIRCUITPY_KEYPPAD = 1
 
 CIRCUITPY_PULSEIO = 0
 CIRCUITPY_AUDIOBUSIO = 0

ports/atmel-samd/boards/pygamer/mpconfigboard.mk

@@ -22,6 +22,7 @@ CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_BLEIO = 0
 CIRCUITPY_DISPLAYIO = 0
+CIRCUITPY_KEYPAD = 0
 CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_TOUCHIO = 0
 CIRCUITPY_RGBMATRIX = 0

ports/atmel-samd/boards/ugame10/mpconfigboard.mk

@@ -21,6 +21,7 @@ CIRCUITPY_BITMAPTOOLS = 0
 CIRCUITPY_BLEIO_HCI = 0
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
+CIRCUITPY_KEYPAD = 0
 CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_TOUCHIO = 0
 CIRCUITPY_RGBMATRIX = 0

ports/atmel-samd/boards/winterbloom_big_honking_button/mpconfigboard.mk

@@ -85,9 +85,6 @@
 
 #include "tusb.h"
 
-#if CIRCUITPY_GAMEPAD
-#include "shared-module/gamepad/__init__.h"
-#endif
 #if CIRCUITPY_GAMEPADSHIFT
 #include "shared-module/gamepadshift/__init__.h"
 #endif
@@ -358,9 +355,6 @@ void reset_port(void) {
 
     reset_gclks();
 
-    #if CIRCUITPY_GAMEPAD
-    gamepad_reset();
-    #endif
     #if CIRCUITPY_GAMEPADSHIFT
     gamepadshift_reset();
     #endif

ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk

@@ -17,9 +17,9 @@ CIRCUITPY_CAMERA = 1
 CIRCUITPY_COUNTIO = 0
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_GAMEPAD = 0
 CIRCUITPY_GNSS = 1
 CIRCUITPY_I2CPERIPHERAL = 0
+CIRCUITPY_KEYPAD = 0
 CIRCUITPY_NEOPIXEL_WRITE = 0
 CIRCUITPY_NVM = 0
 CIRCUITPY_ROTARYIO = 0

ports/atmel-samd/supervisor/port.c

@@ -47,9 +47,6 @@
 
 #include "tusb.h"
 
-#if CIRCUITPY_GAMEPAD
-#include "shared-module/gamepad/__init__.h"
-#endif
 #if CIRCUITPY_GAMEPADSHIFT
 #include "shared-module/gamepadshift/__init__.h"
 #endif
@@ -300,9 +297,6 @@ void reset_port(void) {
     rtc_reset();
     #endif
 
-    #if CIRCUITPY_GAMEPAD
-    gamepad_reset();
-    #endif
     #if CIRCUITPY_GAMEPADSHIFT
     gamepadshift_reset();
     #endif

ports/cxd56/mpconfigport.mk

@@ -8,5 +8,4 @@ MCU_CHIP = nrf52840
 INTERNAL_FLASH_FILESYSTEM = 1
 CIRCUITPY_AUDIOIO = 0
 CIRCUITPY_DISPLAYIO = 1
-CIRCUITPY_GAMEPAD = 1
 CIRCUITPY_STAGE = 1

ports/mimxrt10xx/supervisor/port.c

@@ -39,7 +39,6 @@
 #include "nrf/power.h"
 #include "nrf/timers.h"
 
-#include "shared-module/gamepad/__init__.h"
 #include "common-hal/microcontroller/Pin.h"
 #include "common-hal/_bleio/__init__.h"
 #include "common-hal/analogio/AnalogIn.h"
@@ -207,10 +206,6 @@ safe_mode_t port_init(void) {
 }
 
 void reset_port(void) {
-    #ifdef CIRCUITPY_GAMEPAD_TICKS
-    gamepad_reset();
-    #endif
-
     #if CIRCUITPY_BUSIO
     i2c_reset();
     spi_reset();

ports/nrf/boards/electronut_labs_blip/mpconfigboard.mk

@@ -184,9 +184,7 @@ endif
 ifeq ($(CIRCUITPY_FREQUENCYIO),1)
 SRC_PATTERNS += frequencyio/%
 endif
-ifeq ($(CIRCUITPY_GAMEPAD),1)
-SRC_PATTERNS += gamepad/%
-endif
+
 ifeq ($(CIRCUITPY_GAMEPADSHIFT),1)
 SRC_PATTERNS += gamepadshift/%
 endif
@@ -523,8 +521,6 @@ SRC_SHARED_MODULE_ALL = \
 	keypad/Keys.c \
 	sdcardio/SDCard.c \
 	sdcardio/__init__.c \
-	gamepad/GamePad.c \
-	gamepad/__init__.c \
 	gamepadshift/GamePadShift.c \
 	gamepadshift/__init__.c \
 	memorymonitor/__init__.c \

ports/nrf/boards/pca10056/examples/buttons.py

@@ -468,21 +468,14 @@ extern const struct _mp_obj_module_t frequencyio_module;
 #define FREQUENCYIO_MODULE
 #endif
 
-#if CIRCUITPY_GAMEPAD
-extern const struct _mp_obj_module_t gamepad_module;
-#define GAMEPAD_MODULE         { MP_OBJ_NEW_QSTR(MP_QSTR_gamepad),(mp_obj_t)&gamepad_module },
-#else
-#define GAMEPAD_MODULE
-#endif
-
 #if CIRCUITPY_GAMEPADSHIFT
 extern const struct _mp_obj_module_t gamepadshift_module;
 #define GAMEPADSHIFT_MODULE         { MP_OBJ_NEW_QSTR(MP_QSTR_gamepadshift),(mp_obj_t)&gamepadshift_module },
 #else
 #define GAMEPADSHIFT_MODULE
 #endif
 
-#if CIRCUITPY_GAMEPAD || CIRCUITPY_GAMEPADSHIFT
+#if CIRCUITPY_GAMEPADSHIFT
 // Scan gamepad every 32ms
 #define CIRCUITPY_GAMEPAD_TICKS 0x1f
 #define GAMEPAD_ROOT_POINTERS mp_obj_t gamepad_singleton;
@@ -539,8 +532,8 @@ extern const struct _mp_obj_module_t keypad_module;
 #define KEYPAD_ROOT_POINTERS
 #endif
 
-#if CIRCUITPY_GAMEPAD || CIRCUITPY_GAMEPADSHIFT
-// Scan gamepad every 32ms
+#if CIRCUITPY_GAMEPADSHIFT
+// Scan gamepadshift every 32ms
 #define CIRCUITPY_GAMEPAD_TICKS 0x1f
 #define GAMEPAD_ROOT_POINTERS mp_obj_t gamepad_singleton;
 #else
@@ -888,7 +881,6 @@ extern const struct _mp_obj_module_t msgpack_module;
     _EVE_MODULE \
     FRAMEBUFFERIO_MODULE \
     FREQUENCYIO_MODULE \
-    GAMEPAD_MODULE \
     GAMEPADSHIFT_MODULE \
     GNSS_MODULE \
     I2CPERIPHERAL_MODULE \

ports/nrf/supervisor/port.c

@@ -181,9 +181,6 @@ CFLAGS += -DCIRCUITPY__EVE=$(CIRCUITPY__EVE)
 CIRCUITPY_FREQUENCYIO ?= $(CIRCUITPY_FULL_BUILD)
 CFLAGS += -DCIRCUITPY_FREQUENCYIO=$(CIRCUITPY_FREQUENCYIO)
 
-CIRCUITPY_GAMEPAD ?= 0
-CFLAGS += -DCIRCUITPY_GAMEPAD=$(CIRCUITPY_GAMEPAD)
-
 CIRCUITPY_GAMEPADSHIFT ?= 0
 CFLAGS += -DCIRCUITPY_GAMEPADSHIFT=$(CIRCUITPY_GAMEPADSHIFT)