Merge pull request adafruit#965 from dhalbert/3.x-crickit-lib

tannewt · web-flow · commit 6908eed7ef5e · 2018-06-28T13:51:35.000-07:00
3.x crickit lib
diff --git 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/docs/drivers.rst b/docs/drivers.rst
@@ -191,6 +191,7 @@ These provide functionality similar to `analogio`, `digitalio`, `pulseio`, and `
 
     Adafruit SeeSaw <https://circuitpython.readthedocs.io/projects/seesaw/en/latest/>
     ADS1x15 Analog-to-Digital Converter  <https://circuitpython.readthedocs.io/projects/ads1x15/en/latest/>
+    Crickit Robotics Boards <<https://circuitpython.readthedocs.io/projects/crickit/en/latest/>
     DS2413 OneWire GPIO Expander <https://circuitpython.readthedocs.io/projects/ds2413/en/latest/>
     FocalTech Capacitive Touch <https://circuitpython.readthedocs.io/projects/focaltouch/en/latest/>
     MCP230xx GPIO Expander <https://circuitpython.readthedocs.io/projects/mcp230xx/en/latest/>
@@ -200,7 +201,6 @@ These provide functionality similar to `analogio`, `digitalio`, `pulseio`, and `
     TLC59711 12 x 16-bit PWM Driver <https://circuitpython.readthedocs.io/projects/tlc59711/en/latest/>
     MPR121 Capacitive Touch Sensor <https://circuitpython.readthedocs.io/projects/mpr121/en/latest/>
 
-
 Miscellaneous
 ----------------
 
diff --git a/frozen/Adafruit_CircuitPython_Crickit b/frozen/Adafruit_CircuitPython_Crickit
@@ -0,0 +1 @@
+Subproject commit abae54a38035dcf0b9a5fd688940880dbc68d61d
diff --git a/frozen/Adafruit_CircuitPython_Motor b/frozen/Adafruit_CircuitPython_Motor
@@ -1 +1 @@
-Subproject commit 6da5d14b98ac3d929662731f73ce03c0c958b520
+Subproject commit 683004104d4612f230de12946a46467abbc507e8
diff --git 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
@@ -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
@@ -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
@@ -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
