Merge branch 'release/v2.0.0'

platformio · May 3, 2017 · f69863e · f69863e
2 parents d516724 + 99bb4d8
commit f69863e
Show file tree

Hide file tree

Showing 23 changed files with 76 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -5,11 +5,11 @@
 Texas Instruments TM4C12x MCUs offer the industrys most popular ARM Cortex-M4 core with scalable memory and package options, unparalleled connectivity peripherals, advanced application functions, industry-leading analog integration, and extensive software solutions.
 
 * [Home](http://platformio.org/platforms/titiva) (home page in PlatformIO Platform Registry)
-* [Documentation](http://docs.platformio.org/en/stable/platforms/titiva.html) (advanced usage, packages, boards, frameworks, etc.)
+* [Documentation](http://docs.platformio.org/page/platforms/titiva.html) (advanced usage, packages, boards, frameworks, etc.)
 
 # Usage
 
-1. [Install PlatformIO CLI](http://docs.platformio.org/en/stable/installation.html)
+1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
 2. Install TI TIVA development platform:
 ```bash
 # install the latest stable version

diff --git a/boards/lplm4f120h5qr.json b/boards/lplm4f120h5qr.json
@@ -8,6 +8,20 @@
     "mcu": "lplm4f120h5qr",
     "variant": "EK-TM4C123GXL"
   },
+  "debug": {
+    "tools": {
+      "ti-icdi": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/board/ek-lm4f120xl.cfg"
+          ]
+        },
+        "onboard": true
+      }
+    }
+  },
   "frameworks": [
     "energia",
     "libopencm3"

diff --git a/boards/lptm4c1230c3pm.json b/boards/lptm4c1230c3pm.json
@@ -8,6 +8,20 @@
     "mcu": "lptm4c1230c3pm",
     "variant": "EK-TM4C123GXL"
   },
+  "debug": {
+    "tools": {
+      "ti-icdi": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/board/ek-tm4c123gxl.cfg"
+          ]
+        },
+        "onboard": true
+      }
+    }
+  },
   "frameworks": [
     "energia",
     "libopencm3"

diff --git a/boards/lptm4c1294ncpdt.json b/boards/lptm4c1294ncpdt.json
@@ -8,6 +8,20 @@
     "mcu": "lptm4c1294ncpdt",
     "variant": "EK-TM4C1294XL"
   },
+  "debug": {
+    "tools": {
+      "ti-icdi": {
+        "server": {
+          "package": "tool-openocd",
+          "executable": "bin/openocd",
+          "arguments": [
+            "-f", "scripts/board/ek-tm4c1294xl.cfg"
+          ]
+        },
+        "onboard": true
+      }
+    }
+  },
   "frameworks": [
     "energia",
     "libopencm3"

diff --git a/builder/frameworks/libopencm3 b/builder/frameworks/libopencm3
diff --git a/builder/main.py b/builder/main.py
@@ -29,6 +29,7 @@
     AS="arm-none-eabi-as",
     CC="arm-none-eabi-gcc",
     CXX="arm-none-eabi-g++",
+    GDB="arm-none-eabi-gdb",
     OBJCOPY="arm-none-eabi-objcopy",
     RANLIB="arm-none-eabi-ranlib",
     SIZETOOL="arm-none-eabi-size",

diff --git a/examples/energia-blink/.travis.yml b/examples/energia-blink/.travis.yml
@@ -1,17 +1,17 @@
 # Continuous Integration (CI) is the practice, in software
 # engineering, of merging all developer working copies with a shared mainline
-# several times a day < http://docs.platformio.org/en/stable/ci/index.html >
+# several times a day < http://docs.platformio.org/page/ci/index.html >
 #
 # Documentation:
 #
 # * Travis CI Embedded Builds with PlatformIO
 #   < https://docs.travis-ci.com/user/integration/platformio/ >
 #
 # * PlatformIO integration with Travis CI
-#   < http://docs.platformio.org/en/stable/ci/travis.html >
+#   < http://docs.platformio.org/page/ci/travis.html >
 #
 # * User Guide for `platformio ci` command
-#   < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
+#   < http://docs.platformio.org/page/userguide/cmd_ci.html >
 #
 #
 # Please choose one of the following templates (proposed below) and uncomment

diff --git a/examples/energia-blink/README.rst b/examples/energia-blink/README.rst
@@ -12,7 +12,7 @@
 How to build PlatformIO based project
 =====================================
 
-1. `Install PlatformIO <http://docs.platformio.org/en/stable/installation.html>`_
+1. `Install PlatformIO Core <http://docs.platformio.org/page/core.html>`_
 2. Download `development platform with examples <https://github.com/platformio/platform-titiva/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:

diff --git a/examples/energia-blink/lib/readme.txt b/examples/energia-blink/lib/readme.txt
@@ -34,5 +34,5 @@ include paths and build them.
 
 See additional options for PlatformIO Library Dependency Finder `lib_*`:
 
-http://docs.platformio.org/en/stable/projectconf.html#lib-install
+http://docs.platformio.org/page/projectconf.html#lib-install
 
diff --git a/examples/energia-blink/platformio.ini b/examples/energia-blink/platformio.ini
@@ -5,7 +5,7 @@
 ;   Library options: dependencies, extra library storages
 ;
 ; Please visit documentation for the other options and examples
-; http://docs.platformio.org/en/stable/projectconf.html
+; http://docs.platformio.org/page/projectconf.html
 
 [env:lplm4f120h5qr]
 platform = titiva

diff --git a/examples/energia-internal-libs/.travis.yml b/examples/energia-internal-libs/.travis.yml
@@ -1,17 +1,17 @@
 # Continuous Integration (CI) is the practice, in software
 # engineering, of merging all developer working copies with a shared mainline
-# several times a day < http://docs.platformio.org/en/stable/ci/index.html >
+# several times a day < http://docs.platformio.org/page/ci/index.html >
 #
 # Documentation:
 #
 # * Travis CI Embedded Builds with PlatformIO
 #   < https://docs.travis-ci.com/user/integration/platformio/ >
 #
 # * PlatformIO integration with Travis CI
-#   < http://docs.platformio.org/en/stable/ci/travis.html >
+#   < http://docs.platformio.org/page/ci/travis.html >
 #
 # * User Guide for `platformio ci` command
-#   < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
+#   < http://docs.platformio.org/page/userguide/cmd_ci.html >
 #
 #
 # Please choose one of the following templates (proposed below) and uncomment

diff --git a/examples/energia-internal-libs/README.rst b/examples/energia-internal-libs/README.rst
@@ -12,7 +12,7 @@
 How to build PlatformIO based project
 =====================================
 
-1. `Install PlatformIO <http://docs.platformio.org/en/stable/installation.html>`_
+1. `Install PlatformIO Core <http://docs.platformio.org/page/core.html>`_
 2. Download `development platform with examples <https://github.com/platformio/platform-titiva/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:

diff --git a/examples/energia-internal-libs/lib/readme.txt b/examples/energia-internal-libs/lib/readme.txt
@@ -34,5 +34,5 @@ include paths and build them.
 
 See additional options for PlatformIO Library Dependency Finder `lib_*`:
 
-http://docs.platformio.org/en/stable/projectconf.html#lib-install
+http://docs.platformio.org/page/projectconf.html#lib-install
 
diff --git a/examples/energia-internal-libs/platformio.ini b/examples/energia-internal-libs/platformio.ini
@@ -5,7 +5,7 @@
 ;   Library options: dependencies, extra library storages
 ;
 ; Please visit documentation for the other options and examples
-; http://docs.platformio.org/en/stable/projectconf.html
+; http://docs.platformio.org/page/projectconf.html
 
 [env:lplm4f120h5qr]
 platform = titiva

diff --git a/examples/libopencm3-blink/.travis.yml b/examples/libopencm3-blink/.travis.yml
@@ -1,17 +1,17 @@
 # Continuous Integration (CI) is the practice, in software
 # engineering, of merging all developer working copies with a shared mainline
-# several times a day < http://docs.platformio.org/en/stable/ci/index.html >
+# several times a day < http://docs.platformio.org/page/ci/index.html >
 #
 # Documentation:
 #
 # * Travis CI Embedded Builds with PlatformIO
 #   < https://docs.travis-ci.com/user/integration/platformio/ >
 #
 # * PlatformIO integration with Travis CI
-#   < http://docs.platformio.org/en/stable/ci/travis.html >
+#   < http://docs.platformio.org/page/ci/travis.html >
 #
 # * User Guide for `platformio ci` command
-#   < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
+#   < http://docs.platformio.org/page/userguide/cmd_ci.html >
 #
 #
 # Please choose one of the following templates (proposed below) and uncomment

diff --git a/examples/libopencm3-blink/README.rst b/examples/libopencm3-blink/README.rst
@@ -12,7 +12,7 @@
 How to build PlatformIO based project
 =====================================
 
-1. `Install PlatformIO <http://docs.platformio.org/en/stable/installation.html>`_
+1. `Install PlatformIO Core <http://docs.platformio.org/page/core.html>`_
 2. Download `development platform with examples <https://github.com/platformio/platform-titiva/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:

diff --git a/examples/libopencm3-blink/lib/readme.txt b/examples/libopencm3-blink/lib/readme.txt
@@ -34,5 +34,5 @@ include paths and build them.
 
 See additional options for PlatformIO Library Dependency Finder `lib_*`:
 
-http://docs.platformio.org/en/stable/projectconf.html#lib-install
+http://docs.platformio.org/page/projectconf.html#lib-install
 
diff --git a/examples/libopencm3-blink/platformio.ini b/examples/libopencm3-blink/platformio.ini
@@ -5,7 +5,7 @@
 ;   Library options: dependencies, extra library storages
 ;
 ; Please visit documentation for the other options and examples
-; http://docs.platformio.org/en/stable/projectconf.html
+; http://docs.platformio.org/page/projectconf.html
 
 [env:lplm4f120h5qr]
 platform = titiva

diff --git a/examples/native-blink/.travis.yml b/examples/native-blink/.travis.yml
@@ -1,17 +1,17 @@
 # Continuous Integration (CI) is the practice, in software
 # engineering, of merging all developer working copies with a shared mainline
-# several times a day < http://docs.platformio.org/en/stable/ci/index.html >
+# several times a day < http://docs.platformio.org/page/ci/index.html >
 #
 # Documentation:
 #
 # * Travis CI Embedded Builds with PlatformIO
 #   < https://docs.travis-ci.com/user/integration/platformio/ >
 #
 # * PlatformIO integration with Travis CI
-#   < http://docs.platformio.org/en/stable/ci/travis.html >
+#   < http://docs.platformio.org/page/ci/travis.html >
 #
 # * User Guide for `platformio ci` command
-#   < http://docs.platformio.org/en/stable/userguide/cmd_ci.html >
+#   < http://docs.platformio.org/page/userguide/cmd_ci.html >
 #
 #
 # Please choose one of the following templates (proposed below) and uncomment

diff --git a/examples/native-blink/README.rst b/examples/native-blink/README.rst
@@ -12,7 +12,7 @@
 How to build PlatformIO based project
 =====================================
 
-1. `Install PlatformIO <http://docs.platformio.org/en/stable/installation.html>`_
+1. `Install PlatformIO Core <http://docs.platformio.org/page/core.html>`_
 2. Download `development platform with examples <https://github.com/platformio/platform-titiva/archive/develop.zip>`_
 3. Extract ZIP archive
 4. Run these commands:

diff --git a/examples/native-blink/lib/readme.txt b/examples/native-blink/lib/readme.txt
@@ -34,5 +34,5 @@ include paths and build them.
 
 See additional options for PlatformIO Library Dependency Finder `lib_*`:
 
-http://docs.platformio.org/en/stable/projectconf.html#lib-install
+http://docs.platformio.org/page/projectconf.html#lib-install
 
diff --git a/examples/native-blink/platformio.ini b/examples/native-blink/platformio.ini
@@ -5,7 +5,7 @@
 ;   Library options: dependencies, extra library storages
 ;
 ; Please visit documentation for the other options and examples
-; http://docs.platformio.org/en/stable/projectconf.html
+; http://docs.platformio.org/page/projectconf.html
 
 [env:lplm4f120h5qr]
 platform = titiva

diff --git a/platform.json b/platform.json
@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-titiva.git"
   },
-  "version": "1.3.0",
+  "version": "2.0.0",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",
@@ -47,6 +47,11 @@
       "type": "uploader",
       "optional": true,
       "version": "~1.103.0"
+    },
+    "tool-openocd": {
+      "type": "debug",
+      "optional": true,
+      "version": "~1.1000.0"
     }
   }
 }