Skip to content

Commit 75e3b2c

Browse files
author
rocketscream
committed
Merge pull request #1 from arduino/master
Update to the latest version.
2 parents d58b22d + cfa831f commit 75e3b2c

Some content is hidden

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

61 files changed

+2300
-111
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: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,53 @@
1-
SAMD CORE 1.6.3
1+
SAMD CORE 1.6.6 2016.05.19
22

3+
* Fixed digitalPinToInterrupt() macro, now it works as documented.
4+
* Added analogInputToDigitalPin macro
5+
* Fixed NUM_DIGITAL_PINS for Zero Board.
6+
* On-board RX-TX LEDs now blinks when there is activity on the native USB port
7+
* Fixed platform.txt, the core now compiles again with Arduino IDE <=1.6.5. Thanks @per1234
8+
* Fixed Wire.write(0x00) "ambiguos method" error
9+
* String class now supports iterators. Thanks @Chris--A
10+
* Remove enabling bootloader protection when burning bootloader. This enables WDT, so sketches do not work.
11+
* Added remote upload for Yun-Shield
12+
13+
SAMD CORE 1.6.5 2016.04.02
14+
15+
* Added Arduino/Genuino MKR1000 board
16+
* Set NVMCTRL.MANW bit to 1 (default is 0). This prevents accidental writes on program memory.
17+
* Bootloader: Fixed wrong UART speed (regression)
18+
* Fixed incorrect return value from Wire.available() when the receive buffer is not fully read.
19+
* Added DAC0 definition in Arduino/Genuino Zero variant file.
20+
* Enabled bootloader protection after "Burn bootloader".
21+
22+
SAMD CORE 1.6.4 2016.02.19
23+
24+
* Fixed Wire address setup when running as slave.
25+
* Fixed String constructor when using floating point numbers.
26+
* USBHost: fixed blocking USBHost.Task(). Thanks @bbx10
27+
* USBHost: fixed some ASCII Control codes in keyboard controller. Thanks @bbx10
28+
* USBHost: ported some minor fix from upstream UHS2. Thanks @bbx10
29+
* USBHost: fixed wrong library initialization. Thanks @bbx10 @ladyada
30+
* better interrupt handling in Serial::accept()
31+
32+
SAMD CORE 1.6.3 2016.02.15
33+
34+
* Added drivers for Arduino/Genuino MKR1000 board
35+
* Fixed Wire master repeated start behaviour
36+
* Added SerialUSB methods: readBreak(), baud(), stopbits(), paritytype(), numbits(), dtr(), rts()
337
* Added SPI.transfer16(..) method
438
* Bugfix: added missing Serial.begin(baud, config) method. Thanks @tuxedo0801
39+
* Fixed Serial baudrate calculations for 1200bps. Thanks @TomKeddie
40+
* Fixed Serial.flush() that now waits until the last bit has been sent. Thanks @TomKeddie
41+
* Fixed Serial configuration for data-bit. Thanks @TomKeddie
542
* Bootloader: 32Khz external oscillator is now used, improves USB clock. Thanks @aethaniel
643
* Bootloader: Clean up of makefiles and file organization. Thanks @aethaniel
744
* Added PWM capability to pins A1/A2 of Arduino Zero.
845
* variant.h/cpp: PWM capability is now determined by PIN_ATTR_PWM combined with
946
PIN_ATTR_TIMER or PIN_ATTR_TIMER_ALT for timer selection.
47+
* Small fix to USBHost example "USB_desc.ino". Thanks @bbx10
48+
* USBHost: USB-Keyboard right shift key was ignored. Thanks @bbx10
49+
* Wire library now support multiple instances in variant. Thanks @spiderkeys
50+
* Ported some SerialUSB API (readBreak(), baud(), stopbits(), paritytype(), numbits(), dtr(), rts())
1051

1152
SAMD CORE 1.6.2 2015.11.03
1253

VARIANT_COMPLIANCE_CHANGELOG

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
SAMD CORE 1.6.6
2+
3+
* digitalPinToInterrupt #define moved to Arduino.h, variant.h must no longer define it
4+
5+
SAMD CORE 1.6.3
6+
7+
* Timer for pin PWM selected based on value of PIN_ATTR_TIMER_ALT or PIN_ATTR_TIMER,
8+
prior to this "pin type" (ulPinType) was used

boards.txt

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,3 +87,48 @@ arduino_zero_native.build.vid=0x2341
8787
arduino_zero_native.build.pid=0x804d
8888
arduino_zero_native.bootloader.tool=openocd
8989
arduino_zero_native.bootloader.file=zero/samd21_sam_ba.bin
90+
91+
# Arduino/Genuino MKR1000
92+
# ---------------------------------------
93+
mkr1000.name=Arduino/Genuino MKR1000
94+
mkr1000.vid.0=0x2341
95+
mkr1000.pid.0=0x804e
96+
mkr1000.vid.1=0x2341
97+
mkr1000.pid.1=0x004e
98+
99+
mkr1000.vid.2=0x2341
100+
mkr1000.pid.2=0x824e
101+
# If the board is a 2341:824e use 2341:824e for build and set other parameters as well
102+
mkr1000.vid.2.build.vid=0x2341
103+
mkr1000.vid.2.build.pid=0x824e
104+
mkr1000.vid.2.build.usb_product="Genuino MKR1000"
105+
mkr1000.vid.2.bootloader.file=mkr1000/samd21_sam_ba_genuino_mkr1000.bin
106+
107+
mkr1000.vid.3=0x2341
108+
mkr1000.pid.3=0x024e
109+
# If the board is a 2341:024e use 2341:824e for build and set other parameters as well
110+
mkr1000.vid.3.build.vid=0x2341
111+
mkr1000.vid.3.build.pid=0x824e
112+
mkr1000.vid.3.build.usb_product="Genuino MKR1000"
113+
mkr1000.vid.3.bootloader.file=mkr1000/samd21_sam_ba_genuino_mkr1000.bin
114+
115+
mkr1000.upload.tool=bossac
116+
mkr1000.upload.protocol=sam-ba
117+
mkr1000.upload.maximum_size=262144
118+
mkr1000.upload.use_1200bps_touch=true
119+
mkr1000.upload.wait_for_upload_port=true
120+
mkr1000.upload.native_usb=true
121+
mkr1000.build.mcu=cortex-m0plus
122+
mkr1000.build.f_cpu=48000000L
123+
mkr1000.build.usb_product="Arduino MKR1000"
124+
mkr1000.build.usb_manufacturer="Arduino LLC"
125+
mkr1000.build.board=SAMD_MKR1000
126+
mkr1000.build.core=arduino
127+
mkr1000.build.extra_flags=-D__SAMD21G18A__ {build.usb_flags}
128+
mkr1000.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
129+
mkr1000.build.openocdscript=openocd_scripts/arduino_zero.cfg
130+
mkr1000.build.variant=mkr1000
131+
mkr1000.build.vid=0x2341
132+
mkr1000.build.pid=0x804e
133+
mkr1000.bootloader.tool=openocd
134+
mkr1000.bootloader.file=mkr1000/samd21_sam_ba_arduino_mkr1000.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+
Binary file not shown.

0 commit comments

Comments
 (0)