From 7947747b15e16adc5954e9a5649270a1f62175fb Mon Sep 17 00:00:00 2001
From: Marek Mioduszewski <marek.mioduszewski@pg.edu.pl>
Date: Mon, 6 Jul 2020 20:15:41 +0200
Subject: [PATCH] tasks update win
---
cw1_template/.vscode/tasks.json | 14 +++++++-------
cw2_template/.vscode/tasks.json | 14 +++++++-------
cw3_template/.vscode/tasks.json | 14 +++++++-------
cw4_template/.vscode/tasks.json | 14 +++++++-------
4 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/cw1_template/.vscode/tasks.json b/cw1_template/.vscode/tasks.json
index 665671e..4c0f50d 100644
--- a/cw1_template/.vscode/tasks.json
+++ b/cw1_template/.vscode/tasks.json
@@ -6,7 +6,7 @@
"env": {
"nrf52SDKPath": "${workspaceFolder}/../../../",
"userName": "root",
- "group": "01"
+ "group": "02"
}
},
"tasks": [
@@ -125,7 +125,7 @@
{
"label": "windows: BLEtest",
"type": "shell",
- "command": "ssh -p 120%group% %userName%@153.19.49.102 -t 'hciconfig hci0 down && hciconfig hci0 up && python3.7 /root/pmk/test_bluepy.py'",
+ "command": "ssh -p 120%group% %userName%@153.19.49.102 -t && ssh -p 120%group% %userName%@153.19.49.102 -t python3.7 /root/pmk/test_bluepy.py",
"presentation":
{
"reveal": "always",
@@ -136,7 +136,7 @@
{
"label": "windows: readUSB",
"type": "shell",
- "command": "ssh -p 120%group% %userName%@153.19.49.102 -t 'minicom -D /dev/ttyACM0'",
+ "command": "ssh -p 120%group% %userName%@153.19.49.102 -t minicom -D /dev/ttyACM0",
"presentation":
{
"reveal": "always",
@@ -147,7 +147,7 @@
{
"label": "windows: flashNordic",
"type": "shell",
- "command": "scp -P 120%group% pca10059/s140/armgcc/_build/nrf52840_xxaa.hex %userName%@153.19.49.102:/var/tmp && ssh -p 120%group% %userName%@153.19.49.102 curl http://192.168.49.54:3001/resetNRF52v2/%group% && nrfutil pkg generate --hw-version 52 --sd-req 0x00 --debug-mode --application /var/tmp/*.hex /var/tmp/dfu.zip && nrfutil dfu usb_serial -pkg /var/tmp/dfu.zip -p /dev/ttyACM0 -b 115200 && rm /var/tmp/*.hex",
+ "command": "scp -P 120%group% pca10059/s140/armgcc/_build/nrf52840_xxaa.hex %userName%@153.19.49.102:/var/tmp && ssh -p 120%group% %userName%@153.19.49.102 curl http://153.19.49.102:3001/resetNRF52v2/%group% && ssh -p 120%group% %userName%@153.19.49.102 nrfutil pkg generate --hw-version 52 --sd-req 0x00 --debug-mode --application /var/tmp/nrf52840_xxaa.hex /var/tmp/dfu.zip && ssh -p 120%group% %userName%@153.19.49.102 nrfutil dfu usb-serial -pkg /var/tmp/dfu.zip -p /dev/ttyACM0 -b 115200 && ssh -p 120%group% %userName%@153.19.49.102 rm /var/tmp/*.hex",
"presentation":
{
"reveal": "always",
@@ -158,7 +158,7 @@
{
"label": "windows: flashNordicSD",
"type": "shell",
- "command": "scp -P 120%group% pca10059/s140/armgcc/_build/nrf52840_xxaa.hex %nrf52SDKPath%/components/softdevice/s140/hex/s140_nrf52_7.0.1_softdevice.hex %userName%@153.19.49.102:/var/tmp && ssh -p 120%group% %userName%@153.19.49.102 'curl http://192.168.49.54:3001/resetNRF52v2/%group% && nrfutil pkg generate --hw-version 52 --sd-req 0x00 --sd-id 0xCA --softdevice /var/tmp/s140_nrf52_7.0.1_softdevice.hex --debug-mode --application /var/tmp/nrf52840_xxaa.hex /var/tmp/dfu.zip && nrfutil dfu usb_serial -pkg /var/tmp/dfu.zip -p /dev/ttyACM0 -b 115200 && rm /var/tmp/*.hex'",
+ "command": "scp -P 120%group% pca10059/s140/armgcc/_build/nrf52840_xxaa.hex %nrf52SDKPath%/components/softdevice/s140/hex/s140_nrf52_7.0.1_softdevice.hex %userName%@153.19.49.102:/var/tmp && ssh -p 120%group% %userName%@153.19.49.102 curl http://153.19.49.102:3001/resetNRF52v2/%group% && ssh -p 120%group% %userName%@153.19.49.102 nrfutil pkg generate --hw-version 52 --sd-req 0x00 --sd-id 0xCA --softdevice /var/tmp/s140_nrf52_7.0.1_softdevice.hex --debug-mode --application /var/tmp/nrf52840_xxaa.hex /var/tmp/dfu.zip && ssh -p 120%group% %userName%@153.19.49.102 nrfutil dfu usb-serial -pkg /var/tmp/dfu.zip -p /dev/ttyACM0 -b 115200 && ssh -p 120%group% %userName%@153.19.49.102 rm /var/tmp/*.hex",
"presentation":
{
"reveal": "always",
@@ -172,7 +172,7 @@
"options": {
"cwd": "${workspaceFolder}/pca10056/s140/armgcc"
},
- "command": "make all -j$(nproc)",
+ "command": "make all",
"group": "build"
},
{
@@ -199,7 +199,7 @@
"options": {
"cwd": "${workspaceFolder}/pca10059/s140/armgcc"
},
- "command": "make all -j$(nproc)",
+ "command": "make all",
"group": {
"kind": "build",
"isDefault": true
diff --git a/cw2_template/.vscode/tasks.json b/cw2_template/.vscode/tasks.json
index 665671e..4c0f50d 100644
--- a/cw2_template/.vscode/tasks.json
+++ b/cw2_template/.vscode/tasks.json
@@ -6,7 +6,7 @@
"env": {
"nrf52SDKPath": "${workspaceFolder}/../../../",
"userName": "root",
- "group": "01"
+ "group": "02"
}
},
"tasks": [
@@ -125,7 +125,7 @@
{
"label": "windows: BLEtest",
"type": "shell",
- "command": "ssh -p 120%group% %userName%@153.19.49.102 -t 'hciconfig hci0 down && hciconfig hci0 up && python3.7 /root/pmk/test_bluepy.py'",
+ "command": "ssh -p 120%group% %userName%@153.19.49.102 -t && ssh -p 120%group% %userName%@153.19.49.102 -t python3.7 /root/pmk/test_bluepy.py",
"presentation":
{
"reveal": "always",
@@ -136,7 +136,7 @@
{
"label": "windows: readUSB",
"type": "shell",
- "command": "ssh -p 120%group% %userName%@153.19.49.102 -t 'minicom -D /dev/ttyACM0'",
+ "command": "ssh -p 120%group% %userName%@153.19.49.102 -t minicom -D /dev/ttyACM0",
"presentation":
{
"reveal": "always",
@@ -147,7 +147,7 @@
{
"label": "windows: flashNordic",
"type": "shell",
- "command": "scp -P 120%group% pca10059/s140/armgcc/_build/nrf52840_xxaa.hex %userName%@153.19.49.102:/var/tmp && ssh -p 120%group% %userName%@153.19.49.102 curl http://192.168.49.54:3001/resetNRF52v2/%group% && nrfutil pkg generate --hw-version 52 --sd-req 0x00 --debug-mode --application /var/tmp/*.hex /var/tmp/dfu.zip && nrfutil dfu usb_serial -pkg /var/tmp/dfu.zip -p /dev/ttyACM0 -b 115200 && rm /var/tmp/*.hex",
+ "command": "scp -P 120%group% pca10059/s140/armgcc/_build/nrf52840_xxaa.hex %userName%@153.19.49.102:/var/tmp && ssh -p 120%group% %userName%@153.19.49.102 curl http://153.19.49.102:3001/resetNRF52v2/%group% && ssh -p 120%group% %userName%@153.19.49.102 nrfutil pkg generate --hw-version 52 --sd-req 0x00 --debug-mode --application /var/tmp/nrf52840_xxaa.hex /var/tmp/dfu.zip && ssh -p 120%group% %userName%@153.19.49.102 nrfutil dfu usb-serial -pkg /var/tmp/dfu.zip -p /dev/ttyACM0 -b 115200 && ssh -p 120%group% %userName%@153.19.49.102 rm /var/tmp/*.hex",
"presentation":
{
"reveal": "always",
@@ -158,7 +158,7 @@
{
"label": "windows: flashNordicSD",
"type": "shell",
- "command": "scp -P 120%group% pca10059/s140/armgcc/_build/nrf52840_xxaa.hex %nrf52SDKPath%/components/softdevice/s140/hex/s140_nrf52_7.0.1_softdevice.hex %userName%@153.19.49.102:/var/tmp && ssh -p 120%group% %userName%@153.19.49.102 'curl http://192.168.49.54:3001/resetNRF52v2/%group% && nrfutil pkg generate --hw-version 52 --sd-req 0x00 --sd-id 0xCA --softdevice /var/tmp/s140_nrf52_7.0.1_softdevice.hex --debug-mode --application /var/tmp/nrf52840_xxaa.hex /var/tmp/dfu.zip && nrfutil dfu usb_serial -pkg /var/tmp/dfu.zip -p /dev/ttyACM0 -b 115200 && rm /var/tmp/*.hex'",
+ "command": "scp -P 120%group% pca10059/s140/armgcc/_build/nrf52840_xxaa.hex %nrf52SDKPath%/components/softdevice/s140/hex/s140_nrf52_7.0.1_softdevice.hex %userName%@153.19.49.102:/var/tmp && ssh -p 120%group% %userName%@153.19.49.102 curl http://153.19.49.102:3001/resetNRF52v2/%group% && ssh -p 120%group% %userName%@153.19.49.102 nrfutil pkg generate --hw-version 52 --sd-req 0x00 --sd-id 0xCA --softdevice /var/tmp/s140_nrf52_7.0.1_softdevice.hex --debug-mode --application /var/tmp/nrf52840_xxaa.hex /var/tmp/dfu.zip && ssh -p 120%group% %userName%@153.19.49.102 nrfutil dfu usb-serial -pkg /var/tmp/dfu.zip -p /dev/ttyACM0 -b 115200 && ssh -p 120%group% %userName%@153.19.49.102 rm /var/tmp/*.hex",
"presentation":
{
"reveal": "always",
@@ -172,7 +172,7 @@
"options": {
"cwd": "${workspaceFolder}/pca10056/s140/armgcc"
},
- "command": "make all -j$(nproc)",
+ "command": "make all",
"group": "build"
},
{
@@ -199,7 +199,7 @@
"options": {
"cwd": "${workspaceFolder}/pca10059/s140/armgcc"
},
- "command": "make all -j$(nproc)",
+ "command": "make all",
"group": {
"kind": "build",
"isDefault": true
diff --git a/cw3_template/.vscode/tasks.json b/cw3_template/.vscode/tasks.json
index 665671e..4c0f50d 100644
--- a/cw3_template/.vscode/tasks.json
+++ b/cw3_template/.vscode/tasks.json
@@ -6,7 +6,7 @@
"env": {
"nrf52SDKPath": "${workspaceFolder}/../../../",
"userName": "root",
- "group": "01"
+ "group": "02"
}
},
"tasks": [
@@ -125,7 +125,7 @@
{
"label": "windows: BLEtest",
"type": "shell",
- "command": "ssh -p 120%group% %userName%@153.19.49.102 -t 'hciconfig hci0 down && hciconfig hci0 up && python3.7 /root/pmk/test_bluepy.py'",
+ "command": "ssh -p 120%group% %userName%@153.19.49.102 -t && ssh -p 120%group% %userName%@153.19.49.102 -t python3.7 /root/pmk/test_bluepy.py",
"presentation":
{
"reveal": "always",
@@ -136,7 +136,7 @@
{
"label": "windows: readUSB",
"type": "shell",
- "command": "ssh -p 120%group% %userName%@153.19.49.102 -t 'minicom -D /dev/ttyACM0'",
+ "command": "ssh -p 120%group% %userName%@153.19.49.102 -t minicom -D /dev/ttyACM0",
"presentation":
{
"reveal": "always",
@@ -147,7 +147,7 @@
{
"label": "windows: flashNordic",
"type": "shell",
- "command": "scp -P 120%group% pca10059/s140/armgcc/_build/nrf52840_xxaa.hex %userName%@153.19.49.102:/var/tmp && ssh -p 120%group% %userName%@153.19.49.102 curl http://192.168.49.54:3001/resetNRF52v2/%group% && nrfutil pkg generate --hw-version 52 --sd-req 0x00 --debug-mode --application /var/tmp/*.hex /var/tmp/dfu.zip && nrfutil dfu usb_serial -pkg /var/tmp/dfu.zip -p /dev/ttyACM0 -b 115200 && rm /var/tmp/*.hex",
+ "command": "scp -P 120%group% pca10059/s140/armgcc/_build/nrf52840_xxaa.hex %userName%@153.19.49.102:/var/tmp && ssh -p 120%group% %userName%@153.19.49.102 curl http://153.19.49.102:3001/resetNRF52v2/%group% && ssh -p 120%group% %userName%@153.19.49.102 nrfutil pkg generate --hw-version 52 --sd-req 0x00 --debug-mode --application /var/tmp/nrf52840_xxaa.hex /var/tmp/dfu.zip && ssh -p 120%group% %userName%@153.19.49.102 nrfutil dfu usb-serial -pkg /var/tmp/dfu.zip -p /dev/ttyACM0 -b 115200 && ssh -p 120%group% %userName%@153.19.49.102 rm /var/tmp/*.hex",
"presentation":
{
"reveal": "always",
@@ -158,7 +158,7 @@
{
"label": "windows: flashNordicSD",
"type": "shell",
- "command": "scp -P 120%group% pca10059/s140/armgcc/_build/nrf52840_xxaa.hex %nrf52SDKPath%/components/softdevice/s140/hex/s140_nrf52_7.0.1_softdevice.hex %userName%@153.19.49.102:/var/tmp && ssh -p 120%group% %userName%@153.19.49.102 'curl http://192.168.49.54:3001/resetNRF52v2/%group% && nrfutil pkg generate --hw-version 52 --sd-req 0x00 --sd-id 0xCA --softdevice /var/tmp/s140_nrf52_7.0.1_softdevice.hex --debug-mode --application /var/tmp/nrf52840_xxaa.hex /var/tmp/dfu.zip && nrfutil dfu usb_serial -pkg /var/tmp/dfu.zip -p /dev/ttyACM0 -b 115200 && rm /var/tmp/*.hex'",
+ "command": "scp -P 120%group% pca10059/s140/armgcc/_build/nrf52840_xxaa.hex %nrf52SDKPath%/components/softdevice/s140/hex/s140_nrf52_7.0.1_softdevice.hex %userName%@153.19.49.102:/var/tmp && ssh -p 120%group% %userName%@153.19.49.102 curl http://153.19.49.102:3001/resetNRF52v2/%group% && ssh -p 120%group% %userName%@153.19.49.102 nrfutil pkg generate --hw-version 52 --sd-req 0x00 --sd-id 0xCA --softdevice /var/tmp/s140_nrf52_7.0.1_softdevice.hex --debug-mode --application /var/tmp/nrf52840_xxaa.hex /var/tmp/dfu.zip && ssh -p 120%group% %userName%@153.19.49.102 nrfutil dfu usb-serial -pkg /var/tmp/dfu.zip -p /dev/ttyACM0 -b 115200 && ssh -p 120%group% %userName%@153.19.49.102 rm /var/tmp/*.hex",
"presentation":
{
"reveal": "always",
@@ -172,7 +172,7 @@
"options": {
"cwd": "${workspaceFolder}/pca10056/s140/armgcc"
},
- "command": "make all -j$(nproc)",
+ "command": "make all",
"group": "build"
},
{
@@ -199,7 +199,7 @@
"options": {
"cwd": "${workspaceFolder}/pca10059/s140/armgcc"
},
- "command": "make all -j$(nproc)",
+ "command": "make all",
"group": {
"kind": "build",
"isDefault": true
diff --git a/cw4_template/.vscode/tasks.json b/cw4_template/.vscode/tasks.json
index 665671e..4c0f50d 100644
--- a/cw4_template/.vscode/tasks.json
+++ b/cw4_template/.vscode/tasks.json
@@ -6,7 +6,7 @@
"env": {
"nrf52SDKPath": "${workspaceFolder}/../../../",
"userName": "root",
- "group": "01"
+ "group": "02"
}
},
"tasks": [
@@ -125,7 +125,7 @@
{
"label": "windows: BLEtest",
"type": "shell",
- "command": "ssh -p 120%group% %userName%@153.19.49.102 -t 'hciconfig hci0 down && hciconfig hci0 up && python3.7 /root/pmk/test_bluepy.py'",
+ "command": "ssh -p 120%group% %userName%@153.19.49.102 -t && ssh -p 120%group% %userName%@153.19.49.102 -t python3.7 /root/pmk/test_bluepy.py",
"presentation":
{
"reveal": "always",
@@ -136,7 +136,7 @@
{
"label": "windows: readUSB",
"type": "shell",
- "command": "ssh -p 120%group% %userName%@153.19.49.102 -t 'minicom -D /dev/ttyACM0'",
+ "command": "ssh -p 120%group% %userName%@153.19.49.102 -t minicom -D /dev/ttyACM0",
"presentation":
{
"reveal": "always",
@@ -147,7 +147,7 @@
{
"label": "windows: flashNordic",
"type": "shell",
- "command": "scp -P 120%group% pca10059/s140/armgcc/_build/nrf52840_xxaa.hex %userName%@153.19.49.102:/var/tmp && ssh -p 120%group% %userName%@153.19.49.102 curl http://192.168.49.54:3001/resetNRF52v2/%group% && nrfutil pkg generate --hw-version 52 --sd-req 0x00 --debug-mode --application /var/tmp/*.hex /var/tmp/dfu.zip && nrfutil dfu usb_serial -pkg /var/tmp/dfu.zip -p /dev/ttyACM0 -b 115200 && rm /var/tmp/*.hex",
+ "command": "scp -P 120%group% pca10059/s140/armgcc/_build/nrf52840_xxaa.hex %userName%@153.19.49.102:/var/tmp && ssh -p 120%group% %userName%@153.19.49.102 curl http://153.19.49.102:3001/resetNRF52v2/%group% && ssh -p 120%group% %userName%@153.19.49.102 nrfutil pkg generate --hw-version 52 --sd-req 0x00 --debug-mode --application /var/tmp/nrf52840_xxaa.hex /var/tmp/dfu.zip && ssh -p 120%group% %userName%@153.19.49.102 nrfutil dfu usb-serial -pkg /var/tmp/dfu.zip -p /dev/ttyACM0 -b 115200 && ssh -p 120%group% %userName%@153.19.49.102 rm /var/tmp/*.hex",
"presentation":
{
"reveal": "always",
@@ -158,7 +158,7 @@
{
"label": "windows: flashNordicSD",
"type": "shell",
- "command": "scp -P 120%group% pca10059/s140/armgcc/_build/nrf52840_xxaa.hex %nrf52SDKPath%/components/softdevice/s140/hex/s140_nrf52_7.0.1_softdevice.hex %userName%@153.19.49.102:/var/tmp && ssh -p 120%group% %userName%@153.19.49.102 'curl http://192.168.49.54:3001/resetNRF52v2/%group% && nrfutil pkg generate --hw-version 52 --sd-req 0x00 --sd-id 0xCA --softdevice /var/tmp/s140_nrf52_7.0.1_softdevice.hex --debug-mode --application /var/tmp/nrf52840_xxaa.hex /var/tmp/dfu.zip && nrfutil dfu usb_serial -pkg /var/tmp/dfu.zip -p /dev/ttyACM0 -b 115200 && rm /var/tmp/*.hex'",
+ "command": "scp -P 120%group% pca10059/s140/armgcc/_build/nrf52840_xxaa.hex %nrf52SDKPath%/components/softdevice/s140/hex/s140_nrf52_7.0.1_softdevice.hex %userName%@153.19.49.102:/var/tmp && ssh -p 120%group% %userName%@153.19.49.102 curl http://153.19.49.102:3001/resetNRF52v2/%group% && ssh -p 120%group% %userName%@153.19.49.102 nrfutil pkg generate --hw-version 52 --sd-req 0x00 --sd-id 0xCA --softdevice /var/tmp/s140_nrf52_7.0.1_softdevice.hex --debug-mode --application /var/tmp/nrf52840_xxaa.hex /var/tmp/dfu.zip && ssh -p 120%group% %userName%@153.19.49.102 nrfutil dfu usb-serial -pkg /var/tmp/dfu.zip -p /dev/ttyACM0 -b 115200 && ssh -p 120%group% %userName%@153.19.49.102 rm /var/tmp/*.hex",
"presentation":
{
"reveal": "always",
@@ -172,7 +172,7 @@
"options": {
"cwd": "${workspaceFolder}/pca10056/s140/armgcc"
},
- "command": "make all -j$(nproc)",
+ "command": "make all",
"group": "build"
},
{
@@ -199,7 +199,7 @@
"options": {
"cwd": "${workspaceFolder}/pca10059/s140/armgcc"
},
- "command": "make all -j$(nproc)",
+ "command": "make all",
"group": {
"kind": "build",
"isDefault": true
--
GitLab