Updated flash scripts

lupyuen · lupyuen · commit a2c7d3f0c651 · 2019-09-15T13:28:23.000+08:00
diff --git a/logs/libapp.json b/logs/libapp.json
diff --git a/scripts/stm32l4/flash-app.cmd b/scripts/stm32l4/flash-app.cmd
@@ -1,3 +1,3 @@
 ::  Flash Mynewt application on Windows
 
-openocd\bin\openocd.exe -f scripts/stm32l4/flash-init.ocd -f interface/stlink-v2-1.cfg -c "transport select hla_swd" -f target/stm32l4x.cfg -f scripts/stm32l4/flash-app.ocd
+openocd\bin\openocd.exe -f scripts/stm32l4/flash-init.ocd -f interface/stlink.cfg -c "transport select hla_swd" -f target/stm32l4x.cfg -f scripts/stm32l4/flash-app.ocd
diff --git a/scripts/stm32l4/flash-app.sh b/scripts/stm32l4/flash-app.sh
@@ -4,4 +4,4 @@
 set -e  #  Exit when any command fails.
 set -x  #  Echo all commands.
 
-openocd/bin/openocd -f scripts/stm32l4/flash-init.ocd -f interface/stlink-v2-1.cfg -c "transport select hla_swd" -f target/stm32l4x.cfg -f scripts/stm32l4/flash-app.ocd
+openocd/bin/openocd -f scripts/stm32l4/flash-init.ocd -f interface/stlink.cfg -c "transport select hla_swd" -f target/stm32l4x.cfg -f scripts/stm32l4/flash-app.ocd
diff --git a/scripts/stm32l4/flash-boot.cmd b/scripts/stm32l4/flash-boot.cmd
@@ -1,3 +1,3 @@
 ::  Flash Mynewt bootloader on Windows
 
-openocd\bin\openocd.exe -f scripts/stm32l4/flash-init.ocd -f interface/stlink-v2-1.cfg -c "transport select hla_swd" -f target/stm32l4x.cfg -f scripts/stm32l4/flash-boot.ocd
+openocd\bin\openocd.exe -f scripts/stm32l4/flash-init.ocd -f interface/stlink.cfg -c "transport select hla_swd" -f target/stm32l4x.cfg -f scripts/stm32l4/flash-boot.ocd
diff --git a/scripts/stm32l4/flash-boot.sh b/scripts/stm32l4/flash-boot.sh
@@ -4,4 +4,4 @@
 set -e  #  Exit when any command fails.
 set -x  #  Echo all commands.
 
-openocd/bin/openocd -f scripts/stm32l4/flash-init.ocd -f interface/stlink-v2-1.cfg -c "transport select hla_swd" -f target/stm32l4x.cfg -f scripts/stm32l4/flash-boot.ocd
+openocd/bin/openocd -f scripts/stm32l4/flash-init.ocd -f interface/stlink.cfg -c "transport select hla_swd" -f target/stm32l4x.cfg -f scripts/stm32l4/flash-boot.ocd
diff --git a/scripts/stm32l4/image-app.cmd b/scripts/stm32l4/image-app.cmd
@@ -1,3 +1,5 @@
 ::  Create Mynewt Image for Windows
 
-newt\newt.exe create-image -v stm32l4_my_sensor 1.0.0 && newt size -v stm32l4_my_sensor
+newt\newt.exe create-image -v stm32l4_my_sensor 1.0.0
+
+newt\newt.exe size -v stm32l4_my_sensor
diff --git a/scripts/stm32l4/image-app.sh b/scripts/stm32l4/image-app.sh
@@ -4,4 +4,6 @@
 set -e  #  Exit when any command fails.
 set -x  #  Echo all commands.
 
-newt create-image -v stm32l4_my_sensor 1.0.0 && newt size -v stm32l4_my_sensor
+newt create-image -v stm32l4_my_sensor 1.0.0
+
+newt size -v stm32l4_my_sensor

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`:: Flash Mynewt application on Windows`
`2`	`2`
`3`		`-openocd\bin\openocd.exe -f scripts/stm32l4/flash-init.ocd -f interface/stlink-v2-1.cfg -c "transport select hla_swd" -f target/stm32l4x.cfg -f scripts/stm32l4/flash-app.ocd`
	`3`	`+openocd\bin\openocd.exe -f scripts/stm32l4/flash-init.ocd -f interface/stlink.cfg -c "transport select hla_swd" -f target/stm32l4x.cfg -f scripts/stm32l4/flash-app.ocd`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`:: Flash Mynewt bootloader on Windows`
`2`	`2`
`3`		`-openocd\bin\openocd.exe -f scripts/stm32l4/flash-init.ocd -f interface/stlink-v2-1.cfg -c "transport select hla_swd" -f target/stm32l4x.cfg -f scripts/stm32l4/flash-boot.ocd`
	`3`	`+openocd\bin\openocd.exe -f scripts/stm32l4/flash-init.ocd -f interface/stlink.cfg -c "transport select hla_swd" -f target/stm32l4x.cfg -f scripts/stm32l4/flash-boot.ocd`