Merge branch 'release/v2.0.3'

platformio · Apr 19, 2018 · 68e4636 · 68e4636
2 parents 6110c3f + ccfe2cc
commit 68e4636
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 38 deletions.
diff --git a/README.md b/README.md
@@ -9,12 +9,28 @@ Texas Instruments TM4C12x MCUs offer the industrys most popular ARM Cortex-M4 co
 
 # Usage
 
-1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
-2. Install TI TIVA development platform:
-```bash
-# install the latest stable version
-> platformio platform install titiva
-
-# install development version
-> platformio platform install https://github.com/platformio/platform-titiva.git
+1. [Install PlatformIO](http://platformio.org)
+2. Create PlatformIO project and configure a platform option in [platformio.ini](http://docs.platformio.org/page/projectconf.html) file:
+
+## Stable version
+
+```ini
+[env:stable]
+platform = titiva
+board = ...
+...
+```
+
+## Development version
+
+```ini
+[env:development]
+platform = https://github.com/platformio/platform-titiva.git
+board = ...
+...
 ```
+
+# Configuration
+
+Please navigate to [documentation](http://docs.platformio.org/page/platforms/titiva.html).
+
diff --git a/boards/lplm4f120h5qr.json b/boards/lplm4f120h5qr.json
@@ -1,8 +1,8 @@
 {
   "build": {
-    "extra_flags": "-DENERGIA_ARCH_TIVAC -DENERGIA_EK_TM4C123GXL",
     "core": "tivac",
     "cpu": "cortex-m4",
+    "extra_flags": "-DENERGIA_ARCH_TIVAC -DENERGIA_EK_TM4C123GXL",
     "f_cpu": "80000000L",
     "ldscript": "lm4fcpp_blizzard.ld",
     "mcu": "lplm4f120h5qr",
@@ -11,14 +11,15 @@
   "debug": {
     "tools": {
       "ti-icdi": {
+        "onboard": true,
         "server": {
-          "package": "tool-openocd",
-          "executable": "bin/openocd",
           "arguments": [
-            "-f", "scripts/board/ek-lm4f120xl.cfg"
-          ]
-        },
-        "onboard": true
+            "-f",
+            "scripts/board/ek-lm4f120xl.cfg"
+          ],
+          "executable": "bin/openocd",
+          "package": "tool-openocd"
+        }
       }
     }
   },
@@ -33,4 +34,4 @@
   },
   "url": "http://www.ti.com/tool/ek-lm4f120xl",
   "vendor": "TI"
-}
+}
diff --git a/boards/lptm4c1230c3pm.json b/boards/lptm4c1230c3pm.json
@@ -1,8 +1,8 @@
 {
   "build": {
-    "extra_flags": "-DENERGIA_ARCH_TIVAC -DENERGIA_EK_TM4C123GXL",
     "core": "tivac",
     "cpu": "cortex-m4",
+    "extra_flags": "-DENERGIA_ARCH_TIVAC -DENERGIA_EK_TM4C123GXL",
     "f_cpu": "80000000L",
     "ldscript": "lm4fcpp_blizzard.ld",
     "mcu": "lptm4c1230c3pm",
@@ -11,14 +11,15 @@
   "debug": {
     "tools": {
       "ti-icdi": {
+        "onboard": true,
         "server": {
-          "package": "tool-openocd",
-          "executable": "bin/openocd",
           "arguments": [
-            "-f", "scripts/board/ek-tm4c123gxl.cfg"
-          ]
-        },
-        "onboard": true
+            "-f",
+            "scripts/board/ek-tm4c123gxl.cfg"
+          ],
+          "executable": "bin/openocd",
+          "package": "tool-openocd"
+        }
       }
     }
   },
@@ -33,4 +34,4 @@
   },
   "url": "http://www.ti.com/ww/en/launchpad/launchpads-connected-ek-tm4c123gxl.html",
   "vendor": "TI"
-}
+}
diff --git a/boards/lptm4c1294ncpdt.json b/boards/lptm4c1294ncpdt.json
@@ -1,8 +1,8 @@
 {
   "build": {
-    "extra_flags": "-DENERGIA_ARCH_TIVAC -DENERGIA_EK_TM4C1294XL",
     "core": "tivac",
     "cpu": "cortex-m4",
+    "extra_flags": "-DENERGIA_ARCH_TIVAC -DENERGIA_EK_TM4C1294XL",
     "f_cpu": "120000000L",
     "ldscript": "lm4fcpp_snowflake.ld",
     "mcu": "lptm4c1294ncpdt",
@@ -11,14 +11,15 @@
   "debug": {
     "tools": {
       "ti-icdi": {
+        "onboard": true,
         "server": {
-          "package": "tool-openocd",
-          "executable": "bin/openocd",
           "arguments": [
-            "-f", "scripts/board/ek-tm4c1294xl.cfg"
-          ]
-        },
-        "onboard": true
+            "-f",
+            "scripts/board/ek-tm4c1294xl.cfg"
+          ],
+          "executable": "bin/openocd",
+          "package": "tool-openocd"
+        }
       }
     }
   },
@@ -33,4 +34,4 @@
   },
   "url": "http://www.ti.com/ww/en/launchpad/launchpads-connected-ek-tm4c1294xl.html",
   "vendor": "TI"
-}
+}
diff --git a/builder/frameworks/energia.py b/builder/frameworks/energia.py
@@ -37,7 +37,7 @@
 
 env.Append(
     CPPDEFINES=[
-        ("ARDUINO", 10610),
+        ("ARDUINO", 10805),
         ("ENERGIA", int(FRAMEWORK_VERSION.split(".")[1])),
         ("printf", "iprintf")
     ],

diff --git a/builder/main.py b/builder/main.py
@@ -39,7 +39,6 @@
     ASFLAGS=["-x", "assembler-with-cpp"],
 
     CCFLAGS=[
-        "-g",   # include debugging info (so errors include line numbers)
         "-Os",  # optimize for size
         "-ffunction-sections",  # place each function in its own section
         "-fdata-sections",
@@ -77,10 +76,13 @@
 
     SIZEPRINTCMD='$SIZETOOL -B -d $SOURCES',
 
-    PROGNAME="firmware",
     PROGSUFFIX=".elf"
 )
 
+# Allow user to override via pre:script
+if env.get("PROGNAME", "program") == "program":
+    env.Replace(PROGNAME="firmware")
+
 if "BOARD" in env:
     env.Append(
         CCFLAGS=[
@@ -127,10 +129,10 @@
 
 target_elf = None
 if "nobuild" in COMMAND_LINE_TARGETS:
-    target_firm = join("$BUILD_DIR", "firmware.bin")
+    target_firm = join("$BUILD_DIR", "${PROGNAME}.bin")
 else:
     target_elf = env.BuildProgram()
-    target_firm = env.ElfToBin(join("$BUILD_DIR", "firmware"), target_elf)
+    target_firm = env.ElfToBin(join("$BUILD_DIR", "${PROGNAME}"), target_elf)
 
 AlwaysBuild(env.Alias("nobuild", target_firm))
 target_buildprog = env.Alias("buildprog", target_firm, target_firm)

diff --git a/platform.json b/platform.json
@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-titiva.git"
   },
-  "version": "2.0.2",
+  "version": "2.0.3",
   "packageRepositories": [
     "https://dl.bintray.com/platformio/dl-packages/manifest.json",
     "http://dl.platformio.org/packages/manifest.json"