Merge pull request #6316 from dhalbert/spacing-fix

dhalbert · web-flow · commit 862188d2ee91 · 2022-04-26T20:14:46.000-04:00
update frozen libraries and remove stray space
diff --git a/frozen/Adafruit_CircuitPython_BLE b/frozen/Adafruit_CircuitPython_BLE
@@ -1 +1 @@
-Subproject commit de7cacfbb4bddf74f5188f23b56f075c884f98c4
+Subproject commit 13c529288e9431541fe58cf7992d4f53f7ca3b76
diff --git a/frozen/Adafruit_CircuitPython_Motor b/frozen/Adafruit_CircuitPython_Motor
@@ -1 +1 @@
-Subproject commit fd478fda7adbd254282b8cad5000f06a96760c91
+Subproject commit 207953aac033d40728b5f8dd7fd73d90facbca5c
diff --git a/frozen/Adafruit_CircuitPython_PortalBase b/frozen/Adafruit_CircuitPython_PortalBase
@@ -1 +1 @@
-Subproject commit 2bc1b86ef2e709f31aea65469964b777f1da6d5b
+Subproject commit bcfaae874fbae294ce04549d55b96d6b41603944
diff --git a/frozen/Adafruit_CircuitPython_SD b/frozen/Adafruit_CircuitPython_SD
@@ -1 +1 @@
-Subproject commit 22cb706e5f718988d5442246120defd21c5937c9
+Subproject commit da02c76d4c802cd5abac73a5f274243b05e8cb35
diff --git a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk
@@ -15,6 +15,7 @@ LONGINT_IMPL = NONE
 CIRCUITPY_BUSDEVICE = 1
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_KEYPAD = 0
+CIRCUITPY_ONEWIREIO = 0
 
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground
diff --git a/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk
@@ -9,3 +9,5 @@ CHIP_FAMILY = samd21
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "S25FL064L"
 LONGINT_IMPL = MPZ
+
+CIRCUITPY_ONEWIREIO = 0
diff --git a/ports/atmel-samd/common-hal/neopixel_write/__init__.c b/ports/atmel-samd/common-hal/neopixel_write/__init__.c
@@ -100,7 +100,7 @@ static void neopixel_send_buffer_core(volatile uint32_t *clraddr, uint32_t pinMa
         "        movs r6, #1; d3: sub r6, #1; bne d3;"          // 60 ns (end TOL or entire T1L)
                                                                 // other instructions add more delay
         #endif
-         #ifdef SAM_D5X_E5X
+        #ifdef SAM_D5X_E5X
         "        movs r6, #18; d3: subs r6, #1; bne d3;"        // extra for 936 ns total (byte end T0L or entire T1L)
         #endif
         "        cmp r2, r3;"
