feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Improve support for SAMD21 based boards

Browse Source
This commit is contained in:
Valeriy Koval
2016-07-11 19:12:10 +03:00
parent 581fd356cd
commit 3984f80bae
3 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
platformio/boards/arduino.json
View File

@ -958,17 +958,17 @@
}, },
"mzeropro": { "mzeropro": {
"build": { "build": {
"core": "arduino_zero", "core": "arduino_zero_org",
"extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__", "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__",
"f_cpu": "48000000L", "f_cpu": "48000000L",
"mcu": "samd21g18a", "mcu": "samd21g18a",
"cpu": "cortex-m0plus", "cpu": "cortex-m0plus",
"usb_product": "Arduino M0 Pro", "usb_product": "Arduino M0 Pro",
"variant": "arduino_zero", "variant": "arduino_zero_org",
"ldscript": "samd21g18a_bootloader_org.ld", "ldscript": "samd21g18a_bootloader_org.ld",
"hwids": [ "hwids": [
["0x03EB", "0x2111"], ["0x2A03", "0x804F"],
["0x2A03", "0x804F"] ["0x03EB", "0x2111"]
] ]
}, },
"frameworks": ["arduino"], "frameworks": ["arduino"],
@ -989,19 +989,17 @@
}, },
"mzeroproUSB": { "mzeroproUSB": {
"build": { "build": {
"core": "arduino_zero", "core": "arduino_zero_org",
"extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__", "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__",
"f_cpu": "48000000L", "f_cpu": "48000000L",
"mcu": "samd21g18a", "mcu": "samd21g18a",
"cpu": "cortex-m0plus", "cpu": "cortex-m0plus",
"usb_product": "Arduino M0 Pro", "usb_product": "Arduino M0 Pro",
"variant": "arduino_zero", "variant": "arduino_zero_org",
"ldscript": "samd21g18a_bootloader_org.ld", "ldscript": "samd21g18a_bootloader_org.ld",
"hwids": [ "hwids": [
["0x2A03", "0x004D"], ["0x2A03", "0x804F"],
["0x2A03", "0x804D"], ["0x2A03", "0x004F"]
["0x2A03", "0x004F"],
["0x2A03", "0x804F"]
] ]
}, },
"frameworks": ["arduino"], "frameworks": ["arduino"],
@ -1023,19 +1021,17 @@
}, },
"mzeroUSB": { "mzeroUSB": {
"build": { "build": {
"core": "arduino_zero", "core": "arduino_zero_org",
"extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__", "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__",
"f_cpu": "48000000L", "f_cpu": "48000000L",
"mcu": "samd21g18a", "mcu": "samd21g18a",
"cpu": "cortex-m0plus", "cpu": "cortex-m0plus",
"usb_product": "Arduino M0", "usb_product": "Arduino M0",
"variant": "arduino_zero", "variant": "arduino_zero_org",
"ldscript": "samd21g18a_bootloader_org.ld", "ldscript": "samd21g18a_bootloader_org.ld",
"hwids": [ "hwids": [
["0x2A03", "0x004D"], ["0x2A03", "0x804E"],
["0x2A03", "0x804D"], ["0x2A03", "0x004E"]
["0x2A03", "0x004E"],
["0x2A03", "0x804E"]
] ]
}, },
"frameworks": ["arduino"], "frameworks": ["arduino"],
@ -1057,17 +1053,17 @@
}, },
"tian": { "tian": {
"build": { "build": {
"core": "arduino_zero", "core": "arduino_zero_org",
"extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__", "extra_flags": "-DARDUINO_SAMD_ZERO -DARDUINO_ARCH_SAMD -D__SAMD21G18A__",
"f_cpu": "48000000L", "f_cpu": "48000000L",
"mcu": "samd21g18a", "mcu": "samd21g18a",
"cpu": "cortex-m0plus", "cpu": "cortex-m0plus",
"usb_product": "Arduino Tian", "usb_product": "Arduino Tian",
"variant": "arduino_zero", "variant": "arduino_zero_org",
"ldscript": "samd21g18a_bootloader_org.ld", "ldscript": "samd21g18a_bootloader_org.ld",
"hwids": [ "hwids": [
["0x10C4", "0xEA70"], ["0x2A03", "0x8052"],
["0x2A03", "0x8052"] ["0x10C4", "0xEA70"]
] ]
}, },
"frameworks": ["arduino"], "frameworks": ["arduino"],

12
platformio/builder/scripts/frameworks/arduino.py
View File

@ -216,11 +216,19 @@ env.Append(
if env.subst("${PLATFORMFW_DIR}")[-3:] == "sam": if env.subst("${PLATFORMFW_DIR}")[-3:] == "sam":
env.VariantDirWrap( env.VariantDirWrap(
join("$BUILD_DIR", "FrameworkCMSISInc"), join("$BUILD_DIR", "FrameworkCMSISInc"),
join("$PLATFORMFW_DIR", "system", "CMSIS", "CMSIS", "Include") join(
"$PLATFORMFW_DIR", "system",
"CMSIS%s" % ("_ORG" if "_org" in BOARD_CORELIBDIRNAME else ""),
"CMSIS", "Include"
)
) )
env.VariantDirWrap( env.VariantDirWrap(
join("$BUILD_DIR", "FrameworkDeviceInc"), join("$BUILD_DIR", "FrameworkDeviceInc"),
join("$PLATFORMFW_DIR", "system", "CMSIS", "Device", "ATMEL") join(
"$PLATFORMFW_DIR", "system",
"CMSIS%s" % ("_ORG" if "_org" in BOARD_CORELIBDIRNAME else ""),
"Device", "ATMEL"
)
) )
env.VariantDirWrap( env.VariantDirWrap(
join("$BUILD_DIR", "FrameworkLibSam"), join("$BUILD_DIR", "FrameworkLibSam"),

15
platformio/builder/tools/pioupload.py
View File

@ -39,15 +39,12 @@ def FlushSerialBuffer(env, port):
def TouchSerialPort(env, port, baudrate): def TouchSerialPort(env, port, baudrate):
port = env.subst(port) port = env.subst(port)
print "Forcing reset using %dbps open/close on port %s" % (baudrate, port) print "Forcing reset using %dbps open/close on port %s" % (baudrate, port)
if system() != "Windows": try:
try: s = Serial(port=port, baudrate=baudrate)
s = Serial(port) s.setDTR(False)
s.close() s.close()
except: # pylint: disable=W0702 except: # pylint: disable=W0702
pass pass
s = Serial(port=port, baudrate=baudrate)
s.setDTR(False)
s.close()
sleep(0.4) sleep(0.4)