adafruit · jepler · Jun 28, 2021 · Jul 15, 2021
diff --git a/docs/porting.rst b/docs/porting.rst
@@ -79,8 +79,6 @@ as a natural "TODO" list. An example minimal build list is shown below:
     # any port once their prerequisites in common-hal are complete.
     # Requires DigitalIO:
     CIRCUITPY_BITBANGIO = 0
-    # Requires DigitalIO
-    CIRCUITPY_GAMEPAD = 0
     # Requires neopixel_write or SPI (dotstar)
     CIRCUITPY_PIXELBUF = 0
     # Requires OS

diff --git a/ports/atmel-samd/boards/8086_commander/mpconfigboard.mk b/ports/atmel-samd/boards/8086_commander/mpconfigboard.mk
@@ -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

diff --git a/ports/atmel-samd/boards/openbook_m4/mpconfigboard.mk b/ports/atmel-samd/boards/openbook_m4/mpconfigboard.mk
@@ -9,5 +9,3 @@ CHIP_FAMILY = samd51
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = GD25Q16C
 LONGINT_IMPL = MPZ
-
-CIRCUITPY_GAMEPADSHIFT = 1
diff --git a/ports/atmel-samd/boards/pybadge/mpconfigboard.mk b/ports/atmel-samd/boards/pybadge/mpconfigboard.mk
@@ -10,8 +10,6 @@ QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = GD25Q16C
 LONGINT_IMPL = MPZ
 
-CIRCUITPY_GAMEPAD = 1
-CIRCUITPY_GAMEPADSHIFT = 1
 CIRCUITPY_STAGE = 1
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-stage/pybadge
diff --git a/ports/atmel-samd/boards/pygamer/mpconfigboard.mk b/ports/atmel-samd/boards/pygamer/mpconfigboard.mk
@@ -10,8 +10,6 @@ QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = GD25Q64C
 LONGINT_IMPL = MPZ
 
-CIRCUITPY_GAMEPAD = 1
-CIRCUITPY_GAMEPADSHIFT = 1
 CIRCUITPY_STAGE = 1
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-stage/pygamer
diff --git a/ports/atmel-samd/boards/ugame10/mpconfigboard.mk b/ports/atmel-samd/boards/ugame10/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_KEYPAD = 1
 
 CIRCUITPY_PULSEIO = 0
 CIRCUITPY_AUDIOBUSIO = 0

diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk
@@ -50,7 +50,6 @@ CIRCUITPY_FRAMEBUFFERIO ?= 0
 CIRCUITPY_FREQUENCYIO ?= 0
 CIRCUITPY_I2CPERIPHERAL ?= 0
 CIRCUITPY_JSON ?= 0
-CIRCUITPY_KEYPAD ?= 0
 CIRCUITPY_MSGPACK ?= 0
 CIRCUITPY_RE ?= 0
 CIRCUITPY_SDCARDIO ?= 0

diff --git a/ports/atmel-samd/supervisor/port.c b/ports/atmel-samd/supervisor/port.c
@@ -85,12 +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
 #if CIRCUITPY_PEW
 #include "common-hal/_pew/PewPew.h"
 #endif
@@ -358,12 +352,6 @@ void reset_port(void) {
 
     reset_gclks();
 
-    #if CIRCUITPY_GAMEPAD
-    gamepad_reset();
-    #endif
-    #if CIRCUITPY_GAMEPADSHIFT
-    gamepadshift_reset();
-    #endif
     #if CIRCUITPY_PEW
     pew_reset();
     #endif

diff --git a/ports/cxd56/mpconfigport.mk b/ports/cxd56/mpconfigport.mk
@@ -17,7 +17,6 @@ CIRCUITPY_CAMERA = 1
 CIRCUITPY_COUNTIO = 0
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_GAMEPAD = 0
 CIRCUITPY_GNSS = 1
 CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_NEOPIXEL_WRITE = 0

diff --git a/ports/mimxrt10xx/supervisor/port.c b/ports/mimxrt10xx/supervisor/port.c
@@ -47,12 +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
 #if CIRCUITPY_PEW
 #include "shared-module/_pew/PewPew.h"
 #endif
@@ -300,12 +294,6 @@ void reset_port(void) {
     rtc_reset();
     #endif
 
-    #if CIRCUITPY_GAMEPAD
-    gamepad_reset();
-    #endif
-    #if CIRCUITPY_GAMEPADSHIFT
-    gamepadshift_reset();
-    #endif
     #if CIRCUITPY_PEW
     pew_reset();
     #endif

diff --git a/ports/nrf/supervisor/port.c b/ports/nrf/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();

diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
@@ -184,12 +184,6 @@ 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
 ifeq ($(CIRCUITPY_GNSS),1)
 SRC_PATTERNS += gnss/%
 endif

diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
@@ -468,28 +468,6 @@ 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
-// Scan gamepad every 32ms
-#define CIRCUITPY_GAMEPAD_TICKS 0x1f
-#define GAMEPAD_ROOT_POINTERS mp_obj_t gamepad_singleton;
-#else
-#define GAMEPAD_ROOT_POINTERS
-#endif
-
 #if CIRCUITPY_GNSS
 extern const struct _mp_obj_module_t gnss_module;
 #define GNSS_MODULE        { MP_OBJ_NEW_QSTR(MP_QSTR_gnss), (mp_obj_t)&gnss_module },
@@ -539,14 +517,6 @@ extern const struct _mp_obj_module_t keypad_module;
 #define KEYPAD_ROOT_POINTERS
 #endif
 
-#if CIRCUITPY_GAMEPAD || CIRCUITPY_GAMEPADSHIFT
-// Scan gamepad every 32ms
-#define CIRCUITPY_GAMEPAD_TICKS 0x1f
-#define GAMEPAD_ROOT_POINTERS mp_obj_t gamepad_singleton;
-#else
-#define GAMEPAD_ROOT_POINTERS
-#endif
-
 #if CIRCUITPY_MATH
 extern const struct _mp_obj_module_t math_module;
 #define MATH_MODULE            { MP_OBJ_NEW_QSTR(MP_QSTR_math), (mp_obj_t)&math_module },
@@ -904,8 +874,6 @@ extern const struct _mp_obj_module_t msgpack_module;
     _EVE_MODULE \
     FRAMEBUFFERIO_MODULE \
     FREQUENCYIO_MODULE \
-    GAMEPAD_MODULE \
-    GAMEPADSHIFT_MODULE \
     GNSS_MODULE \
     I2CPERIPHERAL_MODULE \
     IPADDRESS_MODULE \
@@ -979,7 +947,6 @@ struct _supervisor_allocation_node;
     const char *readline_hist[8]; \
     vstr_t *repl_line; \
     mp_obj_t rtc_time_source; \
-    GAMEPAD_ROOT_POINTERS \
     KEYPAD_ROOT_POINTERS \
     mp_obj_t pew_singleton; \
     BOARD_UART_ROOT_POINTER \

diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
@@ -181,12 +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)
-
 CIRCUITPY_GNSS ?= 0
 CFLAGS += -DCIRCUITPY_GNSS=$(CIRCUITPY_GNSS)
 

diff --git a/shared-bindings/gamepad/GamePad.c b/shared-bindings/gamepad/GamePad.c