Skip to content

Commit 6ccd285

Browse files
committed
Remove gamepadshift module
Everything should be using the keypad module instead. Note: there are several boards that still had gamepadshift enabled. I did not contact their authors to make sure they already switched to keypad in their code and documentation. We should probably wait with merging this for their go ahead.
1 parent cf4597c commit 6ccd285

File tree

20 files changed

+3
-484
lines changed

20 files changed

+3
-484
lines changed

docs/porting.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@ as a natural "TODO" list. An example minimal build list is shown below:
7979
# any port once their prerequisites in common-hal are complete.
8080
# Requires DigitalIO:
8181
CIRCUITPY_BITBANGIO = 0
82-
# Requires DigitalIO
83-
CIRCUITPY_GAMEPADSHIFT = 0
8482
# Requires neopixel_write or SPI (dotstar)
8583
CIRCUITPY_PIXELBUF = 0
8684
# Requires OS

docs/redirects.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,6 @@ shared-bindings/framebufferio/FramebufferDisplay.rst shared-bindings/framebuffer
8282
shared-bindings/framebufferio/__init__.rst shared-bindings/framebufferio/
8383
shared-bindings/frequencyio/FrequencyIn.rst shared-bindings/frequencyio/#frequencyio.FrequencyIn
8484
shared-bindings/frequencyio/__init__.rst shared-bindings/frequencyio/
85-
shared-bindings/gamepad/GamePad.rst shared-bindings/gamepad/#gamepad.GamePad
86-
shared-bindings/gamepad/__init__.rst shared-bindings/gamepad/
87-
shared-bindings/gamepadshift/GamePadShift.rst shared-bindings/gamepadshift/#gamepadshift.GamePadShift
88-
shared-bindings/gamepadshift/__init__.rst shared-bindings/gamepadshift/
8985
shared-bindings/gnss/__init__.rst shared-bindings/gnss/
9086
shared-bindings/i2cperipheral/__init__.rst shared-bindings/i2cperipheral/
9187
shared-bindings/i2csecondary/__init__.rst shared-bindings/i2csecondary/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ QSPI_FLASH_FILESYSTEM = 1
1010
EXTERNAL_FLASH_DEVICES = GD25Q16C
1111
LONGINT_IMPL = MPZ
1212

13-
CIRCUITPY_GAMEPADSHIFT = 1
13+
CIRCUITPY_KEYPAD = 1

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ EXTERNAL_FLASH_DEVICES = GD25Q16C
1111
LONGINT_IMPL = MPZ
1212

1313
CIRCUITPY_AESIO = 0
14-
CIRCUITPY_GAMEPADSHIFT = 1
14+
CIRCUITPY_KEYPAD = 1
1515
CIRCUITPY_STAGE = 1
1616

1717
FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-stage/pybadge

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ EXTERNAL_FLASH_DEVICES = GD25Q64C
1111
LONGINT_IMPL = MPZ
1212

1313
CIRCUITPY_AESIO = 0
14-
CIRCUITPY_GAMEPADSHIFT = 1
14+
CIRCUITPY_KEYPAD = 1
1515
CIRCUITPY_STAGE = 1
1616

1717
FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-stage/pygamer

ports/atmel-samd/supervisor/port.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,6 @@
111111

112112
#include "tusb.h"
113113

