Updated scripts

lupyuen · lupyuen · commit b8d218346e81 · 2019-09-15T13:18:49.000+08:00
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -17,27 +17,27 @@
         },
         {
             //  Build the Bootloader.
-            "label": "1️⃣ Build bluepill_boot",
+            "label": "1️⃣ Build Bootloader",
             "type": "shell",
             "windows": {
                 "command": "cmd",
                 "args": [
                     "/c",
-                    " newt\\newt.exe build -v bluepill_boot && newt\\newt.exe size -v bluepill_boot && echo ✅ ◾ ️Done! "
+                    " scripts\\stm32l4\\build-boot.cmd && echo ✅ ◾ ️Done! "
                 ]
             },
             "osx": {
                 "command": "bash",
                 "args": [
                     "-c", "-l",
-                    " newt build -v bluepill_boot && newt size -v bluepill_boot && echo ✅ ◾ ️Done! "
+                    " scripts/stm32l4/build-boot.sh && echo ✅ ◾ ️Done! "
                 ],
             },
             "linux": {
                 "command": "bash",
                 "args": [
                     "-c", "-l",
-                    " newt build -v bluepill_boot && newt size -v bluepill_boot && echo ✅ ◾ ️Done! "
+                    " scripts/stm32l4/build-boot.sh && echo ✅ ◾ ️Done! "
                 ],
             },
             "problemMatcher": [ "$gcc" ],
@@ -47,7 +47,7 @@
         },
         {
             //  Build the Application.
-            "label": "2️⃣ Build bluepill_my_sensor",
+            "label": "2️⃣ Build Application",
             "type": "shell",
             "windows": {
                 "command": "cmd",
@@ -95,27 +95,27 @@
         },
         {
             //  Create the Application ROM Image.
-            "label": "3️⃣ Image bluepill_my_sensor",
+            "label": "3️⃣ Image Application",
             "type": "shell",
             "windows": {
                 "command": "cmd",
                 "args": [
                     "/c",
-                    " newt\\newt.exe create-image -v bluepill_my_sensor 1.0.0 && newt\\newt.exe size -v bluepill_my_sensor && echo ✅ ◾ ️Done! "
+                    " scripts\\stm32l4\\image-app.cmd && echo ✅ ◾ ️Done! "
                 ]
             },
             "osx": {
                 "command": "bash",
                 "args": [
                     "-c", "-l",
-                    " newt create-image -v bluepill_my_sensor 1.0.0 && newt size -v bluepill_my_sensor && echo ✅ ◾ ️Done! "
+                    " scripts/stm32l4/image-app.sh && echo ✅ ◾ ️Done! "
                 ],
             },
             "linux": {
                 "command": "bash",
                 "args": [
                     "-c", "-l",
-                    " newt create-image -v bluepill_my_sensor 1.0.0 && newt size -v bluepill_my_sensor && echo ✅ ◾ ️Done! "
+                    " scripts/stm32l4/image-app.sh && echo ✅ ◾ ️Done! "
                 ],
             },
             "problemMatcher": [],
@@ -125,29 +125,29 @@
         },
         {
             //  Flash the Bootloader to Blue Pill.  We use custom scripts instead of "newt load" because "newt" runs in Ubuntu while the ST Link driver runs under Windows.
-            "label": "4️⃣ Load bluepill_boot",
+            "label": "4️⃣ Load Bootloader",
             "type": "shell",
             "windows": {
                 "command": "cmd",
                 "args": [
                     "/c",
-                    " openocd\\bin\\openocd -f scripts/flash-init.ocd -f interface/stlink-v2.cfg -f target/stm32f1x.cfg -f scripts/flash-boot.ocd "
+                    " scripts\\stm32l4\\flash-boot.cmd && echo ✅ ◾ ️Done! "
                 ]
             },
             "osx": {
                 // Previously: " newt load -v bluepill_boot && echo '**** Done!' "
                 "command": "bash",
                 "args": [
                     "-c", "-l",
-                    " openocd/bin/openocd -f scripts/flash-init.ocd -f interface/stlink-v2.cfg -f target/stm32f1x.cfg -f scripts/flash-boot.ocd "
+                    " scripts/stm32l4/flash-boot.sh && echo ✅ ◾ ️Done! "
                 ],
             },
             "linux": {
                 // Previously: " newt load -v bluepill_boot && echo '**** Done!' "
                 "command": "bash",
                 "args": [
                     "-c", "-l",
-                    " openocd/bin/openocd -f scripts/flash-init.ocd -f interface/stlink-v2.cfg -f target/stm32f1x.cfg -f scripts/flash-boot.ocd "
+                    " scripts/stm32l4/flash-boot.sh && echo ✅ ◾ ️Done! "
                 ],
             },
             "problemMatcher": [],
@@ -157,29 +157,29 @@
         },
         {
             //  Flash the Application to Blue Pill.  We use custom scripts instead of "newt load" because "newt" runs in Ubuntu while the ST Link driver runs under Windows.
-            "label": "5️⃣ Load bluepill_my_sensor",
+            "label": "5️⃣ Load Application",
             "type": "shell",
             "windows": {
                 "command": "cmd",
                 "args": [
                     "/c",
-                    " openocd\\bin\\openocd -f scripts/flash-init.ocd -f interface/stlink-v2.cfg -f target/stm32f1x.cfg -f scripts/flash-app.ocd "
+                    " scripts\\stm32l4\\flash-app.cmd && echo ✅ ◾ ️Done! "
                 ]
             },
             "osx": {
                 // Previously: " newt load -v bluepill_my_sensor && echo '**** Done!' "
                 "command": "bash",
                 "args": [
                     "-c", "-l",
-                    " openocd/bin/openocd -f scripts/flash-init.ocd -f interface/stlink-v2.cfg -f target/stm32f1x.cfg -f scripts/flash-app.ocd "
+                    " scripts/stm32l4/flash-app.sh && echo ✅ ◾ ️Done! "
                 ],
             },
             "linux": {
                 // Previously: " newt load -v bluepill_my_sensor && echo '**** Done!' "
                 "command": "bash",
                 "args": [
                     "-c", "-l",
-                    " openocd/bin/openocd -f scripts/flash-init.ocd -f interface/stlink-v2.cfg -f target/stm32f1x.cfg -f scripts/flash-app.ocd "
+                    " scripts/stm32l4/flash-app.sh && echo ✅ ◾ ️Done! "
                 ],
             },
             "problemMatcher": [],
@@ -189,7 +189,7 @@
         },
         {
             //  Generate Rust bindings for C libraries.
-            "label": "⛓ Generate Rust bindings",
+            "label": "⛓ Generate Rust Bindings",
             "type": "shell",
             "command": "bash",
             "args": [
@@ -203,7 +203,7 @@
         },
         {
             //  Build Rust library with macros expanded, output to logs/libmylib-expanded.rs.
-            "label": "👓 Expand Rust macros",
+            "label": "👓 Expand Rust Macros",
             "type": "shell",
             "command": "bash",
             "args": [
diff --git a/scripts/stm32l4/flash-app.cmd b/scripts/stm32l4/flash-app.cmd
@@ -0,0 +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
diff --git a/scripts/stm32l4/flash-app.sh b/scripts/stm32l4/flash-app.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-#  Flash Mynewt Bootloader
+#  Flash Mynewt Bootloader on macOS and Linux
 
 set -e  #  Exit when any command fails.
 set -x  #  Echo all commands.
diff --git a/scripts/stm32l4/flash-boot.cmd b/scripts/stm32l4/flash-boot.cmd
@@ -0,0 +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
diff --git a/scripts/stm32l4/image-app.cmd b/scripts/stm32l4/image-app.cmd
@@ -0,0 +1,3 @@
+::  Create Mynewt Image for Windows
+
+newt\newt.exe create-image -v stm32l4_my_sensor 1.0.0 && newt size -v stm32l4_my_sensor
diff --git a/scripts/stm32l4/image-app.sh b/scripts/stm32l4/image-app.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-#  Create Mynewt Image
+#  Create Mynewt Image for macOS and Linux
 
 set -e  #  Exit when any command fails.
 set -x  #  Echo all commands.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+:: Flash Mynewt application on Windows`
	`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`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+:: Flash Mynewt bootloader on Windows`
	`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`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+:: Create Mynewt Image for Windows`
	`2`	`+`
	`3`	`+newt\newt.exe create-image -v stm32l4_my_sensor 1.0.0 && newt size -v stm32l4_my_sensor`