diff --git a/cw4_template/.vscode/tasks.json b/cw4_template/.vscode/tasks.json
index e299f2912332a48b6556860708362aba87d304be..fbd654dfa1271dd2384efd7c501be96745b1e4f4 100644
--- a/cw4_template/.vscode/tasks.json
+++ b/cw4_template/.vscode/tasks.json
@@ -35,7 +35,7 @@
{
"label": "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://192.168.50.238: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",
"presentation":
{
"reveal": "always",
@@ -46,7 +46,7 @@
{
"label": "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.50.238:/var/tmp && ssh -p 120${group} ${userName}@153.19.49.102 'curl http://192.168.49.102: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'",
"presentation":
{
"reveal": "always",
@@ -60,7 +60,7 @@
"options": {
"cwd": "${workspaceFolder}/pca10056/s140/armgcc"
},
- "command": "make all -j$(nproc)",
+ "command": "make all ",
"group": "build"
},
{
@@ -87,7 +87,7 @@
"options": {
"cwd": "${workspaceFolder}/pca10059/s140/armgcc"
},
- "command": "make all -j$(nproc)",
+ "command": "make all ",
"group": {
"kind": "build",
"isDefault": true
@@ -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://192.168.50.238: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",
"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://192.168.50.238: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'",
"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/pca10059/s140/armgcc/Makefile b/cw4_template/pca10059/s140/armgcc/Makefile
index d3fa5bafd5ce0afdc7de83ffc2ad30f207ee9b0e..081e8c82086984897f5b2857426c3849656b5600 100644
--- a/cw4_template/pca10059/s140/armgcc/Makefile
+++ b/cw4_template/pca10059/s140/armgcc/Makefile
@@ -2,7 +2,7 @@ PROJECT_NAME := ble_app_blinky_pca10059_s140
TARGETS := nrf52840_xxaa
OUTPUT_DIRECTORY := _build
-SDK_ROOT := /home/td/Desktop/KODY/sdk_nor/nRF5SDK160098a08e2
+SDK_ROOT :=../../../../../..
PROJ_DIR := ../../..
$(OUTPUT_DIRECTORY)/nrf52840_xxaa.out: \