114-
#if CIRCUITPY_GAMEPADSHIFT
115-
#include "shared-module/gamepadshift/__init__.h"
116-
#endif
117114
#if CIRCUITPY_PEW
118115
#include "common-hal/_pew/PewPew.h"
119116
#endif
@@ -399,9 +396,6 @@ void reset_port(void) {
399396

400397
reset_gclks();
401398

402-
#if CIRCUITPY_GAMEPADSHIFT
403-
gamepadshift_reset();
404-
#endif
405399
#if CIRCUITPY_PEW
406400
pew_reset();
407401
#endif

ports/mimxrt10xx/supervisor/port.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@
4646

4747
#include "supervisor/background_callback.h"
4848

49-
#if CIRCUITPY_GAMEPADSHIFT
50-
#include "shared-module/gamepadshift/__init__.h"
51-
#endif
5249
#if CIRCUITPY_PEW
5350
#include "shared-module/_pew/PewPew.h"
5451
#endif
@@ -293,9 +290,6 @@ void reset_port(void) {
293290
rtc_reset();
294291
#endif
295292

296-
#if CIRCUITPY_GAMEPADSHIFT
297-
gamepadshift_reset();
298-
#endif
299293
#if CIRCUITPY_PEW
300294
pew_reset();
301295
#endif

ports/stm/boards/swan_r5/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ CIRCUITPY_DISPLAYIO = 0
4949
# any port once their prerequisites in common-hal are complete.
5050
# Requires DigitalIO:
5151
CIRCUITPY_BITBANGIO = 1
52-
# Requires DigitalIO
53-
CIRCUITPY_GAMEPADSHIFT = 1
5452
# Requires neopixel_write or SPI (dotstar)
5553
CIRCUITPY_PIXELBUF = 0
5654
# Requires OS

py/circuitpy_defns.mk

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,6 @@ ifeq ($(CIRCUITPY_FREQUENCYIO),1)
191191
SRC_PATTERNS += frequencyio/%
192192
endif
193193

194-
ifeq ($(CIRCUITPY_GAMEPADSHIFT),1)
195-
SRC_PATTERNS += gamepadshift/%
196-
endif
197194
ifeq ($(CIRCUITPY_GETPASS),1)
198195
SRC_PATTERNS += getpass/%
199196
endif
@@ -532,8 +529,6 @@ SRC_SHARED_MODULE_ALL = \
532529
fontio/__init__.c \
533530
framebufferio/FramebufferDisplay.c \
534531
framebufferio/__init__.c \
535-
gamepadshift/GamePadShift.c \
536-
gamepadshift/__init__.c \
537532
getpass/__init__.c \
538533
ipaddress/IPv4Address.c \
539534
ipaddress/__init__.c \

py/circuitpy_mpconfig.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -268,14 +268,6 @@ typedef long mp_off_t;
268268
#define CIRCUITPY_DISPLAY_LIMIT (0)
269269
#endif
270270

271-
#if CIRCUITPY_GAMEPADSHIFT
272-
// Scan gamepad every 32ms
273-
#define CIRCUITPY_GAMEPAD_TICKS 0x1f
274-
#define GAMEPAD_ROOT_POINTERS mp_obj_t gamepad_singleton;
275-
#else
276-
#define GAMEPAD_ROOT_POINTERS
277-
#endif
278-
279271
#if CIRCUITPY_KEYPAD
280272
#define KEYPAD_ROOT_POINTERS mp_obj_t keypad_scanners_linked_list;
281273
#else
@@ -369,7 +361,6 @@ extern const struct _mp_obj_module_t nvm_module;
369361
// CIRCUITPY_FONTIO
370362
// CIRCUITPY_FRAMEBUFFERIO
371363
// CIRCUITPY_FREQUENCYIO
372-
// CIRCUITPY_GAMEPADSHIFT
373364
// CIRCUITPY_GETPASS
374365
// CIRCUITPY_GNSS
375366
// CIRCUITPY_I2CPERIPHERAL
@@ -442,7 +433,6 @@ struct _supervisor_allocation_node;
442433
#define CIRCUITPY_COMMON_ROOT_POINTERS \
443434
FLASH_ROOT_POINTERS \
444435
KEYPAD_ROOT_POINTERS \
445-
GAMEPAD_ROOT_POINTERS \
446436
BOARD_UART_ROOT_POINTER \
447437
MEMORYMONITOR_ROOT_POINTERS \
448438
vstr_t *repl_line; \

py/circuitpy_mpconfig.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,9 +208,6 @@ CFLAGS += -DCIRCUITPY__EVE=$(CIRCUITPY__EVE)
208208
CIRCUITPY_FREQUENCYIO ?= $(CIRCUITPY_FULL_BUILD)
209209
CFLAGS += -DCIRCUITPY_FREQUENCYIO=$(CIRCUITPY_FREQUENCYIO)
210210

211-
CIRCUITPY_GAMEPADSHIFT ?= 0
212-
CFLAGS += -DCIRCUITPY_GAMEPADSHIFT=$(CIRCUITPY_GAMEPADSHIFT)
213-
214211
CIRCUITPY_GETPASS ?= $(CIRCUITPY_FULL_BUILD)
215212
CFLAGS += -DCIRCUITPY_GETPASS=$(CIRCUITPY_GETPASS)
216213

shared-bindings/gamepadshift/GamePadShift.c

Lines changed: 0 additions & 123 deletions
This file was deleted.

shared-bindings/gamepadshift/GamePadShift.h

Lines changed: 0 additions & 42 deletions
This file was deleted.

shared-bindings/gamepadshift/__init__.c

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)