From abbb2e2e1701bcc61a2665f1ec67b25b9899cde0 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 8 May 2017 16:40:22 +0300 Subject: [PATCH 1/4] Fix debugger on Windows --- boards/lpmsp430f5529.json | 34 +++++++++++++++++++++++++--------- boards/lpmsp430fr4133.json | 34 +++++++++++++++++++++++++--------- boards/lpmsp430fr5739.json | 34 +++++++++++++++++++++++++--------- boards/lpmsp430fr5969.json | 34 +++++++++++++++++++++++++--------- boards/lpmsp430fr6989.json | 34 +++++++++++++++++++++++++--------- boards/lpmsp430g2553.json | 36 ++++++++++++++++++++++++++---------- platform.json | 7 ++++++- 7 files changed, 157 insertions(+), 56 deletions(-) diff --git a/boards/lpmsp430f5529.json b/boards/lpmsp430f5529.json index 8936b42..344ac5e 100644 --- a/boards/lpmsp430f5529.json +++ b/boards/lpmsp430f5529.json @@ -15,15 +15,31 @@ "debug": { "tools": { "mspdebug": { - "server": { - "package": "tool-mspdebug", - "executable": "mspdebug", - "arguments": [ - "tilib", - "gdb" - ] - }, - "onboard": true + "onboard": true, + "server": [ + { + "executable": "msp430-gdbproxy", + "package": "tool-msp430gdbproxy", + "system": [ + "windows", + "windows_amd64", + "windows_x86" + ] + }, + { + "arguments": [ + "$UPLOAD_PROTOCOL", + "gdb" + ], + "executable": "mspdebug", + "package": "tool-mspdebug", + "system": [ + "darwin_x86_64", + "linux_i686", + "linux_x86_64" + ] + } + ] } } }, diff --git a/boards/lpmsp430fr4133.json b/boards/lpmsp430fr4133.json index 30afd9b..35c5506 100644 --- a/boards/lpmsp430fr4133.json +++ b/boards/lpmsp430fr4133.json @@ -15,15 +15,31 @@ "debug": { "tools": { "mspdebug": { - "server": { - "package": "tool-mspdebug", - "executable": "mspdebug", - "arguments": [ - "tilib", - "gdb" - ] - }, - "onboard": true + "onboard": true, + "server": [ + { + "executable": "msp430-gdbproxy", + "package": "tool-msp430gdbproxy", + "system": [ + "windows", + "windows_amd64", + "windows_x86" + ] + }, + { + "arguments": [ + "$UPLOAD_PROTOCOL", + "gdb" + ], + "executable": "mspdebug", + "package": "tool-mspdebug", + "system": [ + "darwin_x86_64", + "linux_i686", + "linux_x86_64" + ] + } + ] } } }, diff --git a/boards/lpmsp430fr5739.json b/boards/lpmsp430fr5739.json index aef1cc9..8328419 100644 --- a/boards/lpmsp430fr5739.json +++ b/boards/lpmsp430fr5739.json @@ -15,15 +15,31 @@ "debug": { "tools": { "mspdebug": { - "server": { - "package": "tool-mspdebug", - "executable": "mspdebug", - "arguments": [ - "rf2500", - "gdb" - ] - }, - "onboard": true + "onboard": true, + "server": [ + { + "executable": "msp430-gdbproxy", + "package": "tool-msp430gdbproxy", + "system": [ + "windows", + "windows_amd64", + "windows_x86" + ] + }, + { + "arguments": [ + "$UPLOAD_PROTOCOL", + "gdb" + ], + "executable": "mspdebug", + "package": "tool-mspdebug", + "system": [ + "darwin_x86_64", + "linux_i686", + "linux_x86_64" + ] + } + ] } } }, diff --git a/boards/lpmsp430fr5969.json b/boards/lpmsp430fr5969.json index 538d868..b4d0843 100644 --- a/boards/lpmsp430fr5969.json +++ b/boards/lpmsp430fr5969.json @@ -15,15 +15,31 @@ "debug": { "tools": { "mspdebug": { - "server": { - "package": "tool-mspdebug", - "executable": "mspdebug", - "arguments": [ - "tilib", - "gdb" - ] - }, - "onboard": true + "onboard": true, + "server": [ + { + "executable": "msp430-gdbproxy", + "package": "tool-msp430gdbproxy", + "system": [ + "windows", + "windows_amd64", + "windows_x86" + ] + }, + { + "arguments": [ + "$UPLOAD_PROTOCOL", + "gdb" + ], + "executable": "mspdebug", + "package": "tool-mspdebug", + "system": [ + "darwin_x86_64", + "linux_i686", + "linux_x86_64" + ] + } + ] } } }, diff --git a/boards/lpmsp430fr6989.json b/boards/lpmsp430fr6989.json index d48d5c2..2ef93bb 100644 --- a/boards/lpmsp430fr6989.json +++ b/boards/lpmsp430fr6989.json @@ -15,15 +15,31 @@ "debug": { "tools": { "mspdebug": { - "server": { - "package": "tool-mspdebug", - "executable": "mspdebug", - "arguments": [ - "tilib", - "gdb" - ] - }, - "onboard": true + "onboard": true, + "server": [ + { + "executable": "msp430-gdbproxy", + "package": "tool-msp430gdbproxy", + "system": [ + "windows", + "windows_amd64", + "windows_x86" + ] + }, + { + "arguments": [ + "$UPLOAD_PROTOCOL", + "gdb" + ], + "executable": "mspdebug", + "package": "tool-mspdebug", + "system": [ + "darwin_x86_64", + "linux_i686", + "linux_x86_64" + ] + } + ] } } }, diff --git a/boards/lpmsp430g2553.json b/boards/lpmsp430g2553.json index 81d2680..b514c8b 100644 --- a/boards/lpmsp430g2553.json +++ b/boards/lpmsp430g2553.json @@ -3,27 +3,43 @@ "core": "msp430", "extra_flags": "-DENERGIA_ARCH_MSP430 -DENERGIA_MSP_EXP430G2553LP", "f_cpu": "16000000L", - "mcu": "msp430g2553", "hwids": [ [ "0x2341", "0x0c9f" ] ], + "mcu": "msp430g2553", "variant": "MSP-EXP430G2553LP" }, "debug": { "tools": { "mspdebug": { - "server": { - "package": "tool-mspdebug", - "executable": "mspdebug", - "arguments": [ - "rf2500", - "gdb" - ] - }, - "onboard": true + "onboard": true, + "server": [ + { + "executable": "msp430-gdbproxy", + "package": "tool-msp430gdbproxy", + "system": [ + "windows", + "windows_amd64", + "windows_x86" + ] + }, + { + "arguments": [ + "$UPLOAD_PROTOCOL", + "gdb" + ], + "executable": "mspdebug", + "package": "tool-mspdebug", + "system": [ + "darwin_x86_64", + "linux_i686", + "linux_x86_64" + ] + } + ] } } }, diff --git a/platform.json b/platform.json index 638911e..2b5f8f1 100644 --- a/platform.json +++ b/platform.json @@ -12,7 +12,7 @@ "type": "git", "url": "https://github.com/platformio/platform-timsp430.git" }, - "version": "2.0.0", + "version": "2.0.1-alpha.1", "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.2200.0" + }, + "tool-msp430gdbproxy": { + "type": "debugger", + "optional": true, + "version": "~1.18.0" } } } From db3d10caee0d04b3fc8ee303be2e7cb62425a170 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 8 May 2017 18:36:19 +0300 Subject: [PATCH 2/4] Update initial debugging commands --- boards/lpmsp430f5529.json | 16 ++++++++++++---- boards/lpmsp430fr4133.json | 14 +++++++++++--- boards/lpmsp430fr5739.json | 14 +++++++++++--- boards/lpmsp430fr5969.json | 14 +++++++++++--- boards/lpmsp430fr6989.json | 14 +++++++++++--- boards/lpmsp430g2553.json | 14 +++++++++++--- 6 files changed, 67 insertions(+), 19 deletions(-) diff --git a/boards/lpmsp430f5529.json b/boards/lpmsp430f5529.json index 344ac5e..bf2e508 100644 --- a/boards/lpmsp430f5529.json +++ b/boards/lpmsp430f5529.json @@ -3,13 +3,13 @@ "core": "msp430", "extra_flags": "-DENERGIA_ARCH_MSP430 -DENERGIA_MSP_EXP430F5529LP", "f_cpu": "16000000L", - "mcu": "msp430f5529", "hwids": [ [ "0x2341", "0x0c9f" ] ], + "mcu": "msp430f5529", "variant": "MSP-EXP430F5529LP" }, "debug": { @@ -19,11 +19,19 @@ "server": [ { "executable": "msp430-gdbproxy", + "init_cmds": [ + "target remote $DEBUG_PORT", + "monitor erase", + "file \"$PROG_PATH\"", + "load \"$PROG_PATH\"", + "monitor reset halt", + "tb main" + ], "package": "tool-msp430gdbproxy", "system": [ - "windows", - "windows_amd64", - "windows_x86" + "windows", + "windows_amd64", + "windows_x86" ] }, { diff --git a/boards/lpmsp430fr4133.json b/boards/lpmsp430fr4133.json index 35c5506..34f2fc9 100644 --- a/boards/lpmsp430fr4133.json +++ b/boards/lpmsp430fr4133.json @@ -19,11 +19,19 @@ "server": [ { "executable": "msp430-gdbproxy", + "init_cmds": [ + "target remote $DEBUG_PORT", + "monitor erase", + "file \"$PROG_PATH\"", + "load \"$PROG_PATH\"", + "monitor reset halt", + "tb main" + ], "package": "tool-msp430gdbproxy", "system": [ - "windows", - "windows_amd64", - "windows_x86" + "windows", + "windows_amd64", + "windows_x86" ] }, { diff --git a/boards/lpmsp430fr5739.json b/boards/lpmsp430fr5739.json index 8328419..3e7c410 100644 --- a/boards/lpmsp430fr5739.json +++ b/boards/lpmsp430fr5739.json @@ -19,11 +19,19 @@ "server": [ { "executable": "msp430-gdbproxy", + "init_cmds": [ + "target remote $DEBUG_PORT", + "monitor erase", + "file \"$PROG_PATH\"", + "load \"$PROG_PATH\"", + "monitor reset halt", + "tb main" + ], "package": "tool-msp430gdbproxy", "system": [ - "windows", - "windows_amd64", - "windows_x86" + "windows", + "windows_amd64", + "windows_x86" ] }, { diff --git a/boards/lpmsp430fr5969.json b/boards/lpmsp430fr5969.json index b4d0843..36f4731 100644 --- a/boards/lpmsp430fr5969.json +++ b/boards/lpmsp430fr5969.json @@ -19,11 +19,19 @@ "server": [ { "executable": "msp430-gdbproxy", + "init_cmds": [ + "target remote $DEBUG_PORT", + "monitor erase", + "file \"$PROG_PATH\"", + "load \"$PROG_PATH\"", + "monitor reset halt", + "tb main" + ], "package": "tool-msp430gdbproxy", "system": [ - "windows", - "windows_amd64", - "windows_x86" + "windows", + "windows_amd64", + "windows_x86" ] }, { diff --git a/boards/lpmsp430fr6989.json b/boards/lpmsp430fr6989.json index 2ef93bb..8141a64 100644 --- a/boards/lpmsp430fr6989.json +++ b/boards/lpmsp430fr6989.json @@ -19,11 +19,19 @@ "server": [ { "executable": "msp430-gdbproxy", + "init_cmds": [ + "target remote $DEBUG_PORT", + "monitor erase", + "file \"$PROG_PATH\"", + "load \"$PROG_PATH\"", + "monitor reset halt", + "tb main" + ], "package": "tool-msp430gdbproxy", "system": [ - "windows", - "windows_amd64", - "windows_x86" + "windows", + "windows_amd64", + "windows_x86" ] }, { diff --git a/boards/lpmsp430g2553.json b/boards/lpmsp430g2553.json index b514c8b..489e47a 100644 --- a/boards/lpmsp430g2553.json +++ b/boards/lpmsp430g2553.json @@ -19,11 +19,19 @@ "server": [ { "executable": "msp430-gdbproxy", + "init_cmds": [ + "target remote $DEBUG_PORT", + "monitor erase", + "file \"$PROG_PATH\"", + "load \"$PROG_PATH\"", + "monitor reset halt", + "tb main" + ], "package": "tool-msp430gdbproxy", "system": [ - "windows", - "windows_amd64", - "windows_x86" + "windows", + "windows_amd64", + "windows_x86" ] }, { From 3f7b1b37454f3b5f663e4452dfc682f78436e331 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Tue, 16 May 2017 00:09:08 +0300 Subject: [PATCH 3/4] Update debugging configuration --- boards/lpmsp430f5529.json | 40 ++++++++------------------------------ boards/lpmsp430fr4133.json | 40 ++++++++------------------------------ boards/lpmsp430fr5739.json | 14 +++++-------- boards/lpmsp430fr5969.json | 40 ++++++++------------------------------ boards/lpmsp430fr6989.json | 40 ++++++++------------------------------ boards/lpmsp430g2553.json | 14 +++++-------- 6 files changed, 42 insertions(+), 146 deletions(-) diff --git a/boards/lpmsp430f5529.json b/boards/lpmsp430f5529.json index bf2e508..bc67ea5 100644 --- a/boards/lpmsp430f5529.json +++ b/boards/lpmsp430f5529.json @@ -16,38 +16,14 @@ "tools": { "mspdebug": { "onboard": true, - "server": [ - { - "executable": "msp430-gdbproxy", - "init_cmds": [ - "target remote $DEBUG_PORT", - "monitor erase", - "file \"$PROG_PATH\"", - "load \"$PROG_PATH\"", - "monitor reset halt", - "tb main" - ], - "package": "tool-msp430gdbproxy", - "system": [ - "windows", - "windows_amd64", - "windows_x86" - ] - }, - { - "arguments": [ - "$UPLOAD_PROTOCOL", - "gdb" - ], - "executable": "mspdebug", - "package": "tool-mspdebug", - "system": [ - "darwin_x86_64", - "linux_i686", - "linux_x86_64" - ] - } - ] + "server": { + "arguments": [ + "$UPLOAD_PROTOCOL", + "gdb" + ], + "executable": "mspdebug", + "package": "tool-mspdebug" + } } } }, diff --git a/boards/lpmsp430fr4133.json b/boards/lpmsp430fr4133.json index 34f2fc9..74034c9 100644 --- a/boards/lpmsp430fr4133.json +++ b/boards/lpmsp430fr4133.json @@ -16,38 +16,14 @@ "tools": { "mspdebug": { "onboard": true, - "server": [ - { - "executable": "msp430-gdbproxy", - "init_cmds": [ - "target remote $DEBUG_PORT", - "monitor erase", - "file \"$PROG_PATH\"", - "load \"$PROG_PATH\"", - "monitor reset halt", - "tb main" - ], - "package": "tool-msp430gdbproxy", - "system": [ - "windows", - "windows_amd64", - "windows_x86" - ] - }, - { - "arguments": [ - "$UPLOAD_PROTOCOL", - "gdb" - ], - "executable": "mspdebug", - "package": "tool-mspdebug", - "system": [ - "darwin_x86_64", - "linux_i686", - "linux_x86_64" - ] - } - ] + "server": { + "arguments": [ + "$UPLOAD_PROTOCOL", + "gdb" + ], + "executable": "mspdebug", + "package": "tool-mspdebug" + } } } }, diff --git a/boards/lpmsp430fr5739.json b/boards/lpmsp430fr5739.json index 3e7c410..f467b98 100644 --- a/boards/lpmsp430fr5739.json +++ b/boards/lpmsp430fr5739.json @@ -18,16 +18,12 @@ "onboard": true, "server": [ { - "executable": "msp430-gdbproxy", - "init_cmds": [ - "target remote $DEBUG_PORT", - "monitor erase", - "file \"$PROG_PATH\"", - "load \"$PROG_PATH\"", - "monitor reset halt", - "tb main" + "arguments": [ + "tilib", + "gdb" ], - "package": "tool-msp430gdbproxy", + "executable": "mspdebug", + "package": "tool-mspdebug", "system": [ "windows", "windows_amd64", diff --git a/boards/lpmsp430fr5969.json b/boards/lpmsp430fr5969.json index 36f4731..a82e904 100644 --- a/boards/lpmsp430fr5969.json +++ b/boards/lpmsp430fr5969.json @@ -16,38 +16,14 @@ "tools": { "mspdebug": { "onboard": true, - "server": [ - { - "executable": "msp430-gdbproxy", - "init_cmds": [ - "target remote $DEBUG_PORT", - "monitor erase", - "file \"$PROG_PATH\"", - "load \"$PROG_PATH\"", - "monitor reset halt", - "tb main" - ], - "package": "tool-msp430gdbproxy", - "system": [ - "windows", - "windows_amd64", - "windows_x86" - ] - }, - { - "arguments": [ - "$UPLOAD_PROTOCOL", - "gdb" - ], - "executable": "mspdebug", - "package": "tool-mspdebug", - "system": [ - "darwin_x86_64", - "linux_i686", - "linux_x86_64" - ] - } - ] + "server": { + "arguments": [ + "$UPLOAD_PROTOCOL", + "gdb" + ], + "executable": "mspdebug", + "package": "tool-mspdebug" + } } } }, diff --git a/boards/lpmsp430fr6989.json b/boards/lpmsp430fr6989.json index 8141a64..48e91da 100644 --- a/boards/lpmsp430fr6989.json +++ b/boards/lpmsp430fr6989.json @@ -16,38 +16,14 @@ "tools": { "mspdebug": { "onboard": true, - "server": [ - { - "executable": "msp430-gdbproxy", - "init_cmds": [ - "target remote $DEBUG_PORT", - "monitor erase", - "file \"$PROG_PATH\"", - "load \"$PROG_PATH\"", - "monitor reset halt", - "tb main" - ], - "package": "tool-msp430gdbproxy", - "system": [ - "windows", - "windows_amd64", - "windows_x86" - ] - }, - { - "arguments": [ - "$UPLOAD_PROTOCOL", - "gdb" - ], - "executable": "mspdebug", - "package": "tool-mspdebug", - "system": [ - "darwin_x86_64", - "linux_i686", - "linux_x86_64" - ] - } - ] + "server": { + "arguments": [ + "$UPLOAD_PROTOCOL", + "gdb" + ], + "executable": "mspdebug", + "package": "tool-mspdebug" + } } } }, diff --git a/boards/lpmsp430g2553.json b/boards/lpmsp430g2553.json index 489e47a..aa9d413 100644 --- a/boards/lpmsp430g2553.json +++ b/boards/lpmsp430g2553.json @@ -18,16 +18,12 @@ "onboard": true, "server": [ { - "executable": "msp430-gdbproxy", - "init_cmds": [ - "target remote $DEBUG_PORT", - "monitor erase", - "file \"$PROG_PATH\"", - "load \"$PROG_PATH\"", - "monitor reset halt", - "tb main" + "arguments": [ + "tilib", + "gdb" ], - "package": "tool-msp430gdbproxy", + "executable": "mspdebug", + "package": "tool-mspdebug", "system": [ "windows", "windows_amd64", From d1e936d7ebc425d74ce0daf71a871897d5855a96 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Tue, 16 May 2017 00:18:28 +0300 Subject: [PATCH 4/4] Bump version to 2.0.1 --- platform.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform.json b/platform.json index 2b5f8f1..3693e05 100644 --- a/platform.json +++ b/platform.json @@ -12,7 +12,7 @@ "type": "git", "url": "https://github.com/platformio/platform-timsp430.git" }, - "version": "2.0.1-alpha.1", + "version": "2.0.1", "packageRepositories": [ "https://dl.bintray.com/platformio/dl-packages/manifest.json", "https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",