diff options
| author | Dan Halbert <halbert@adafruit.com> | 2020-01-01 13:59:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-01 13:59:02 -0500 |
| commit | 32b82032a1af88314aa260665a4bfd8c4b7a6988 (patch) | |
| tree | 1d57975b8ebb0840a7392b6ff2a44dc4b2eb2b94 | |
| parent | 1bc9279ba0c9b1797d4d9794af3956eed5afefea (diff) | |
| parent | 6205b55b192991916befc5aba45d1da08d5600ad (diff) | |
Merge pull request #2423 from pewpew-game/pewpew-m4-update
Update the PewPew M4 board and circuitpython-stage
| m--------- | frozen/circuitpython-stage | 0 | ||||
| -rw-r--r-- | ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk | 13 |
2 files changed, 12 insertions, 1 deletions
diff --git a/frozen/circuitpython-stage b/frozen/circuitpython-stage -Subproject c1d8e1d645cbc83d857e12cf4ba67549b988a4e +Subproject 8d5cc384058b1cb296aaeab86fb8405042d547e diff --git a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk index 990b26ff3..1d1891e8e 100644 --- a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk +++ b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk @@ -10,7 +10,6 @@ INTERNAL_FLASH_FILESYSTEM = 1 LONGINT_IMPL = NONE CIRCUITPY_SMALL_BUILD = 1 -CIRCUITPY_PS2IO = 0 CIRCUITPY_AUDIOBUSIO = 0 CIRCUITPY_BITBANGIO = 0 CIRCUITPY_FREQUENCYIO = 0 @@ -23,7 +22,17 @@ CIRCUITPY_RTC = 0 CIRCUITPY_TOUCHIO = 0 CIRCUITPY_USB_HID = 0 CIRCUITPY_USB_MIDI = 0 +CIRCUITPY_AUDIOPWMIO = 0 +CIRCUITPY_AUDIOMP3 = 0 +CIRCUITPY_BITBANG_APA102 = 0 +CIRCUITPY_BLEIO = 0 +CIRCUITPY_GAMEPADSHIFT = 0 +CIRCUITPY_NETWORK = 0 +CIRCUITPY_ROTARYIO = 0 +CIRCUITPY_SAMD = 0 +CIRCUITPY_TOUCHIO = 0 +CIRCUITPY_AUDIOMIXER = 1 CIRCUITPY_AUDIOIO = 1 CIRCUITPY_DISPLAYIO = 1 CIRCUITPY_GAMEPAD = 1 @@ -33,6 +42,8 @@ CIRCUITPY_MATH = 1 FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-stage/pewpew_m4 CIRCUITPY_DISPLAY_FONT = $(TOP)/ports/atmel-samd/boards/ugame10/brutalist-6.bdf +USB_DEVICES = "CDC,MSC" + # Tweak inlining depending on language. ifeq ($(TRANSLATION), zh_Latn_pinyin) CFLAGS_INLINE_LIMIT = 45 |