8000 Merge in master. · sparkfun/circuitpython@1214923 · GitHub
[go: up one dir, main page]
Skip to content

Commit 1214923

Browse files
tdicolatdicola
committed
Merge in master.
2 parents d738757 + 7e08347 commit 1214923

File tree

45 files changed

+16179
-1699
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+16179
-1699
lines changed

‎atmel-samd/Makefile

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,12 @@ INC += -I../lib/timeutils
3434
INC += -Icommon-hal/modules/
3535
INC += -Iasf/common/boards/
3636
INC += -Iasf/common/services/sleepmgr/
37+
INC += -Iasf/common/services/storage/ctrl_access/
3738
INC += -Iasf/common/services/usb/
3839
INC += -Iasf/common/services/usb/class/cdc/
3940
INC += -Iasf/common/services/usb/class/cdc/device/
41+
INC += -Iasf/common/services/usb/class/msc/
42+
INC += -Iasf/common/services/usb/class/msc/device/
4043
INC += -Iasf/common/services/usb/udc/
4144
INC += -Iasf/common/utils
4245
INC += -Iasf/common2/services/delay/
@@ -77,8 +80,8 @@ CFLAGS_CORTEX_M0 = \
7780
-fsingle-precision-constant \
7881
-Wdouble-promotion \
7982
-D__SAMD21G18A__ \
80-
-DUSB_DEVICE_PRODUCT_ID=0x024D \
81-
-DUSB_DEVICE_VENDOR_ID=0x4123 \
83+
-DUSB_DEVICE_PRODUCT_ID=$(USB_PID) \
84+
-DUSB_DEVICE_VENDOR_ID=$(USB_VID) \
8285
-DBOARD=USER_BOARD \
8386
-ffunction-sections \
8487
-fdata-sections \
@@ -92,8 +95,10 @@ CFLAGS_CORTEX_M0 = \
9295
CFLAGS = $(INC) -Wall -Werror -ansi -std=gnu99 -nostdlib $(CFLAGS_CORTEX_M0) $(COPT)
9396

9497
#Debugging/Optimization
98+
# TODO(tannewt): Figure out what NDEBUG does. Adding it to the debug build
99+
# reduces code size pretty dramatically.
95100
ifeq ($(DEBUG), 1)
96-
CFLAGS += -Os -ggdb
101+
CFLAGS += -Os -ggdb -DNDEBUG -DENABLE_MICRO_TRACE_BUFFER
97102
else
98103
CFLAGS += -Os -DNDEBUG
99104
endif
@@ -140,12 +145,15 @@ SRC_C = \
140145
modutime.c \
141146
mphalport.c \
142147
pin_named_pins.c \
148+
rom_fs.c \
143149
samdneopixel.c \
144150
storage.c \
145151
uart.c \
146152
asf/common/services/sleepmgr/samd/sleepmgr.c \
153+
asf/common/services/storage/ctrl_access/ctrl_access.c \
147154
asf/common/services/usb/class/cdc/device/udi_cdc.c \
148-
asf/common/services/usb/class/cdc/device/udi_cdc_desc.c \
155+
asf/common/services/usb/class/composite/device/udi_composite_desc.c \
156+
asf/common/services/usb/class/msc/device/udi_msc.c \
149157
asf/common/services/usb/udc/udc.c \
150158
asf/common/utils/interrupt/interrupt_sam_nvic.c \
151159
asf/common2/services/delay/sam0/systick_counter.c \

‎atmel-samd/README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,11 @@ Board names are the directory names in the `boards` folder.
2323

2424
### Arduino Bootloader
2525
If your board has an existing Arduino bootloader on it then you can use bossac
26-
to flash MicroPython. After building run:
26+
to flash MicroPython. First, activate the bootloader. On Adafruit Feathers you
27+
can double click the reset button and the #13 will fade in and out. Finally,
28+
run bossac:
2729

28-
tools/bossac_osx -e -w -v -b build-feather_m0_ble/firmware.bin
30+
tools/bossac_osx -e -w -v -b -R build-feather_m0_ble/firmware.bin
2931

3032
### No Bootloader via GDB
3133
This method works for loading MicroPython onto the Arduino Zero via the

0 commit comments

Comments
 (0)
0