diff --git a/app/src/processing/app/debug/MSP430Uploader.java b/app/src/processing/app/debug/MSP430Uploader.java
index 06aa23f..bd19844 100644
--- a/app/src/processing/app/debug/MSP430Uploader.java
+++ b/app/src/processing/app/debug/MSP430Uploader.java
@@ -67,16 +67,21 @@ public class MSP430Uploader extends Uploader{
params.add(boardPreferences.get("upload.protocol"));
if(!Preferences.getBoolean("upload.verbose"))
params.add("-q");
- params.add("--force-reset");
+ params.add("-d");
+ params.add(Preferences.get("serial.port")); //This line selects the Com Port that is selected under Tools
+ params.add("--force-reset");
if ( Base.isLinux()) {
- params.add("prog " + buildPath + File.separator + className + ".hex");
+ params.add("\"prog " + buildPath + File.separator + className + ".hex\"");
} else {
- params.add("prog " + buildPath + File.separator + className + ".hex");
+ params.add("\"prog " + buildPath + File.separator + className + ".hex\"");
}
} else {
- params.add("tilib"); // always use the TI Lib on Windows, best integrate on this OS
+ //params.add("tilib"); // always use the TI Lib on Windows, best integrate on this OS
+ params.add(boardPreferences.get("upload.protocol")); //Use the Upload Protocol instead
if(!Preferences.getBoolean("upload.verbose")) params.add("-q");
params.add("--force-reset");
+ params.add("-d \\\\.\\");
+ params.add(Preferences.get("serial.port"));
params.add("\"prog " + buildPath + File.separator + className + ".hex\"");
}
diff --git a/build/build.xml b/build/build.xml
index 2c2172e..7867e75 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -157,7 +157,7 @@
-
+
diff --git a/hardware/msp430/boards.txt b/hardware/msp430/boards.txt
index 532711c..d1a3cb1 100644
--- a/hardware/msp430/boards.txt
+++ b/hardware/msp430/boards.txt
@@ -1,36 +1,36 @@
##############################################################
-lpmsp430g2231.name=LaunchPad w/ msp430g2231 (1MHz)
-lpmsp430g2231.upload.protocol=rf2500
-lpmsp430g2231.upload.maximum_size=2048
-lpmsp430g2231.build.mcu=msp430g2231
-lpmsp430g2231.build.f_cpu=1000000L
-lpmsp430g2231.build.core=msp430
-lpmsp430g2231.build.variant=launchpad
-lpmsp430g2231.upload.maximum_ram_size=128
+#lpmsp430g2231.name=LaunchPad w/ msp430g2231 (1MHz)
+#lpmsp430g2231.upload.protocol=rf2500
+#lpmsp430g2231.upload.maximum_size=2048
+#lpmsp430g2231.build.mcu=msp430g2231
+#lpmsp430g2231.build.f_cpu=1000000L
+#lpmsp430g2231.build.core=msp430
+#lpmsp430g2231.build.variant=launchpad
+#lpmsp430g2231.upload.maximum_ram_size=128
##############################################################
-#lpmsp430g2231f.name=LaunchPad w/ msp430g2231 (16MHz)
-#lpmsp430g2231f.upload.protocol=rf2500
-#lpmsp430g2231f.upload.maximum_size=2048
-#lpmsp430g2231f.build.mcu=msp430g2231
-#lpmsp430g2231f.build.f_cpu=16000000L
-#lpmsp430g2231f.build.core=msp430
-#lpmsp430g2231f.build.variant=launchpad
-#lpmsp430g2231.upload.maximum_ram_size=128
+##lpmsp430g2231f.name=LaunchPad w/ msp430g2231 (16MHz)
+##lpmsp430g2231f.upload.protocol=rf2500
+##lpmsp430g2231f.upload.maximum_size=2048
+##lpmsp430g2231f.build.mcu=msp430g2231
+##lpmsp430g2231f.build.f_cpu=16000000L
+##lpmsp430g2231f.build.core=msp430
+##lpmsp430g2231f.build.variant=launchpad
+##lpmsp430g2231.upload.maximum_ram_size=128
##############################################################
-lpmsp430g2452.name=LaunchPad w/ msp430g2452 (16MHz)
-lpmsp430g2452.upload.protocol=rf2500
-lpmsp430g2452.upload.maximum_size=8192
-lpmsp430g2452.build.mcu=msp430g2452
-lpmsp430g2452.build.f_cpu=16000000L
-lpmsp430g2452.build.core=msp430
-lpmsp430g2452.build.variant=launchpad
-lpmsp430g2452.upload.maximum_ram_size=256
+#lpmsp430g2452.name=LaunchPad w/ msp430g2452 (16MHz)
+#lpmsp430g2452.upload.protocol=rf2500
+#lpmsp430g2452.upload.maximum_size=8192
+#lpmsp430g2452.build.mcu=msp430g2452
+#lpmsp430g2452.build.f_cpu=16000000L
+#lpmsp430g2452.build.core=msp430
+#lpmsp430g2452.build.variant=launchpad
+#lpmsp430g2452.upload.maximum_ram_size=256
##############################################################
lpmsp430g2553.name=LaunchPad w/ msp430g2553 (16MHz)
-lpmsp430g2553.upload.protocol=rf2500
+lpmsp430g2553.upload.protocol=rom-bsl
lpmsp430g2553.upload.maximum_size=16384
lpmsp430g2553.build.mcu=msp430g2553
lpmsp430g2553.build.f_cpu=16000000L
@@ -39,67 +39,67 @@ lpmsp430g2553.build.variant=launchpad
lpmsp430g2553.upload.maximum_ram_size=512
##############################################################
-lpmsp430fr5739.name=FraunchPad w/ msp430fr5739
-lpmsp430fr5739.upload.protocol=rf2500
-lpmsp430fr5739.upload.maximum_size=15872
-lpmsp430fr5739.build.mcu=msp430fr5739
-lpmsp430fr5739.build.f_cpu=16000000L
-lpmsp430fr5739.build.core=msp430
-lpmsp430fr5739.build.variant=fraunchpad
-lpmsp430fr5739.upload.maximum_ram_size=1024
+#lpmsp430fr5739.name=FraunchPad w/ msp430fr5739
+#lpmsp430fr5739.upload.protocol=rf2500
+#lpmsp430fr5739.upload.maximum_size=15872
+#lpmsp430fr5739.build.mcu=msp430fr5739
+#lpmsp430fr5739.build.f_cpu=16000000L
+#lpmsp430fr5739.build.core=msp430
+#lpmsp430fr5739.build.variant=fraunchpad
+#lpmsp430fr5739.upload.maximum_ram_size=1024
##############################################################
-lpmsp430f5529.name=LaunchPad w/ msp430f5529 (16MHz)
-lpmsp430f5529.upload.protocol=tilib
-lpmsp430f5529.upload.maximum_size=131072
-lpmsp430f5529.build.mcu=msp430f5529
-lpmsp430f5529.build.f_cpu=16000000L
-lpmsp430f5529.build.core=msp430
-lpmsp430f5529.build.variant=launchpad_f5529
-lpmsp430f5529.upload.maximum_ram_size=1024
+#lpmsp430f5529.name=LaunchPad w/ msp430f5529 (16MHz)
+#lpmsp430f5529.upload.protocol=tilib
+#lpmsp430f5529.upload.maximum_size=131072
+#lpmsp430f5529.build.mcu=msp430f5529
+#lpmsp430f5529.build.f_cpu=16000000L
+#lpmsp430f5529.build.core=msp430
+#lpmsp430f5529.build.variant=launchpad_f5529
+#lpmsp430f5529.upload.maximum_ram_size=1024
##############################################################
-lpmsp430f5529_25.name=LaunchPad w/ msp430f5529 (25MHz)
-lpmsp430f5529_25.upload.protocol=tilib
-lpmsp430f5529_25.upload.maximum_size=131072
-lpmsp430f5529_25.build.mcu=msp430f5529
-lpmsp430f5529_25.build.f_cpu=25000000L
-lpmsp430f5529_25.build.core=msp430
-lpmsp430f5529_25.build.variant=launchpad_f5529
-lpmsp430f5529_25.upload.maximum_ram_size=1024
+#lpmsp430f5529_25.name=LaunchPad w/ msp430f5529 (25MHz)
+#lpmsp430f5529_25.upload.protocol=tilib
+#lpmsp430f5529_25.upload.maximum_size=131072
+#lpmsp430f5529_25.build.mcu=msp430f5529
+#lpmsp430f5529_25.build.f_cpu=25000000L
+#lpmsp430f5529_25.build.core=msp430
+#lpmsp430f5529_25.build.variant=launchpad_f5529
+#lpmsp430f5529_25.upload.maximum_ram_size=1024
##############################################################
-lpmsp430fr5969.name=LaunchPad w/ msp430fr5969 (V2.0 and higher only!)
-lpmsp430fr5969.upload.protocol=tilib
-lpmsp430fr5969.upload.maximum_size=65536
-lpmsp430fr5969.build.mcu=msp430fr5969
-#lpmsp430fr5969.build.f_cpu=16000000L
-lpmsp430fr5969.build.f_cpu=8000000L
-lpmsp430fr5969.build.core=msp430
-lpmsp430fr5969.build.variant=launchpad_fr5969
-lpmsp430fr5969.upload.maximum_ram_size=1024
+#lpmsp430fr5969.name=LaunchPad w/ msp430fr5969 (V2.0 and higher only!)
+#lpmsp430fr5969.upload.protocol=tilib
+#lpmsp430fr5969.upload.maximum_size=65536
+#lpmsp430fr5969.build.mcu=msp430fr5969
+##lpmsp430fr5969.build.f_cpu=16000000L
+#lpmsp430fr5969.build.f_cpu=8000000L
+#lpmsp430fr5969.build.core=msp430
+#lpmsp430fr5969.build.variant=launchpad_fr5969
+#lpmsp430fr5969.upload.maximum_ram_size=1024
##############################################################
-lpmsp430fr4133.name=LaunchPad w/ msp430fr4133
-lpmsp430fr4133.upload.protocol=tilib
-lpmsp430fr4133.upload.maximum_size=15360
-lpmsp430fr4133.build.mcu=msp430fr4133
-#lpmsp430fr4133.build.f_cpu=16000000L
-lpmsp430fr4133.build.f_cpu=8000000L
-lpmsp430fr4133.build.core=msp430
-lpmsp430fr4133.build.variant=launchpad_fr4133
-lpmsp430fr4133.upload.maximum_ram_size=1024
+#lpmsp430fr4133.name=LaunchPad w/ msp430fr4133
+#lpmsp430fr4133.upload.protocol=tilib
+#lpmsp430fr4133.upload.maximum_size=15360
+#lpmsp430fr4133.build.mcu=msp430fr4133
+##lpmsp430fr4133.build.f_cpu=16000000L
+#lpmsp430fr4133.build.f_cpu=8000000L
+#lpmsp430fr4133.build.core=msp430
+#lpmsp430fr4133.build.variant=launchpad_fr4133
+#lpmsp430fr4133.upload.maximum_ram_size=1024
##############################################################
-lpmsp430fr6989.name=LaunchPad w/ msp430fr6989
-lpmsp430fr6989.upload.protocol=tilib
-lpmsp430fr6989.upload.maximum_size=130048
-lpmsp430fr6989.build.mcu=msp430fr6989
-#lpmsp430fr6989.build.f_cpu=16000000L
-lpmsp430fr6989.build.f_cpu=8000000L
-lpmsp430fr6989.build.core=msp430
-lpmsp430fr6989.build.variant=launchpad_fr6989
-lpmsp430fr6989.upload.maximum_ram_size=1024
+#lpmsp430fr6989.name=LaunchPad w/ msp430fr6989
+#lpmsp430fr6989.upload.protocol=tilib
+#lpmsp430fr6989.upload.maximum_size=130048
+#lpmsp430fr6989.build.mcu=msp430fr6989
+##lpmsp430fr6989.build.f_cpu=16000000L
+#lpmsp430fr6989.build.f_cpu=8000000L
+#lpmsp430fr6989.build.core=msp430
+#lpmsp430fr6989.build.variant=launchpad_fr6989
+#lpmsp430fr6989.upload.maximum_ram_size=1024
##############################################################
diff --git a/hardware/msp430/programmers.txt b/hardware/msp430/programmers.txt
index 1c6e39f..029fcfb 100644
--- a/hardware/msp430/programmers.txt
+++ b/hardware/msp430/programmers.txt
@@ -5,3 +5,6 @@ rf2500.protocol=rf2500
tilib.name=tilib
tilib.protocol=tilib
+
+rom-bsl.name=rom-bsl
+rom-bsl.protocol=rom-bsl