Merge remote-tracking branch 'origin/main'

Author: weblate

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_GAMEPADSHIFT = 0
     # Requires neopixel_write or SPI (dotstar)
     CIRCUITPY_PIXELBUF = 0
     # Requires OS

docs/redirects.txt

@@ -80,10 +80,6 @@ shared-bindings/framebufferio/FramebufferDisplay.rst shared-bindings/framebuffer
 shared-bindings/framebufferio/__init__.rst shared-bindings/framebufferio/
 shared-bindings/frequencyio/FrequencyIn.rst shared-bindings/frequencyio/#frequencyio.FrequencyIn
 shared-bindings/frequencyio/__init__.rst shared-bindings/frequencyio/
-shared-bindings/gamepad/GamePad.rst shared-bindings/gamepad/#gamepad.GamePad
-shared-bindings/gamepad/__init__.rst shared-bindings/gamepad/
-shared-bindings/gamepadshift/GamePadShift.rst shared-bindings/gamepadshift/#gamepadshift.GamePadShift
-shared-bindings/gamepadshift/__init__.rst shared-bindings/gamepadshift/
 shared-bindings/gnss/__init__.rst shared-bindings/gnss/
 shared-bindings/i2cperipheral/__init__.rst shared-bindings/i2cperipheral/
 shared-bindings/i2csecondary/__init__.rst shared-bindings/i2csecondary/

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

@@ -10,4 +10,4 @@ QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = GD25Q16C
 LONGINT_IMPL = MPZ
 
-CIRCUITPY_GAMEPADSHIFT = 1
+CIRCUITPY_KEYPAD = 1

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

@@ -12,8 +12,8 @@ LONGINT_IMPL = MPZ
 
 CIRCUITPY_AESIO = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
-CIRCUITPY_GAMEPADSHIFT = 1
 CIRCUITPY_GIFIO = 0
+CIRCUITPY_KEYPAD = 1
 CIRCUITPY_STAGE = 1
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-stage/pybadge

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

@@ -12,8 +12,8 @@ LONGINT_IMPL = MPZ
 
 CIRCUITPY_AESIO = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
-CIRCUITPY_GAMEPADSHIFT = 1
 CIRCUITPY_GIFIO = 0
+CIRCUITPY_KEYPAD = 1
 CIRCUITPY_STAGE = 1
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-stage/pygamer

ports/atmel-samd/supervisor/port.c

@@ -122,9 +122,6 @@
 
 #include "tusb.h"
 
-#if CIRCUITPY_GAMEPADSHIFT
-#include "shared-module/gamepadshift/__init__.h"
-#endif
 #if CIRCUITPY_PEW
 #include "common-hal/_pew/PewPew.h"
 #endif
@@ -428,9 +425,6 @@ void reset_port(void) {
 
     reset_gclks();
 
-    #if CIRCUITPY_GAMEPADSHIFT
-    gamepadshift_reset();
-    #endif
     #if CIRCUITPY_PEW
     pew_reset();
     #endif

ports/mimxrt10xx/supervisor/port.c

@@ -46,9 +46,6 @@
 
 #include "supervisor/background_callback.h"
 
-#if CIRCUITPY_GAMEPADSHIFT
-#include "shared-module/gamepadshift/__init__.h"
-#endif
 #if CIRCUITPY_PEW
 #include "shared-module/_pew/PewPew.h"
 #endif
@@ -294,9 +291,6 @@ void reset_port(void) {
     rtc_reset();
     #endif
 
-    #if CIRCUITPY_GAMEPADSHIFT
-    gamepadshift_reset();
-    #endif
     #if CIRCUITPY_PEW
     pew_reset();
     #endif

ports/stm/boards/swan_r5/mpconfigboard.mk

@@ -49,8 +49,6 @@ CIRCUITPY_DISPLAYIO = 0
 # any port once their prerequisites in common-hal are complete.
 # Requires DigitalIO:
 CIRCUITPY_BITBANGIO = 1
-# Requires DigitalIO
-CIRCUITPY_GAMEPADSHIFT = 1
 # Requires neopixel_write or SPI (dotstar)
 CIRCUITPY_PIXELBUF = 0
 # Requires OS

py/circuitpy_defns.mk

@@ -181,9 +181,6 @@ ifeq ($(CIRCUITPY_FUTURE),1)
 SRC_PATTERNS += __future__/%
 endif
 
-ifeq ($(CIRCUITPY_GAMEPADSHIFT),1)
-SRC_PATTERNS += gamepadshift/%
-endif
 ifeq ($(CIRCUITPY_GETPASS),1)
 SRC_PATTERNS += getpass/%
 endif
@@ -553,8 +550,6 @@ SRC_SHARED_MODULE_ALL = \
 	fontio/__init__.c \
 	framebufferio/FramebufferDisplay.c \
 	framebufferio/__init__.c \
-	gamepadshift/GamePadShift.c \
-	gamepadshift/__init__.c \
 	getpass/__init__.c \
 	gifio/__init__.c \
 	gifio/GifWriter.c \

py/circuitpy_mpconfig.h

@@ -311,14 +311,6 @@ typedef long mp_off_t;
 #define CIRCUITPY_DISPLAY_AREA_BUFFER_SIZE (0)
 #endif
 
-#if 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_KEYPAD
 #define KEYPAD_ROOT_POINTERS mp_obj_t keypad_scanners_linked_list;
 #else
@@ -419,7 +411,6 @@ struct _supervisor_allocation_node;
 #define CIRCUITPY_COMMON_ROOT_POINTERS \
     FLASH_ROOT_POINTERS \
     KEYPAD_ROOT_POINTERS \
-    GAMEPAD_ROOT_POINTERS \
     BOARD_UART_ROOT_POINTER \
     WIFI_MONITOR_ROOT_POINTERS \
     MEMORYMONITOR_ROOT_POINTERS \

py/circuitpy_mpconfig.mk

@@ -227,9 +227,6 @@ CFLAGS += -DCIRCUITPY_FREQUENCYIO=$(CIRCUITPY_FREQUENCYIO)
 CIRCUITPY_FUTURE ?= 1
 CFLAGS += -DCIRCUITPY_FUTURE=$(CIRCUITPY_FUTURE)
 
-CIRCUITPY_GAMEPADSHIFT ?= 0
-CFLAGS += -DCIRCUITPY_GAMEPADSHIFT=$(CIRCUITPY_GAMEPADSHIFT)
-
 CIRCUITPY_GETPASS ?= $(CIRCUITPY_FULL_BUILD)
 CFLAGS += -DCIRCUITPY_GETPASS=$(CIRCUITPY_GETPASS)