From 1f3de5174e236a4d6431e336163b30a47f44dffb Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Tue, 26 Jun 2018 19:49:55 -0400 Subject: [PATCH 1/3] Freeze Adafruit_CircuitPython_Crickit into crickit builds --- .gitmodules | 3 +++ frozen/Adafruit_CircuitPython_Crickit | 1 + frozen/Adafruit_CircuitPython_seesaw | 2 +- ports/atmel-samd/Makefile | 3 +++ .../boards/circuitplayground_express_crickit/mpconfigboard.mk | 3 +++ .../boards/feather_m0_express_crickit/mpconfigboard.mk | 3 +++ 6 files changed, 14 insertions(+), 1 deletion(-) create mode 160000 frozen/Adafruit_CircuitPython_Crickit diff --git a/.gitmodules b/.gitmodules index 61f5b5572e..8c834ba53f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -70,3 +70,6 @@ [submodule "ports/atmel-samd/peripherals"] path = ports/atmel-samd/peripherals url = https://github.com/adafruit/samd-peripherals.git +[submodule "frozen/Adafruit_CircuitPython_Crickit"] + path = frozen/Adafruit_CircuitPython_Crickit + url = https://github.com/adafruit/Adafruit_CircuitPython_Crickit diff --git a/frozen/Adafruit_CircuitPython_Crickit b/frozen/Adafruit_CircuitPython_Crickit new file mode 160000 index 0000000000..69669f8533 --- /dev/null +++ b/frozen/Adafruit_CircuitPython_Crickit @@ -0,0 +1 @@ +Subproject commit 69669f85339f23e7c32ea07cfb2ee00b06c37e7b diff --git a/frozen/Adafruit_CircuitPython_seesaw b/frozen/Adafruit_CircuitPython_seesaw index 498f59bf92..bf808037b3 160000 --- a/frozen/Adafruit_CircuitPython_seesaw +++ b/frozen/Adafruit_CircuitPython_seesaw @@ -1 +1 @@ -Subproject commit 498f59bf926477b3a8fb8eb157ca05eb12c3e298 +Subproject commit bf808037b3fb918353f514ef847d47a2d53a9546 diff --git a/ports/atmel-samd/Makefile b/ports/atmel-samd/Makefile index b7181aa3b1..62f058c3d7 100644 --- a/ports/atmel-samd/Makefile +++ b/ports/atmel-samd/Makefile @@ -117,6 +117,9 @@ else ifdef INTERNAL_FLASH_FILESYSTEM CFLAGS += -finline-limit=55 endif + ifdef CFLAGS_INLINE_LIMIT + CFLAGS += -finline-limit=$(CFLAGS_INLINE_LIMIT) + endif CFLAGS += -flto endif diff --git a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk index 0145bf7850..a1c40424f0 100644 --- a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk +++ b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk @@ -11,9 +11,12 @@ LONGINT_IMPL = NONE CHIP_VARIANT = SAMD21G18A CHIP_FAMILY = samd21 +CFLAGS_INLINE_LIMIT = 65 + # Include these Python libraries in firmware. FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Crickit FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Motor FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel diff --git a/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.mk index 4096560c22..bc9ec89ac6 100644 --- a/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.mk +++ b/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.mk @@ -10,8 +10,11 @@ LONGINT_IMPL = MPZ CHIP_VARIANT = SAMD21G18A CHIP_FAMILY = samd21 +CFLAGS_INLINE_LIMIT = 65 + # Include these Python libraries in firmware. FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Crickit FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Motor FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_seesaw From f5df3d37eaa320fed9968a4e7640ec333e7f6cdd Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Tue, 26 Jun 2018 19:56:10 -0400 Subject: [PATCH 2/3] add Crickit library to docs/drivers.rst --- docs/drivers.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/drivers.rst b/docs/drivers.rst index 951967e09e..37bebb46ac 100644 --- a/docs/drivers.rst +++ b/docs/drivers.rst @@ -191,6 +191,7 @@ These provide functionality similar to `analogio`, `digitalio`, `pulseio`, and ` Adafruit SeeSaw ADS1x15 Analog-to-Digital Converter + Crickit Robotics Boards < DS2413 OneWire GPIO Expander FocalTech Capacitive Touch MCP230xx GPIO Expander @@ -200,7 +201,6 @@ These provide functionality similar to `analogio`, `digitalio`, `pulseio`, and ` TLC59711 12 x 16-bit PWM Driver MPR121 Capacitive Touch Sensor - Miscellaneous ---------------- From d98701c8d16974177dbfd3c28dc5204223fb9a65 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Wed, 27 Jun 2018 21:27:10 -0400 Subject: [PATCH 3/3] updates crickit and motor frozn libs with latest changes, including 550-2400 default servo range --- frozen/Adafruit_CircuitPython_Crickit | 2 +- frozen/Adafruit_CircuitPython_Motor | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frozen/Adafruit_CircuitPython_Crickit b/frozen/Adafruit_CircuitPython_Crickit index 69669f8533..abae54a380 160000 --- a/frozen/Adafruit_CircuitPython_Crickit +++ b/frozen/Adafruit_CircuitPython_Crickit @@ -1 +1 @@ -Subproject commit 69669f85339f23e7c32ea07cfb2ee00b06c37e7b +Subproject commit abae54a38035dcf0b9a5fd688940880dbc68d61d diff --git a/frozen/Adafruit_CircuitPython_Motor b/frozen/Adafruit_CircuitPython_Motor index 6da5d14b98..683004104d 160000 --- a/frozen/Adafruit_CircuitPython_Motor +++ b/frozen/Adafruit_CircuitPython_Motor @@ -1 +1 @@ -Subproject commit 6da5d14b98ac3d929662731f73ce03c0c958b520 +Subproject commit 683004104d4612f230de12946a46467abbc507e8