From 260bdeaaa6835567a893d0cb116f436e4962a452 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Wed, 22 Feb 2017 16:08:44 +0200 Subject: [PATCH 1/9] Update installation link to PIO Core --- examples/energia-blink/README.rst | 2 +- examples/energia-internal-libs/README.rst | 2 +- examples/libopencm3-blink/README.rst | 2 +- examples/native-blink/README.rst | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/energia-blink/README.rst b/examples/energia-blink/README.rst index f174a22..6d5f19d 100644 --- 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 `_ +1. `Install PlatformIO Core `_ 2. Download `development platform with examples `_ 3. Extract ZIP archive 4. Run these commands: diff --git a/examples/energia-internal-libs/README.rst b/examples/energia-internal-libs/README.rst index c923484..0bacf42 100644 --- 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 `_ +1. `Install PlatformIO Core `_ 2. Download `development platform with examples `_ 3. Extract ZIP archive 4. Run these commands: diff --git a/examples/libopencm3-blink/README.rst b/examples/libopencm3-blink/README.rst index c7901bd..a38a5f1 100644 --- 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 `_ +1. `Install PlatformIO Core `_ 2. Download `development platform with examples `_ 3. Extract ZIP archive 4. Run these commands: diff --git a/examples/native-blink/README.rst b/examples/native-blink/README.rst index 7e6f4e9..d20c088 100644 --- 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 `_ +1. `Install PlatformIO Core `_ 2. Download `development platform with examples `_ 3. Extract ZIP archive 4. Run these commands: From cf858b25c9a852efe5d290f34e3a21ec8873ecd0 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Wed, 22 Feb 2017 16:31:19 +0200 Subject: [PATCH 2/9] Update links to docs --- README.md | 4 ++-- examples/energia-blink/.travis.yml | 6 +++--- examples/energia-blink/lib/readme.txt | 2 +- examples/energia-blink/platformio.ini | 2 +- examples/energia-internal-libs/.travis.yml | 6 +++--- examples/energia-internal-libs/lib/readme.txt | 2 +- examples/energia-internal-libs/platformio.ini | 2 +- examples/libopencm3-blink/.travis.yml | 6 +++--- examples/libopencm3-blink/lib/readme.txt | 2 +- examples/libopencm3-blink/platformio.ini | 2 +- examples/native-blink/.travis.yml | 6 +++--- examples/native-blink/lib/readme.txt | 2 +- examples/native-blink/platformio.ini | 2 +- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index b084347..80b6c5f 100644 --- 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/en/latest/core.html) 2. Install TI TIVA development platform: ```bash # install the latest stable version diff --git a/examples/energia-blink/.travis.yml b/examples/energia-blink/.travis.yml index ac0a029..593d7ef 100644 --- a/examples/energia-blink/.travis.yml +++ b/examples/energia-blink/.travis.yml @@ -1,6 +1,6 @@ # 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: # @@ -8,10 +8,10 @@ # < 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/lib/readme.txt b/examples/energia-blink/lib/readme.txt index 0d0e7be..4b6209e 100644 --- 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 index a54e666..1b2b090 100644 --- 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 index ac0a029..593d7ef 100644 --- a/examples/energia-internal-libs/.travis.yml +++ b/examples/energia-internal-libs/.travis.yml @@ -1,6 +1,6 @@ # 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: # @@ -8,10 +8,10 @@ # < 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/lib/readme.txt b/examples/energia-internal-libs/lib/readme.txt index 0d0e7be..4b6209e 100644 --- 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 index a54e666..1b2b090 100644 --- 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 index ac0a029..593d7ef 100644 --- a/examples/libopencm3-blink/.travis.yml +++ b/examples/libopencm3-blink/.travis.yml @@ -1,6 +1,6 @@ # 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: # @@ -8,10 +8,10 @@ # < 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/lib/readme.txt b/examples/libopencm3-blink/lib/readme.txt index 0d0e7be..4b6209e 100644 --- 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 index 557d9be..9d85bdf 100644 --- 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 index ac0a029..593d7ef 100644 --- a/examples/native-blink/.travis.yml +++ b/examples/native-blink/.travis.yml @@ -1,6 +1,6 @@ # 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: # @@ -8,10 +8,10 @@ # < 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/lib/readme.txt b/examples/native-blink/lib/readme.txt index 0d0e7be..4b6209e 100644 --- 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 index 21e6f92..3ffe07d 100644 --- 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 From e944f51152b2df56789041449c29c2b6e4a5a3a0 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Wed, 22 Feb 2017 16:44:40 +0200 Subject: [PATCH 3/9] Update links to docs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 80b6c5f..9a0081d 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Texas Instruments TM4C12x MCUs offer the industrys most popular ARM Cortex-M4 co # Usage -1. [Install PlatformIO Core](http://docs.platformio.org/en/latest/core.html) +1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html) 2. Install TI TIVA development platform: ```bash # install the latest stable version From bfd60be63683baa9059a0c6dbc16536c3eff26ac Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 14 Apr 2017 17:21:04 +0300 Subject: [PATCH 4/9] Initial support for debugging --- boards/lplm4f120h5qr.json | 22 ++++++++++++++++++++++ boards/lptm4c1230c3pm.json | 22 ++++++++++++++++++++++ boards/lptm4c1294ncpdt.json | 22 ++++++++++++++++++++++ 3 files changed, 66 insertions(+) diff --git a/boards/lplm4f120h5qr.json b/boards/lplm4f120h5qr.json index ff4b92c..aed0093 100644 --- a/boards/lplm4f120h5qr.json +++ b/boards/lplm4f120h5qr.json @@ -8,6 +8,28 @@ "mcu": "lplm4f120h5qr", "variant": "EK-TM4C123GXL" }, + "debug": { + "tools": { + "ti-icdi": { + "server": { + "package": "tool-openocd", + "executable": "bin/openocd", + "arguments": [ + "-f", "scripts/board/ek-lm4f120xl.cfg" + ] + }, + "gdbinit": [ + "target remote :3333", + "file $PROG_PATH", + "load $PROG_PATH", + "monitor init", + "monitor reset halt", + "tb main" + ], + "onboard": true + } + } + }, "frameworks": [ "energia", "libopencm3" diff --git a/boards/lptm4c1230c3pm.json b/boards/lptm4c1230c3pm.json index df96a2f..ffb6500 100644 --- a/boards/lptm4c1230c3pm.json +++ b/boards/lptm4c1230c3pm.json @@ -8,6 +8,28 @@ "mcu": "lptm4c1230c3pm", "variant": "EK-TM4C123GXL" }, + "debug": { + "tools": { + "ti-icdi": { + "server": { + "package": "tool-openocd", + "executable": "bin/openocd", + "arguments": [ + "-f", "scripts/board/ek-tm4c123gxl.cfg" + ] + }, + "gdbinit": [ + "target remote :3333", + "file $PROG_PATH", + "load $PROG_PATH", + "monitor init", + "monitor reset halt", + "tb main" + ], + "onboard": true + } + } + }, "frameworks": [ "energia", "libopencm3" diff --git a/boards/lptm4c1294ncpdt.json b/boards/lptm4c1294ncpdt.json index c6e9737..a8eeee8 100644 --- a/boards/lptm4c1294ncpdt.json +++ b/boards/lptm4c1294ncpdt.json @@ -8,6 +8,28 @@ "mcu": "lptm4c1294ncpdt", "variant": "EK-TM4C1294XL" }, + "debug": { + "tools": { + "ti-icdi": { + "server": { + "package": "tool-openocd", + "executable": "bin/openocd", + "arguments": [ + "-f", "scripts/board/ek-tm4c1294xl.cfg" + ] + }, + "gdbinit": [ + "target remote :3333", + "file $PROG_PATH", + "load $PROG_PATH", + "monitor init", + "monitor reset halt", + "tb main" + ], + "onboard": true + } + } + }, "frameworks": [ "energia", "libopencm3" From f40969dbae3d2b022147f9b253bea9e7a02865a4 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 14 Apr 2017 17:41:08 +0300 Subject: [PATCH 5/9] Add GDB to build environment --- builder/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/builder/main.py b/builder/main.py index 37272ee..de86185 100644 --- 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", From c6f311a78e284f15a671ada650ea2dded39a203b Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 14 Apr 2017 17:41:37 +0300 Subject: [PATCH 6/9] Update libOpenCM3 framework --- builder/frameworks/libopencm3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/frameworks/libopencm3 b/builder/frameworks/libopencm3 index 945d52d..d656847 160000 --- a/builder/frameworks/libopencm3 +++ b/builder/frameworks/libopencm3 @@ -1 +1 @@ -Subproject commit 945d52d28eb2834cf6f06a9725516e7013fc6dbd +Subproject commit d6568477b97cc90dcbf8cb57f1a967712937747a From f142caa6e42fd9574eb5bb6cce28b47de7f4353d Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 27 Apr 2017 00:40:18 +0300 Subject: [PATCH 7/9] Add OpenOCD package --- platform.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/platform.json b/platform.json index c513ea5..cdca607 100644 --- a/platform.json +++ b/platform.json @@ -47,6 +47,11 @@ "type": "uploader", "optional": true, "version": "~1.103.0" + }, + "tool-openocd": { + "type": "debug", + "optional": true, + "version": "~1.1000.0" } } } From c6f17aa39b1b9dde1a3cddc1e4049a98c51f68c1 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 28 Apr 2017 01:27:20 +0300 Subject: [PATCH 8/9] Update debug configuration --- boards/lplm4f120h5qr.json | 8 -------- boards/lptm4c1230c3pm.json | 8 -------- boards/lptm4c1294ncpdt.json | 8 -------- 3 files changed, 24 deletions(-) diff --git a/boards/lplm4f120h5qr.json b/boards/lplm4f120h5qr.json index aed0093..00037f2 100644 --- a/boards/lplm4f120h5qr.json +++ b/boards/lplm4f120h5qr.json @@ -18,14 +18,6 @@ "-f", "scripts/board/ek-lm4f120xl.cfg" ] }, - "gdbinit": [ - "target remote :3333", - "file $PROG_PATH", - "load $PROG_PATH", - "monitor init", - "monitor reset halt", - "tb main" - ], "onboard": true } } diff --git a/boards/lptm4c1230c3pm.json b/boards/lptm4c1230c3pm.json index ffb6500..2b0e835 100644 --- a/boards/lptm4c1230c3pm.json +++ b/boards/lptm4c1230c3pm.json @@ -18,14 +18,6 @@ "-f", "scripts/board/ek-tm4c123gxl.cfg" ] }, - "gdbinit": [ - "target remote :3333", - "file $PROG_PATH", - "load $PROG_PATH", - "monitor init", - "monitor reset halt", - "tb main" - ], "onboard": true } } diff --git a/boards/lptm4c1294ncpdt.json b/boards/lptm4c1294ncpdt.json index a8eeee8..f84fdc1 100644 --- a/boards/lptm4c1294ncpdt.json +++ b/boards/lptm4c1294ncpdt.json @@ -18,14 +18,6 @@ "-f", "scripts/board/ek-tm4c1294xl.cfg" ] }, - "gdbinit": [ - "target remote :3333", - "file $PROG_PATH", - "load $PROG_PATH", - "monitor init", - "monitor reset halt", - "tb main" - ], "onboard": true } } From 99bb4d8af75a387c1e6746c9175c232e3f0d4ff5 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 4 May 2017 00:10:53 +0300 Subject: [PATCH 9/9] Bump version to 2.0.0 --- platform.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.json b/platform.json index cdca607..a4d0953 100644 --- 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",