Skip to content

Commit 427725a

Browse files
ladyadaladyada
committed
Merge remote-tracking branch 'upstream/master'
2 parents eef984e + 96745cd commit 427725a

File tree

8 files changed

+19
-55
lines changed

8 files changed

+19
-55
lines changed

‎CHANGELOG

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
SAMD CORE ?.?.?? ????.??.??
1+
SAMD CORE 1.6.12 2017.02.07
22

33
* Fixed type conflict of utoa function. Thanks @kbumsik
44
* Fixed pinMode(pin, OUTPUT) not working after analogRead(pin)
5+
* Reenabled support for Tian
6+
* Fixed signature for Adafruit Circuit Playground Express board
7+
* Added CMSIS headers for SAML21 chip series. Thanks @aethaniel
58

69
SAMD CORE 1.6.11 2016.12.23
710

‎bootloaders/zero/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ BIN=$(NAME).bin
7474
HEX=$(NAME).hex
7575

7676

77-
INCLUDES=-I"$(MODULE_PATH)/tools/CMSIS/4.5.0/CMSIS/Include/" -I"$(MODULE_PATH)/tools/CMSIS-Atmel/1.0.0/CMSIS/Device/ATMEL/"
77+
INCLUDES=-I"$(MODULE_PATH)/tools/CMSIS/4.5.0/CMSIS/Include/" -I"$(MODULE_PATH)/tools/CMSIS-Atmel/1.1.0/CMSIS/Device/ATMEL/"
7878

7979
# -----------------------------------------------------------------------------
8080
# Linker options

‎cores/arduino/Udp.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141
class UDP : public Stream {
4242

4343
public:
44-
virtual uint8_t begin(uint16_t) =0; // initialize, start listening on specified port. Returns 1 if successful, 0 if there are no sockets available to use
44+
virtual uint8_t begin(uint16_t) =0; // initialize, start listening on specified port. Returns 1 if successful, 0 if there are no sockets available to use
45+
virtual uint8_t beginMulticast(IPAddress, uint16_t) { return 0; } // initialize, start listening on specified multicast IP address and port. Returns 1 if successful, 0 on failure
4546
virtual void stop() =0; // Finish with the UDP socket
4647

4748
// Sending UDP packets

‎cores/arduino/wiring.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ void calibrateADC()
5757
*/
5858
void init( void )
5959
{
60-
uint32_t ul ;
61-
6260
// Set Systick to 1ms interval, common to all Cortex-M variants
6361
if ( SysTick_Config( SystemCoreClock / 1000 ) )
6462
{
@@ -68,10 +66,10 @@ void init( void )
6866
NVIC_SetPriority (SysTick_IRQn, (1 << __NVIC_PRIO_BITS) - 2); /* set Priority for Systick Interrupt (2nd lowest) */
6967

7068
// Clock PORT for Digital I/O
71-
// PM->APBBMASK.reg |= PM_APBBMASK_PORT ;
69+
// PM->APBBMASK.reg |= PM_APBBMASK_PORT ;
7270
//
7371
// // Clock EIC for I/O interrupts
74-
// PM->APBAMASK.reg |= PM_APBAMASK_EIC ;
72+
// PM->APBAMASK.reg |= PM_APBAMASK_EIC ;
7573

7674
// Clock SERCOM for Serial
7775
PM->APBCMASK.reg |= PM_APBCMASK_SERCOM0 | PM_APBCMASK_SERCOM1 | PM_APBCMASK_SERCOM2 | PM_APBCMASK_SERCOM3 | PM_APBCMASK_SERCOM4 | PM_APBCMASK_SERCOM5 ;
@@ -86,9 +84,9 @@ void init( void )
8684
#endif
8785

8886
// Setup all pins (digital and analog) in INPUT mode (default is nothing)
89-
for ( ul = 0 ; ul < NUM_DIGITAL_PINS ; ul++ )
87+
for (uint32_t ul = 0 ; ul < NUM_DIGITAL_PINS ; ul++ )
9088
{
91-
pinMode( ul, INPUT ) ;
89+
pinMode( ul, INPUT ) ;
9290
}
9391

9492
// Initialize Analog Controller

‎extras/package_index.json.Hourly.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
{
3838
"packager": "arduino",
3939
"name": "openocd",
40-
"version": "0.9.0-arduino"
40+
"version": "0.9.0-arduino5-static"
4141
},
4242
{
4343
"packager": "arduino",
@@ -47,7 +47,7 @@
4747
{
4848
"packager": "arduino",
4949
"name": "CMSIS-Atmel",
50-
"version": "1.0.0"
50+
"version": "1.1.0"
5151
}
5252
]
5353
}

‎extras/package_index.json.PR.template

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -47,53 +47,12 @@
4747
{
4848
"packager": "arduino",
4949
"name": "CMSIS-Atmel",
50-
"version": "1.0.0"
50+
"version": "1.1.0"
5151
}
5252
]
5353
}
5454
],
5555
"tools": [
56-
{
57-
"name": "openocd",
58-
"version": "0.9.0-arduino5-static",
59-
"systems": [
60-
{
61-
"host": "arm-linux-gnueabihf",
62-
"url": "http://downloads.arduino.cc/tools/openocd-0.9.0-arduino5-static-arm-linux-gnueabihf.tar.bz2",
63-
"archiveFileName": "openocd-0.9.0-arduino5-static-arm-linux-gnueabihf.tar.bz2",
64-
"checksum": "SHA-256:cef48c1448664612dd25168f0a56962aec4ce2f1d7c06dafd86a1b606dc8ae20",
65-
"size": "1319000"
66-
},
67-
{
68-
"host": "i686-mingw32",
69-
"url": "http://downloads.arduino.cc/tools/openocd-0.9.0-arduino5-static-i686-w64-mingw32.zip",
70-
"archiveFileName": "openocd-0.9.0-arduino5-static-i686-w64-mingw32.zip",
71-
"checksum": "SHA-256:54c70a0bfa1b0a3a592d6ee9ab532f9715e1dede2e7d46a3232abd72de274c5a",
72-
"size": "1641209"
73-
},
74-
{
75-
"host": "x86_64-apple-darwin",
76-
"url": "http://downloads.arduino.cc/tools/openocd-0.9.0-arduino5-static-x86_64-apple-darwin15.6.0.tar.bz2",
77-
"archiveFileName": "openocd-0.9.0-arduino5-static-x86_64-apple-darwin15.6.0.tar.bz22",
78-
"checksum": "SHA-256:14be5c5400e1a32c3d6a15f9c8d2f438634974ab263ff437b91b527e5b5d53a4",
79-
"size": "1235752"
80-
},
81-
{
82-
"host": "x86_64-pc-linux-gnu",
83-
"url": "http://downloads.arduino.cc/tools/openocd-0.9.0-arduino5-static-x86_64-linux-gnu.tar.bz2",
84-
"archiveFileName": "openocd-0.9.0-arduino5-static-x86_64-linux-gnu.tar.bz2",
85-
"checksum": "SHA-256:8e378bdcd71c93a39818c16b49b91128c8028e3d9675551ba7eff39462391ba2",
86-
"size": "1393855"
87-
},
88-
{
89-
"host": "i686-pc-linux-gnu",
90-
"url": "http://downloads.arduino.cc/tools/openocd-0.9.0-arduino5-static-i686-linux-gnu.tar.bz2",
91-
"archiveFileName": "openocd-0.9.0-arduino5-static-i686-linux-gnu.tar.bz2",
92-
"checksum": "SHA-256:8e0787f54e204fe6e9071b2b7edf8a5e695492696f1182d447647fe5c0bd55bd",
93-
"size": "1341739"
94-
}
95-
]
96-
}
9756
]
9857
}
9958
]

