Skip to content

Commit

Permalink
Merge branch 'release/v1.0.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
ivankravets committed Sep 15, 2016
2 parents 5877b1f + fc02820 commit d1dcceb
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Atmel | SMART offers Flash- based ARM products based on the ARM Cortex-M0+, Cort
1. [Install PlatformIO CLI](http://docs.platformio.org/en/latest/installation.html)
2. Install Atmel SAM development platform:
```bash
# isntall the latest stable version
# install the latest stable version
> platformio platform install atmelsam

# install development version
Expand Down
9 changes: 4 additions & 5 deletions builder/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,10 @@ def BeforeUpload(target, source, env): # pylint: disable=W0613,W0621
UPLOADER="openocd",
UPLOADERFLAGS=[
"-f", join(env.BoardConfig().get("debug.openocdcfg", "")),
"-s", '"%s"' % join(
"-s", join(
platform.get_package_dir("tool-openocd") or "",
"share", "openocd", "scripts"),
"-s", '"%s"' % join(
"-s", join(
platform.get_package_dir("tool-openocd") or "",
"share", "openocd", "scripts", "board")
],
Expand All @@ -195,7 +195,7 @@ def BeforeUpload(target, source, env): # pylint: disable=W0613,W0621
if "zero" in env.subst("$BOARD"):
env.Append(
UPLOADERFLAGS=[
"-s", '"%s"' % join(
"-s", join(
platform.get_package_dir("framework-arduinosam") or "",
"variants", env.BoardConfig().get("build.variant"),
"openocd_scripts")
Expand Down Expand Up @@ -237,8 +237,7 @@ def BeforeUpload(target, source, env): # pylint: disable=W0613,W0621
UPLOADER="avrdude",
UPLOADERFLAGS=[
"-p", "atmega2560", # Arduino M0/Tian upload hook
"-C",
'"%s"' % join(
"-C", join(
platform.get_package_dir("tool-avrdude") or "",
"avrdude.conf"),
"-c", "$UPLOAD_PROTOCOL",
Expand Down
2 changes: 1 addition & 1 deletion platform.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"type": "git",
"url": "https://github.com/platformio/platform-atmelsam.git"
},
"version": "1.0.2",
"version": "1.0.3",
"packageRepositories": [
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
"https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",
Expand Down

0 comments on commit d1dcceb

Please sign in to comment.