Skip to content

Commit a2024c7

Browse files
ladyadaladyada
committed
Merge branch 'master' of https://github.com/arduino/ArduinoCore-samd into upstreammerge_150304
Conflicts: boards.txt cores/arduino/USB/CDC.cpp libraries/USBHost/src/Usb.cpp platform.txt
2 parents 21b53d1 + dd6890a commit a2024c7

Some content is hidden

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

57 files changed

+1651
-359
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
*.bz2
2+
3+
bootloaders/*/build/

‎CHANGELOG

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,37 @@
1-
SAMD CORE 1.6.3
1+
SAMD CORE 1.6.5
22

3+
* Set NVMCTRL.MANW bit to 1 (default is 0). This prevents accidental writes on program memory.
4+
* Bootloader: Fixed wrong UART speed (regression)
5+
6+
SAMD CORE 1.6.4 2016.02.19
7+
8+
* Fixed Wire address setup when running as slave.
9+
* Fixed String constructor when using floating point numbers.
10+
* USBHost: fixed blocking USBHost.Task(). Thanks @bbx10
11+
* USBHost: fixed some ASCII Control codes in keyboard controller. Thanks @bbx10
12+
* USBHost: ported some minor fix from upstream UHS2. Thanks @bbx10
13+
* USBHost: fixed wrong library initialization. Thanks @bbx10 @ladyada
14+
* better interrupt handling in Serial::accept()
15+
16+
SAMD CORE 1.6.3 2016.02.15
17+
18+
* Added drivers for Arduino/Genuino MKR1000 board
19+
* Fixed Wire master repeated start behaviour
20+
* Added SerialUSB methods: readBreak(), baud(), stopbits(), paritytype(), numbits(), dtr(), rts()
321
* Added SPI.transfer16(..) method
422
* Bugfix: added missing Serial.begin(baud, config) method. Thanks @tuxedo0801
23+
* Fixed Serial baudrate calculations for 1200bps. Thanks @TomKeddie
24+
* Fixed Serial.flush() that now waits until the last bit has been sent. Thanks @TomKeddie
25+
* Fixed Serial configuration for data-bit. Thanks @TomKeddie
526
* Bootloader: 32Khz external oscillator is now used, improves USB clock. Thanks @aethaniel
627
* Bootloader: Clean up of makefiles and file organization. Thanks @aethaniel
728
* Added PWM capability to pins A1/A2 of Arduino Zero.
829
* variant.h/cpp: PWM capability is now determined by PIN_ATTR_PWM combined with
930
PIN_ATTR_TIMER or PIN_ATTR_TIMER_ALT for timer selection.
31+
* Small fix to USBHost example "USB_desc.ino". Thanks @bbx10
32+
* USBHost: USB-Keyboard right shift key was ignored. Thanks @bbx10
33+
* Wire library now support multiple instances in variant. Thanks @spiderkeys
34+
* Ported some SerialUSB API (readBreak(), baud(), stopbits(), paritytype(), numbits(), dtr(), rts())
1035

1136
SAMD CORE 1.6.2 2015.11.03
1237

‎boards.txt

Lines changed: 71 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,71 @@
1-
# Copyright (c) 2014-2015 Arduino LLC. All right reserved.
2-
#
3-
# This library is free software; you can redistribute it and/or
4-
# modify it under the terms of the GNU Lesser General Public
5-
# License as published by the Free Software Foundation; either
6-
# version 2.1 of the License, or (at your option) any later version.
7-
#
8-
# This library is distributed in the hope that it will be useful,
9-
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10-
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
11-
# See the GNU Lesser General Public License for more details.
12-
#
13-
# You should have received a copy of the GNU Lesser General Public
14-
# License along with this library; if not, write to the Free Software
15-
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
16-
17-
18-
adafruit_feather_m0.name=Adafruit Feather M0 (Native USB Port)
19-
adafruit_feather_m0.vid.0=0x239A
20-
adafruit_feather_m0.pid.0=0x800B
21-
adafruit_feather_m0.vid.1=0x239A
22-
adafruit_feather_m0.pid.1=0x000B
23-
adafruit_feather_m0.upload.tool=bossac
24-
adafruit_feather_m0.upload.protocol=sam-ba
25-
adafruit_feather_m0.upload.maximum_size=262144
26-
adafruit_feather_m0.upload.use_1200bps_touch=true
27-
adafruit_feather_m0.upload.wait_for_upload_port=true
28-
adafruit_feather_m0.upload.native_usb=true
29-
adafruit_feather_m0.build.mcu=cortex-m0plus
30-
adafruit_feather_m0.build.f_cpu=48000000L
31-
adafruit_feather_m0.build.usb_product="Feather M0"
32-
adafruit_feather_m0.build.usb_manufacturer="Adafruit"
33-
adafruit_feather_m0.build.board=SAMD_FEATHER_M0
34-
adafruit_feather_m0.build.core=arduino
35-
adafruit_feather_m0.build.extra_flags=-DARDUINO_SAMD_ZERO -D__SAMD21G18A__ {build.usb_flags}
36-
adafruit_feather_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
37-
adafruit_feather_m0.build.openocdscript=openocd_scripts/arduino_zero.cfg
38-
adafruit_feather_m0.build.variant=arduino_zero
39-
adafruit_feather_m0.build.variant_system_lib=
40-
adafruit_feather_m0.build.vid=0x239A
41-
adafruit_feather_m0.build.pid=0x800B
42-
adafruit_feather_m0.bootloader.tool=openocd
43-
adafruit_feather_m0.bootloader.file=feather/samd21_sam_ba.bin
44-
45-
46-
adafruit_metro_m0.name=Adafruit Metro M0 (Native USB Port)
47-
adafruit_metro_m0.vid.0=0x239A
48-
adafruit_metro_m0.pid.0=0x8013
49-
adafruit_metro_m0.vid.1=0x239A
50-
adafruit_metro_m0.pid.1=0x0013
51-
adafruit_metro_m0.upload.tool=bossac
52-
adafruit_metro_m0.upload.protocol=sam-ba
53-
adafruit_metro_m0.upload.maximum_size=262144
54-
adafruit_metro_m0.upload.use_1200bps_touch=true
55-
adafruit_metro_m0.upload.wait_for_upload_port=true
56-
adafruit_metro_m0.upload.native_usb=true
57-
adafruit_metro_m0.build.mcu=cortex-m0plus
58-
adafruit_metro_m0.build.f_cpu=48000000L
59-
adafruit_metro_m0.build.usb_product="Metro M0"
60-
adafruit_metro_m0.build.usb_manufacturer="Adafruit"
61-
adafruit_metro_m0.build.board=SAMD_ZERO
62-
adafruit_metro_m0.build.core=arduino
63-
adafruit_metro_m0.build.extra_flags=-D__SAMD21G18A__ {build.usb_flags}
64-
adafruit_metro_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
65-
adafruit_metro_m0.build.openocdscript=openocd_scripts/arduino_zero.cfg
66-
adafruit_metro_m0.build.variant=arduino_zero
67-
adafruit_metro_m0.build.variant_system_lib=
68-
adafruit_metro_m0.build.vid=0x239A
69-
adafruit_metro_m0.build.pid=0x8013
70-
adafruit_metro_m0.bootloader.tool=openocd
71-
adafruit_metro_m0.bootloader.file=metro/samd21_sam_ba.bin
72-
1+
# Copyright (c) 2014-2015 Arduino LLC. All right reserved.
2+
#
3+
# This library is free software; you can redistribute it and/or
4+
# modify it under the terms of the GNU Lesser General Public
5+
# License as published by the Free Software Foundation; either
6+
# version 2.1 of the License, or (at your option) any later version.
7+
#
8+
# This library is distributed in the hope that it will be useful,
9+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
11+
# See the GNU Lesser General Public License for more details.
12+
#
13+
# You should have received a copy of the GNU Lesser General Public
14+
# License along with this library; if not, write to the Free Software
15+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
16+
17+
18+
adafruit_feather_m0.name=Adafruit Feather M0 (Native USB Port)
19+
adafruit_feather_m0.vid.0=0x239A
20+
adafruit_feather_m0.pid.0=0x800B
21+
adafruit_feather_m0.vid.1=0x239A
22+
adafruit_feather_m0.pid.1=0x000B
23+
adafruit_feather_m0.upload.tool=bossac
24+
adafruit_feather_m0.upload.protocol=sam-ba
25+
adafruit_feather_m0.upload.maximum_size=262144
26+
adafruit_feather_m0.upload.use_1200bps_touch=true
27+
adafruit_feather_m0.upload.wait_for_upload_port=true
28+
adafruit_feather_m0.upload.native_usb=true
29+
adafruit_feather_m0.build.mcu=cortex-m0plus
30+
adafruit_feather_m0.build.f_cpu=48000000L
31+
adafruit_feather_m0.build.usb_product="Feather M0"
32+
adafruit_feather_m0.build.usb_manufacturer="Adafruit"
33+
adafruit_feather_m0.build.board=SAMD_FEATHER_M0
34+
adafruit_feather_m0.build.core=arduino
35+
adafruit_feather_m0.build.extra_flags=-DARDUINO_SAMD_ZERO -D__SAMD21G18A__ {build.usb_flags}
36+
adafruit_feather_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
37+
adafruit_feather_m0.build.openocdscript=openocd_scripts/arduino_zero.cfg
38+
adafruit_feather_m0.build.variant=arduino_zero
39+
adafruit_feather_m0.build.variant_system_lib=
40+
adafruit_feather_m0.build.vid=0x239A
41+
adafruit_feather_m0.build.pid=0x800B
42+
adafruit_feather_m0.bootloader.tool=openocd
43+
adafruit_feather_m0.bootloader.file=feather/samd21_sam_ba.bin
44+
45+
46+
adafruit_metro_m0.name=Adafruit Metro M0 (Native USB Port)
47+
adafruit_metro_m0.vid.0=0x239A
48+
adafruit_metro_m0.pid.0=0x8013
49+
adafruit_metro_m0.vid.1=0x239A
50+
adafruit_metro_m0.pid.1=0x0013
51+
adafruit_metro_m0.upload.tool=bossac
52+
adafruit_metro_m0.upload.protocol=sam-ba
53+
adafruit_metro_m0.upload.maximum_size=262144
54+
adafruit_metro_m0.upload.use_1200bps_touch=true
55+
adafruit_metro_m0.upload.wait_for_upload_port=true
56+
adafruit_metro_m0.upload.native_usb=true
57+
adafruit_metro_m0.build.mcu=cortex-m0plus
58+
adafruit_metro_m0.build.f_cpu=48000000L
59+
adafruit_metro_m0.build.usb_product="Metro M0"
60+
adafruit_metro_m0.build.usb_manufacturer="Adafruit"
61+
adafruit_metro_m0.build.board=SAMD_ZERO
62+
adafruit_metro_m0.build.core=arduino
63+
adafruit_metro_m0.build.extra_flags=-D__SAMD21G18A__ {build.usb_flags}
64+
adafruit_metro_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
65+
adafruit_metro_m0.build.openocdscript=openocd_scripts/arduino_zero.cfg
66+
adafruit_metro_m0.build.variant=arduino_zero
67+
adafruit_metro_m0.build.variant_system_lib=
68+
adafruit_metro_m0.build.vid=0x239A
69+
adafruit_metro_m0.build.pid=0x8013
70+
adafruit_metro_m0.bootloader.tool=openocd
71+
adafruit_metro_m0.bootloader.file=metro/samd21_sam_ba.bin

‎bootloaders/mkr1000/README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2+
The source code of the bootloader is in the folder:
3+
4+
bootloader/zero/
5+
6+

‎bootloaders/mkr1000/samd21_sam_ba_arduino_mkr1000.bin

5.83 KB
Binary file not shown.

0 commit comments

Comments
 (0)