Merge pull request #4942 from pewpew-game/main

PewPew M4: use keypad instead of gamepad
This commit is contained in:
Limor "Ladyada" Fried 2021-06-29 11:54:01 -04:00 committed by GitHub
commit 176c5c5cd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions

@ -1 +1 @@
Subproject commit 40d8a03b4569d566faa62fcb0f798178118f2954 Subproject commit b014aa045d9014b86a4ae583f452c6b8282a61b9

View File

@ -30,14 +30,17 @@ CIRCUIPTY_USB_CDC = 0
CIRCUITPY_USB_HID = 0 CIRCUITPY_USB_HID = 0
CIRCUITPY_USB_MIDI = 0 CIRCUITPY_USB_MIDI = 0
CIRCUITPY_VECTORIO = 0 CIRCUITPY_VECTORIO = 0
CIRCUITPY_GAMEPAD = 0
CIRCUITPY_PWMIO = 0
CIRCUITPY_ANALOGIO = 1 CIRCUITPY_ANALOGIO = 1
CIRCUITPY_AUDIOMIXER = 1 CIRCUITPY_AUDIOMIXER = 1
CIRCUITPY_AUDIOIO = 1 CIRCUITPY_AUDIOIO = 1
CIRCUITPY_SYNTHIO = 1
CIRCUITPY_DISPLAYIO = 1 CIRCUITPY_DISPLAYIO = 1
CIRCUITPY_GAMEPAD = 1
CIRCUITPY_MATH = 1 CIRCUITPY_MATH = 1
CIRCUITPY_STAGE = 1 CIRCUITPY_STAGE = 1
CIRCUITPY_KEYPAD = 1
FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-stage/pewpew_m4 FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-stage/pewpew_m4
CIRCUITPY_DISPLAY_FONT = $(TOP)/ports/atmel-samd/boards/ugame10/brutalist-6.bdf CIRCUITPY_DISPLAY_FONT = $(TOP)/ports/atmel-samd/boards/ugame10/brutalist-6.bdf