Merge branch 'release/v2.2.0'

platformio · Oct 21, 2019 · 2252e82 · 2252e82
2 parents 313c2f2 + a2d234d
commit 2252e82
Show file tree

Hide file tree

Showing 14 changed files with 294 additions and 22 deletions.
diff --git a/boards/lpmsp430f5529.json b/boards/lpmsp430f5529.json
@@ -2,7 +2,7 @@
   "build": {
     "core": "msp430",
     "extra_flags": "-DENERGIA_ARCH_MSP430 -DENERGIA_MSP_EXP430F5529LP",
-    "f_cpu": "16000000L",
+    "f_cpu": "25000000L",
     "hwids": [
       [
         "0x2341",
@@ -33,8 +33,8 @@
   "name": "TI LaunchPad MSP-EXP430F5529LP",
   "upload": {
     "maximum_ram_size": 8192,
-    "maximum_size": 131072,
-    "protocol": "tilib"
+    "maximum_size": 48128,
+    "protocol": "dslite"
   },
   "url": "http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430f5529lp.html",
   "vendor": "TI"

diff --git a/boards/lpmsp430fr2311.json b/boards/lpmsp430fr2311.json
@@ -0,0 +1,41 @@
+{
+  "build": {
+    "core": "msp430",
+    "extra_flags": "-DENERGIA_ARCH_MSP430 -DENERGIA_MSP_EXP430FR2311LP",
+    "f_cpu": "16000000L",
+    "hwids": [
+      [
+        "0x2341",
+        "0x0c9f"
+      ]
+    ],
+    "mcu": "msp430fr2311",
+    "variant": "MSP-EXP430FR2311LP"
+  },
+  "debug": {
+    "tools": {
+      "mspdebug": {
+        "onboard": true,
+        "server": {
+          "arguments": [
+            "$UPLOAD_PROTOCOL",
+            "gdb"
+          ],
+          "executable": "mspdebug",
+          "package": "tool-mspdebug"
+        }
+      }
+    }
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "TI LaunchPad MSP-EXP430FR2311LP",
+  "upload": {
+    "maximum_ram_size": 1024,
+    "maximum_size": 3840,
+    "protocol": "dslite"
+  },
+  "url": "http://www.ti.com/product/MSP430FR2311",
+  "vendor": "TI"
+}
diff --git a/boards/lpmsp430fr2433.json b/boards/lpmsp430fr2433.json
@@ -0,0 +1,41 @@
+{
+  "build": {
+    "core": "msp430",
+    "extra_flags": "-DENERGIA_ARCH_MSP430 -DENERGIA_MSP_EXP430FR2433LP",
+    "f_cpu": "8000000L",
+    "hwids": [
+      [
+        "0x2341",
+        "0x0c9f"
+      ]
+    ],
+    "mcu": "msp430fr2433",
+    "variant": "MSP-EXP430FR2433LP"
+  },
+  "debug": {
+    "tools": {
+      "mspdebug": {
+        "onboard": true,
+        "server": {
+          "arguments": [
+            "$UPLOAD_PROTOCOL",
+            "gdb"
+          ],
+          "executable": "mspdebug",
+          "package": "tool-mspdebug"
+        }
+      }
+    }
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "TI LaunchPad MSP-EXP430FR2433LP",
+  "upload": {
+    "maximum_ram_size": 4096,
+    "maximum_size": 15360,
+    "protocol": "dslite"
+  },
+  "url": "http://www.ti.com/product/MSP430FR2433",
+  "vendor": "TI"
+}
diff --git a/boards/lpmsp430fr4133.json b/boards/lpmsp430fr4133.json
@@ -34,7 +34,7 @@
   "upload": {
     "maximum_ram_size": 2048,
     "maximum_size": 15360,
-    "protocol": "tilib"
+    "protocol": "dslite"
   },
   "url": "http://www.ti.com/tool/msp-exp430fr4133",
   "vendor": "TI"

diff --git a/boards/lpmsp430fr5739.json b/boards/lpmsp430fr5739.json
@@ -52,8 +52,8 @@
   ],
   "name": "TI FraunchPad MSP-EXP430FR5739LP",
   "upload": {
-    "maximum_ram_size": 512,
-    "maximum_size": 16384,
+    "maximum_ram_size": 1024,
+    "maximum_size": 15743,
     "protocol": "rf2500"
   },
   "url": "http://www.ti.com/tool/msp-exp430fr5739",

diff --git a/boards/lpmsp430fr5969.json b/boards/lpmsp430fr5969.json
@@ -33,8 +33,8 @@
   "name": "TI LaunchPad MSP-EXP430FR5969LP",
   "upload": {
     "maximum_ram_size": 2048,
-    "maximum_size": 65536,
-    "protocol": "tilib"
+    "maximum_size": 48128,
+    "protocol": "dslite"
   },
   "url": "http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430fr5969.html",
   "vendor": "TI"

diff --git a/boards/lpmsp430fr5994.json b/boards/lpmsp430fr5994.json
@@ -0,0 +1,41 @@
+{
+  "build": {
+    "core": "msp430",
+    "extra_flags": "-DENERGIA_ARCH_MSP430 -DENERGIA_MSP_EXP430FR5994LP",
+    "f_cpu": "16000000L",
+    "hwids": [
+      [
+        "0x2341",
+        "0x0c9f"
+      ]
+    ],
+    "mcu": "msp430fr5994",
+    "variant": "MSP-EXP430FR5994LP"
+  },
+  "debug": {
+    "tools": {
+      "mspdebug": {
+        "onboard": true,
+        "server": {
+          "arguments": [
+            "$UPLOAD_PROTOCOL",
+            "gdb"
+          ],
+          "executable": "mspdebug",
+          "package": "tool-mspdebug"
+        }
+      }
+    }
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "TI LaunchPad MSP-EXP430FR5994LP",
+  "upload": {
+    "maximum_ram_size": 4096,
+    "maximum_size": 262144,
+    "protocol": "dslite"
+  },
+  "url": "http://www.ti.com/product/MSP430FR5994",
+  "vendor": "TI"
+}
diff --git a/boards/lpmsp430fr6989.json b/boards/lpmsp430fr6989.json
@@ -33,8 +33,8 @@
   "name": "TI LaunchPad MSP-EXP430FR6989LP",
   "upload": {
     "maximum_ram_size": 2048,
-    "maximum_size": 130048,
-    "protocol": "tilib"
+    "maximum_size": 48128,
+    "protocol": "dslite"
   },
   "url": "http://www.ti.com/tool/msp-exp430fr6989",
   "vendor": "TI"

diff --git a/boards/lpmsp430g2231.json b/boards/lpmsp430g2231.json
@@ -0,0 +1,61 @@
+{
+  "build": {
+    "core": "msp430",
+    "extra_flags": "-DENERGIA_ARCH_MSP430 -DENERGIA_MSP_EXP430G2231LP",
+    "f_cpu": "1000000L",
+    "hwids": [
+      [
+        "0x2341",
+        "0x0c9f"
+      ]
+    ],
+    "mcu": "msp430g2231",
+    "variant": "MSP-EXP430G2231LP"
+  },
+  "debug": {
+    "tools": {
+      "mspdebug": {
+        "onboard": true,
+        "server": [
+          {
+            "arguments": [
+              "tilib",
+              "gdb"
+            ],
+            "executable": "mspdebug",
+            "package": "tool-mspdebug",
+            "system": [
+              "windows",
+              "windows_amd64",
+              "windows_x86"
+            ]
+          },
+          {
+            "arguments": [
+              "$UPLOAD_PROTOCOL",
+              "gdb"
+            ],
+            "executable": "mspdebug",
+            "package": "tool-mspdebug",
+            "system": [
+              "darwin_x86_64",
+              "linux_i686",
+              "linux_x86_64"
+            ]
+          }
+        ]
+      }
+    }
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "TI LaunchPad MSP-EXP430G2 w/ MSP430G2231",
+  "upload": {
+    "maximum_ram_size": 256,
+    "maximum_size": 2048,
+    "protocol": "rf2500"
+  },
+  "url": "http://www.ti.com/product/MSP430G2231",
+  "vendor": "TI"
+}
diff --git a/boards/lpmsp430g2452.json b/boards/lpmsp430g2452.json
@@ -0,0 +1,61 @@
+{
+  "build": {
+    "core": "msp430",
+    "extra_flags": "-DENERGIA_ARCH_MSP430 -DENERGIA_MSP_EXP430G2452LP",
+    "f_cpu": "16000000L",
+    "hwids": [
+      [
+        "0x2341",
+        "0x0c9f"
+      ]
+    ],
+    "mcu": "msp430g2452",
+    "variant": "MSP-EXP430G2452LP"
+  },
+  "debug": {
+    "tools": {
+      "mspdebug": {
+        "onboard": true,
+        "server": [
+          {
+            "arguments": [
+              "tilib",
+              "gdb"
+            ],
+            "executable": "mspdebug",
+            "package": "tool-mspdebug",
+            "system": [
+              "windows",
+              "windows_amd64",
+              "windows_x86"
+            ]
+          },
+          {
+            "arguments": [
+              "$UPLOAD_PROTOCOL",
+              "gdb"
+            ],
+            "executable": "mspdebug",
+            "package": "tool-mspdebug",
+            "system": [
+              "darwin_x86_64",
+              "linux_i686",
+              "linux_x86_64"
+            ]
+          }
+        ]
+      }
+    }
+  },
+  "frameworks": [
+    "arduino"
+  ],
+  "name": "TI LaunchPad MSP-EXP430G2 w/ MSP430G2452",
+  "upload": {
+    "maximum_ram_size": 256,
+    "maximum_size": 8192,
+    "protocol": "rf2500"
+  },
+  "url": "http://www.ti.com/product/MSP430G2452",
+  "vendor": "TI"
+}
diff --git a/boards/lpmsp430g2553.json b/boards/lpmsp430g2553.json
@@ -54,7 +54,7 @@
   "upload": {
     "maximum_ram_size": 512,
     "maximum_size": 16384,
-    "protocol": "rf2500"
+    "protocol": "dslite"
   },
   "url": "http://www.ti.com/ww/en/launchpad/launchpads-msp430-msp-exp430g2.html",
   "vendor": "TI"

diff --git a/builder/frameworks/energia.py b/builder/frameworks/energia.py
@@ -35,16 +35,23 @@
 FRAMEWORK_VERSION = platform.get_package_version("framework-energiamsp430")
 assert isdir(FRAMEWORK_DIR)
 
+board = env.BoardConfig()
+
+variants_dir = join(
+    "$PROJECT_DIR", board.get("build.variants_dir")) if board.get(
+        "build.variants_dir", "") else join(FRAMEWORK_DIR, "variants")
 
 env.Append(
     CPPDEFINES=[
-        ("ARDUINO", 10805),
+        ("ARDUINO", 10807),
         ("ENERGIA", int(FRAMEWORK_VERSION.split(".")[1]))
     ],
 
     CPPPATH=[
         join(FRAMEWORK_DIR, "cores", env.BoardConfig().get("build.core")),
-        join(FRAMEWORK_DIR, "variants", env.BoardConfig().get("build.variant"))
+        join(variants_dir, board.get("build.variant")),
+        join(platform.get_package_dir(
+            "toolchain-timsp430"), "msp430", "include")
     ],
 
     LIBSOURCE_DIRS=[
@@ -60,7 +67,7 @@
 
 libs.append(env.BuildLibrary(
     join("$BUILD_DIR", "FrameworkEnergia"),
-    join(FRAMEWORK_DIR, "cores", env.BoardConfig().get("build.core"))
+    join(FRAMEWORK_DIR, "cores", board.get("build.core"))
 ))
 
 env.Append(LIBS=libs)