From a50ee4f6503af0c6d0f62976a4aa2c1de0f694f1 Mon Sep 17 00:00:00 2001 From: Radomir Dopieralski Date: Sun, 17 Mar 2019 13:31:14 +0100 Subject: [PATCH] Add frozen stage module to ugame10 board And also ignore some more pins. This is needed for the builds on the circuitpython.org to be functional. --- .gitmodules | 3 +++ frozen/circuitpython-stage | 1 + .../atmel-samd/boards/ugame10/mpconfigboard.h | 23 +++++++++++++++++++ .../boards/ugame10/mpconfigboard.mk | 16 +++++++++++-- 4 files changed, 41 insertions(+), 2 deletions(-) create mode 160000 frozen/circuitpython-stage diff --git a/.gitmodules b/.gitmodules index 1f7a28d142..5f8eec8b5e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -95,3 +95,6 @@ [submodule "frozen/pew-pewpew-standalone-10.x"] path = frozen/pew-pewpew-standalone-10.x url = https://github.com/pewpew-game/pew-pewpew-standalone-10.x.git +[submodule "frozen/circuitpython-stage"] + path = frozen/circuitpython-stage + url = https://github.com/python-ugame/circuitpython-stage diff --git a/frozen/circuitpython-stage b/frozen/circuitpython-stage new file mode 160000 index 0000000000..d8a9d8c1d7 --- /dev/null +++ b/frozen/circuitpython-stage @@ -0,0 +1 @@ +Subproject commit d8a9d8c1d73041e4cc5669c5441f531ecba517fc diff --git a/ports/atmel-samd/boards/ugame10/mpconfigboard.h b/ports/atmel-samd/boards/ugame10/mpconfigboard.h index c22a3f7351..caa05bc1ae 100644 --- a/ports/atmel-samd/boards/ugame10/mpconfigboard.h +++ b/ports/atmel-samd/boards/ugame10/mpconfigboard.h @@ -24,6 +24,29 @@ { MP_OBJ_NEW_QSTR(MP_QSTR_gamepad),(mp_obj_t)&gamepad_module }, \ { MP_OBJ_NEW_QSTR(MP_QSTR__stage), (mp_obj_t)&stage_module } +#define IGNORE_PIN_PB00 1 +#define IGNORE_PIN_PB01 1 +#define IGNORE_PIN_PB02 1 +#define IGNORE_PIN_PB03 1 +#define IGNORE_PIN_PB04 1 +#define IGNORE_PIN_PB05 1 +#define IGNORE_PIN_PB06 1 +#define IGNORE_PIN_PB07 1 +#define IGNORE_PIN_PB08 1 +#define IGNORE_PIN_PB09 1 +#define IGNORE_PIN_PB10 1 +#define IGNORE_PIN_PB11 1 +#define IGNORE_PIN_PB12 1 +#define IGNORE_PIN_PB13 1 +#define IGNORE_PIN_PB14 1 +#define IGNORE_PIN_PB15 1 +#define IGNORE_PIN_PB16 1 +#define IGNORE_PIN_PB17 1 +#define IGNORE_PIN_PB22 1 +#define IGNORE_PIN_PB23 1 +#define IGNORE_PIN_PB30 1 +#define IGNORE_PIN_PB31 1 + // USB is always used internally so skip the pin objects for it. #define IGNORE_PIN_PA24 1 #define IGNORE_PIN_PA25 1 diff --git a/ports/atmel-samd/boards/ugame10/mpconfigboard.mk b/ports/atmel-samd/boards/ugame10/mpconfigboard.mk index 6dc0af9cfb..0a727c8b16 100644 --- a/ports/atmel-samd/boards/ugame10/mpconfigboard.mk +++ b/ports/atmel-samd/boards/ugame10/mpconfigboard.mk @@ -1,5 +1,4 @@ LD_FILE = boards/samd21x18-bootloader-external-flash-crystalless.ld -#LD_FILE = boards/samd21x18-bootloader.ld USB_VID = 0x239A USB_PID = 0x801F USB_PRODUCT = "uGame10" @@ -13,5 +12,18 @@ LONGINT_IMPL = MPZ CHIP_VARIANT = SAMD21E18A CHIP_FAMILY = samd21 +CIRCUITPY_STAGE = 1 +CIRCUITPY_MATH = 1 +CIRCUITPY_AUDIOIO = 1 +CIRCUITPY_ANALOGIO = 1 +CIRCUITPY_GAMEPAD = 1 +CIRCUITPY_TOUCHIO = 0 +CIRCUITPY_NEOPIXEL_WRITE = 0 +CIRCUITPY_RTC = 0 +CIRCUITPY_SAMD = 0 +CIRCUITPY_USB_MIDI = 0 +CIRCUITPY_USB_HID = 0 +CIRCUITPY_FREQUENCYIO = 0 +CIRCUITPY_SMALL_BUILD = 1 -FROZEN_MPY_DIRS += $(TOP)/frozen/ugame10 +FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-stage