Merge pull request #6316 from dhalbert/spacing-fix

update frozen libraries and remove stray space
This commit is contained in:
Dan Halbert 2022-04-26 20:14:46 -04:00 committed by GitHub
commit 862188d2ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 8 additions and 5 deletions

@ -1 +1 @@
Subproject commit de7cacfbb4bddf74f5188f23b56f075c884f98c4
Subproject commit 13c529288e9431541fe58cf7992d4f53f7ca3b76

@ -1 +1 @@
Subproject commit fd478fda7adbd254282b8cad5000f06a96760c91
Subproject commit 207953aac033d40728b5f8dd7fd73d90facbca5c

@ -1 +1 @@
Subproject commit 2bc1b86ef2e709f31aea65469964b777f1da6d5b
Subproject commit bcfaae874fbae294ce04549d55b96d6b41603944

@ -1 +1 @@
Subproject commit 22cb706e5f718988d5442246120defd21c5937c9
Subproject commit da02c76d4c802cd5abac73a5f274243b05e8cb35

View File

@ -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

View File

@ -9,3 +9,5 @@ CHIP_FAMILY = samd21
SPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = "S25FL064L"
LONGINT_IMPL = MPZ
CIRCUITPY_ONEWIREIO = 0

View File

@ -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;"