‎platform.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ compiler.S.extra_flags=
6464
compiler.ar.extra_flags=
6565
compiler.elf2hex.extra_flags=
6666

67-
compiler.arm.cmsis.c.flags="-I{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Include/" "-I{runtime.tools.CMSIS-Atmel-1.0.0.path}/CMSIS/Device/ATMEL/"
67+
compiler.arm.cmsis.c.flags="-I{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Include/" "-I{runtime.tools.CMSIS-Atmel-1.1.0.path}/CMSIS/Device/ATMEL/"
6868
compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" -larm_cortexM0l_math
6969

7070
# USB Flags
@@ -126,7 +126,7 @@ tools.avrdude.upload.params.quiet=-q -q
126126
tools.avrdude.upload.params.noverify=-V
127127
tools.avrdude.upload.pattern="{cmd}" "-C{config.path}" {upload.verbose} -p{build.emu.mcu} -c{upload.protocol} -P{serial.port} -b{upload.speed} "-Uflash:w:{build.path}/{build.project_name}.hex:i"
128128

129-
tools.avrdude_remote.upload.pattern="openocd --version 2>&1 | grep 2017 && /usr/bin/run-avrdude /tmp/sketch.hex || echo Can't upload; update your Tian first 1>&2; exit 1"
129+
tools.avrdude_remote.upload.pattern="openocd --version 2>&1 | grep 2016 && if opkg update; then opkg upgrade openocd; exit 1; else echo 'Please connect your board to the Internet in order to upgrade tools' >&2; exit 1; fi || /usr/bin/run-avrdude /tmp/sketch.hex"
130130

131131
#
132132
# BOSSA

‎variants/arduino_mzero/variant.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,5 +205,8 @@ extern Uart Serial1;
205205
#define SERIAL_PORT_HARDWARE Serial1
206206
#define SERIAL_PORT_HARDWARE_OPEN Serial1
207207

208+
// Legacy way to describe serial port on pins 0-1
209+
#define Serial5 Serial1
210+
208211
#endif /* _VARIANT_ARDUINO_ZERO_ */
209212

0 commit comments

Comments
 (0)