diff --git a/cw1_template/.vscode/tasks.json b/cw1_template/.vscode/tasks.json
index f14c9a9c50c5d0a08ad12c8cad3f1561588105e9..847cb3890813a2de3322e8608bac1b77a339280f 100644
--- a/cw1_template/.vscode/tasks.json
+++ b/cw1_template/.vscode/tasks.json
@@ -4,7 +4,7 @@
"version": "2.0.0",
"tasks": [
{
- "label": "BLEtest",
+ "label": "Linux: BLEtest",
"type": "shell",
"command": "ssh -p 120${config:group} ${config:userName}@153.19.49.102 -t 'hciconfig hci0 down && hciconfig hci0 up && python3.7 /root/pmk/test_bluepy.py'",
"presentation":
@@ -15,7 +15,7 @@
}
},
{
- "label": "readUSB",
+ "label": "Linux: readUSB",
"type": "shell",
"command": "ssh -p 120${config:group} ${config:userName}@153.19.49.102 -t 'minicom -D /dev/ttyACM0'",
"presentation":
@@ -26,7 +26,7 @@
}
},
{
- "label": "flashNordic",
+ "label": "Linux: flashNordic",
"type": "shell",
"command": "scp -P 120${config:group} pca10059/s140/armgcc/_build/nrf52840_xxaa.hex ${config:userName}@153.19.49.102:/var/tmp && ssh -p 120${config:group} ${config:userName}@153.19.49.102 'curl http://153.19.49.102:3001/resetNRF52v2/${config:group} && sleep 3 && nrfutil pkg generate --hw-version 52 --sd-req 0x00 --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":
@@ -37,7 +37,7 @@
}
},
{
- "label": "flashNordicSD",
+ "label": "Linux: flashNordicSD",
"type": "shell",
"command": "scp -P 120${config:group} pca10059/s140/armgcc/_build/nrf52840_xxaa.hex ${config:nrf52SDKPath}/components/softdevice/s140/hex/s140_nrf52_7.0.1_softdevice.hex ${config:userName}@153.19.49.102:/var/tmp && ssh -p 120${config:group} ${config:userName}@153.19.49.102 'curl http://153.19.49.102:3001/resetNRF52v2/${config: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":
@@ -48,7 +48,7 @@
}
},
{
- "label": "make (pca10056)",
+ "label": "Linux: make (pca10056)",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}/pca10056/s140/armgcc"
@@ -57,7 +57,7 @@
"group": "build"
},
{
- "label": "make clean (pca10056)",
+ "label": "Linux: make clean (pca10056)",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}/pca10056/s140/armgcc"
@@ -66,7 +66,7 @@
"group": "build"
},
{
- "label": "make flash (pca10056)",
+ "label": "Linux: make flash (pca10056)",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}/pca10056/s140/armgcc"
@@ -75,7 +75,7 @@
"group": "build"
},
{
- "label": "make (pca10059)",
+ "label": "Linux: make (pca10059)",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}/pca10059/s140/armgcc"
@@ -88,7 +88,7 @@
"problemMatcher": []
},
{
- "label": "make clean (pca10059)",
+ "label": "Linux: make clean (pca10059)",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}/pca10059/s140/armgcc"
@@ -97,7 +97,7 @@
"group": "build"
},
{
- "label": "make flash (pca10059)",
+ "label": "Linux: make flash (pca10059)",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}/pca10059/s140/armgcc"
diff --git a/cw1_template/pca10059/s140/armgcc/_build/nrf52840_xxaa.bin b/cw1_template/pca10059/s140/armgcc/_build/nrf52840_xxaa.bin
deleted file mode 100755
index 59fceed627f9bad586a6cbe1a414ebfe84eb254d..0000000000000000000000000000000000000000
Binary files a/cw1_template/pca10059/s140/armgcc/_build/nrf52840_xxaa.bin and /dev/null differ
diff --git a/cw1_template/pca10059/s140/armgcc/_build/nrf52840_xxaa.in b/cw1_template/pca10059/s140/armgcc/_build/nrf52840_xxaa.in
deleted file mode 100644
index 913ec2fdc902ac69cb3f05005ace9ad66ff8565c..0000000000000000000000000000000000000000
--- a/cw1_template/pca10059/s140/armgcc/_build/nrf52840_xxaa.in
+++ /dev/null
@@ -1 +0,0 @@
-_build/nrf52840_xxaa/gcc_startup_nrf52840.S.o _build/nrf52840_xxaa/nrf_log_backend_rtt.c.o _build/nrf52840_xxaa/nrf_log_backend_serial.c.o _build/nrf52840_xxaa/nrf_log_backend_uart.c.o _build/nrf52840_xxaa/nrf_log_default_backends.c.o _build/nrf52840_xxaa/nrf_log_frontend.c.o _build/nrf52840_xxaa/nrf_log_str_formatter.c.o _build/nrf52840_xxaa/boards.c.o _build/nrf52840_xxaa/app_button.c.o _build/nrf52840_xxaa/app_error.c.o _build/nrf52840_xxaa/app_error_handler_gcc.c.o _build/nrf52840_xxaa/app_error_weak.c.o _build/nrf52840_xxaa/app_fifo.c.o _build/nrf52840_xxaa/app_scheduler.c.o _build/nrf52840_xxaa/app_timer2.c.o _build/nrf52840_xxaa/app_uart_fifo.c.o _build/nrf52840_xxaa/app_usbd.c.o _build/nrf52840_xxaa/app_usbd_cdc_acm.c.o _build/nrf52840_xxaa/app_usbd_core.c.o _build/nrf52840_xxaa/app_usbd_serial_num.c.o _build/nrf52840_xxaa/app_usbd_string_desc.c.o _build/nrf52840_xxaa/app_util_platform.c.o _build/nrf52840_xxaa/drv_rtc.c.o _build/nrf52840_xxaa/fnmatch.c.o _build/nrf52840_xxaa/hardfault_handler_gcc.c.o _build/nrf52840_xxaa/hardfault_implementation.c.o _build/nrf52840_xxaa/nrf_assert.c.o _build/nrf52840_xxaa/nrf_atfifo.c.o _build/nrf52840_xxaa/nrf_atomic.c.o _build/nrf52840_xxaa/nrf_balloc.c.o _build/nrf52840_xxaa/nrf_cli.c.o _build/nrf52840_xxaa/nrf_cli_uart.c.o _build/nrf52840_xxaa/nrf_fprintf.c.o _build/nrf52840_xxaa/nrf_fprintf_format.c.o _build/nrf52840_xxaa/nrf_memobj.c.o _build/nrf52840_xxaa/nrf_pwr_mgmt.c.o _build/nrf52840_xxaa/nrf_queue.c.o _build/nrf52840_xxaa/nrf_ringbuf.c.o _build/nrf52840_xxaa/nrf_section_iter.c.o _build/nrf52840_xxaa/nrf_sortlist.c.o _build/nrf52840_xxaa/nrf_strerror.c.o _build/nrf52840_xxaa/nrf_drv_clock.c.o _build/nrf52840_xxaa/nrf_drv_power.c.o _build/nrf52840_xxaa/nrf_drv_uart.c.o _build/nrf52840_xxaa/nrf_nvic.c.o _build/nrf52840_xxaa/nrf_soc.c.o _build/nrf52840_xxaa/nrfx_atomic.c.o _build/nrf52840_xxaa/nrfx_clock.c.o _build/nrf52840_xxaa/nrfx_gpiote.c.o _build/nrf52840_xxaa/nrfx_power.c.o _build/nrf52840_xxaa/nrfx_prs.c.o _build/nrf52840_xxaa/nrfx_systick.c.o _build/nrf52840_xxaa/nrfx_uart.c.o _build/nrf52840_xxaa/nrfx_uarte.c.o _build/nrf52840_xxaa/nrfx_usbd.c.o _build/nrf52840_xxaa/bsp.c.o _build/nrf52840_xxaa/bsp_cli.c.o _build/nrf52840_xxaa/main.c.o _build/nrf52840_xxaa/usb.c.o _build/nrf52840_xxaa/SEGGER_RTT.c.o _build/nrf52840_xxaa/SEGGER_RTT_Syscalls_GCC.c.o _build/nrf52840_xxaa/SEGGER_RTT_printf.c.o _build/nrf52840_xxaa/system_nrf52840.c.o _build/nrf52840_xxaa/utf.c.o -lc -lnosys -lm
diff --git a/cw2_template/.vscode/tasks.json b/cw2_template/.vscode/tasks.json
index f14c9a9c50c5d0a08ad12c8cad3f1561588105e9..847cb3890813a2de3322e8608bac1b77a339280f 100644
--- a/cw2_template/.vscode/tasks.json
+++ b/cw2_template/.vscode/tasks.json
@@ -4,7 +4,7 @@
"version": "2.0.0",
"tasks": [
{
- "label": "BLEtest",
+ "label": "Linux: BLEtest",
"type": "shell",
"command": "ssh -p 120${config:group} ${config:userName}@153.19.49.102 -t 'hciconfig hci0 down && hciconfig hci0 up && python3.7 /root/pmk/test_bluepy.py'",
"presentation":
@@ -15,7 +15,7 @@
}
},
{
- "label": "readUSB",
+ "label": "Linux: readUSB",
"type": "shell",
"command": "ssh -p 120${config:group} ${config:userName}@153.19.49.102 -t 'minicom -D /dev/ttyACM0'",
"presentation":
@@ -26,7 +26,7 @@
}
},
{
- "label": "flashNordic",
+ "label": "Linux: flashNordic",
"type": "shell",
"command": "scp -P 120${config:group} pca10059/s140/armgcc/_build/nrf52840_xxaa.hex ${config:userName}@153.19.49.102:/var/tmp && ssh -p 120${config:group} ${config:userName}@153.19.49.102 'curl http://153.19.49.102:3001/resetNRF52v2/${config:group} && sleep 3 && nrfutil pkg generate --hw-version 52 --sd-req 0x00 --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":
@@ -37,7 +37,7 @@
}
},
{
- "label": "flashNordicSD",
+ "label": "Linux: flashNordicSD",
"type": "shell",
"command": "scp -P 120${config:group} pca10059/s140/armgcc/_build/nrf52840_xxaa.hex ${config:nrf52SDKPath}/components/softdevice/s140/hex/s140_nrf52_7.0.1_softdevice.hex ${config:userName}@153.19.49.102:/var/tmp && ssh -p 120${config:group} ${config:userName}@153.19.49.102 'curl http://153.19.49.102:3001/resetNRF52v2/${config: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":
@@ -48,7 +48,7 @@
}
},
{
- "label": "make (pca10056)",
+ "label": "Linux: make (pca10056)",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}/pca10056/s140/armgcc"
@@ -57,7 +57,7 @@
"group": "build"
},
{
- "label": "make clean (pca10056)",
+ "label": "Linux: make clean (pca10056)",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}/pca10056/s140/armgcc"
@@ -66,7 +66,7 @@
"group": "build"
},
{
- "label": "make flash (pca10056)",
+ "label": "Linux: make flash (pca10056)",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}/pca10056/s140/armgcc"
@@ -75,7 +75,7 @@
"group": "build"
},
{
- "label": "make (pca10059)",
+ "label": "Linux: make (pca10059)",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}/pca10059/s140/armgcc"
@@ -88,7 +88,7 @@
"problemMatcher": []
},
{
- "label": "make clean (pca10059)",
+ "label": "Linux: make clean (pca10059)",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}/pca10059/s140/armgcc"
@@ -97,7 +97,7 @@
"group": "build"
},
{
- "label": "make flash (pca10059)",
+ "label": "Linux: make flash (pca10059)",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}/pca10059/s140/armgcc"
diff --git a/cw2_template/pca10059/s140/armgcc/_build/nrf52840_xxaa.bin b/cw2_template/pca10059/s140/armgcc/_build/nrf52840_xxaa.bin
deleted file mode 100755
index 81fb90d32afef69f288bcfac932d887d15a8fe81..0000000000000000000000000000000000000000
Binary files a/cw2_template/pca10059/s140/armgcc/_build/nrf52840_xxaa.bin and /dev/null differ
diff --git a/cw2_template/pca10059/s140/armgcc/_build/nrf52840_xxaa.in b/cw2_template/pca10059/s140/armgcc/_build/nrf52840_xxaa.in
deleted file mode 100644
index 01060cb7bb7dffd2ef50eaa96e3718edbf0e82cd..0000000000000000000000000000000000000000
--- a/cw2_template/pca10059/s140/armgcc/_build/nrf52840_xxaa.in
+++ /dev/null
@@ -1 +0,0 @@
-_build/nrf52840_xxaa/gcc_startup_nrf52840.S.o _build/nrf52840_xxaa/nrf_log_backend_rtt.c.o _build/nrf52840_xxaa/nrf_log_backend_serial.c.o _build/nrf52840_xxaa/nrf_log_backend_uart.c.o _build/nrf52840_xxaa/nrf_log_default_backends.c.o _build/nrf52840_xxaa/nrf_log_frontend.c.o _build/nrf52840_xxaa/nrf_log_str_formatter.c.o _build/nrf52840_xxaa/boards.c.o _build/nrf52840_xxaa/app_button.c.o _build/nrf52840_xxaa/app_error.c.o _build/nrf52840_xxaa/app_error_handler_gcc.c.o _build/nrf52840_xxaa/app_error_weak.c.o _build/nrf52840_xxaa/app_fifo.c.o _build/nrf52840_xxaa/app_scheduler.c.o _build/nrf52840_xxaa/app_timer2.c.o _build/nrf52840_xxaa/app_uart_fifo.c.o _build/nrf52840_xxaa/app_usbd.c.o _build/nrf52840_xxaa/app_usbd_cdc_acm.c.o _build/nrf52840_xxaa/app_usbd_core.c.o _build/nrf52840_xxaa/app_usbd_serial_num.c.o _build/nrf52840_xxaa/app_usbd_string_desc.c.o _build/nrf52840_xxaa/app_util_platform.c.o _build/nrf52840_xxaa/drv_rtc.c.o _build/nrf52840_xxaa/fnmatch.c.o _build/nrf52840_xxaa/hardfault_handler_gcc.c.o _build/nrf52840_xxaa/hardfault_implementation.c.o _build/nrf52840_xxaa/nrf_assert.c.o _build/nrf52840_xxaa/nrf_atfifo.c.o _build/nrf52840_xxaa/nrf_atomic.c.o _build/nrf52840_xxaa/nrf_balloc.c.o _build/nrf52840_xxaa/nrf_cli.c.o _build/nrf52840_xxaa/nrf_cli_uart.c.o _build/nrf52840_xxaa/nrf_fprintf.c.o _build/nrf52840_xxaa/nrf_fprintf_format.c.o _build/nrf52840_xxaa/nrf_memobj.c.o _build/nrf52840_xxaa/nrf_pwr_mgmt.c.o _build/nrf52840_xxaa/nrf_queue.c.o _build/nrf52840_xxaa/nrf_ringbuf.c.o _build/nrf52840_xxaa/nrf_section_iter.c.o _build/nrf52840_xxaa/nrf_sortlist.c.o _build/nrf52840_xxaa/nrf_strerror.c.o _build/nrf52840_xxaa/nrf_drv_clock.c.o _build/nrf52840_xxaa/nrf_drv_power.c.o _build/nrf52840_xxaa/nrf_drv_uart.c.o _build/nrf52840_xxaa/nrf_nvic.c.o _build/nrf52840_xxaa/nrf_soc.c.o _build/nrf52840_xxaa/nrfx_atomic.c.o _build/nrf52840_xxaa/nrfx_clock.c.o _build/nrf52840_xxaa/nrfx_gpiote.c.o _build/nrf52840_xxaa/nrfx_power.c.o _build/nrf52840_xxaa/nrfx_prs.c.o _build/nrf52840_xxaa/nrfx_systick.c.o _build/nrf52840_xxaa/nrfx_uart.c.o _build/nrf52840_xxaa/nrfx_uarte.c.o _build/nrf52840_xxaa/nrfx_usbd.c.o _build/nrf52840_xxaa/bsp.c.o _build/nrf52840_xxaa/bsp_cli.c.o _build/nrf52840_xxaa/main.c.o _build/nrf52840_xxaa/usb.c.o _build/nrf52840_xxaa/temperature.c.o _build/nrf52840_xxaa/SEGGER_RTT.c.o _build/nrf52840_xxaa/SEGGER_RTT_Syscalls_GCC.c.o _build/nrf52840_xxaa/SEGGER_RTT_printf.c.o _build/nrf52840_xxaa/system_nrf52840.c.o _build/nrf52840_xxaa/utf.c.o -lc -lnosys -lm
diff --git a/cw3_template/.vscode/tasks.json b/cw3_template/.vscode/tasks.json
index f14c9a9c50c5d0a08ad12c8cad3f1561588105e9..847cb3890813a2de3322e8608bac1b77a339280f 100644
--- a/cw3_template/.vscode/tasks.json
+++ b/cw3_template/.vscode/tasks.json
@@ -4,7 +4,7 @@
"version": "2.0.0",
"tasks": [
{
- "label": "BLEtest",
+ "label": "Linux: BLEtest",
"type": "shell",
"command": "ssh -p 120${config:group} ${config:userName}@153.19.49.102 -t 'hciconfig hci0 down && hciconfig hci0 up && python3.7 /root/pmk/test_bluepy.py'",
"presentation":
@@ -15,7 +15,7 @@
}
},
{
- "label": "readUSB",
+ "label": "Linux: readUSB",
"type": "shell",
"command": "ssh -p 120${config:group} ${config:userName}@153.19.49.102 -t 'minicom -D /dev/ttyACM0'",
"presentation":
@@ -26,7 +26,7 @@
}
},
{
- "label": "flashNordic",
+ "label": "Linux: flashNordic",
"type": "shell",
"command": "scp -P 120${config:group} pca10059/s140/armgcc/_build/nrf52840_xxaa.hex ${config:userName}@153.19.49.102:/var/tmp && ssh -p 120${config:group} ${config:userName}@153.19.49.102 'curl http://153.19.49.102:3001/resetNRF52v2/${config:group} && sleep 3 && nrfutil pkg generate --hw-version 52 --sd-req 0x00 --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":
@@ -37,7 +37,7 @@
}
},
{
- "label": "flashNordicSD",
+ "label": "Linux: flashNordicSD",
"type": "shell",
"command": "scp -P 120${config:group} pca10059/s140/armgcc/_build/nrf52840_xxaa.hex ${config:nrf52SDKPath}/components/softdevice/s140/hex/s140_nrf52_7.0.1_softdevice.hex ${config:userName}@153.19.49.102:/var/tmp && ssh -p 120${config:group} ${config:userName}@153.19.49.102 'curl http://153.19.49.102:3001/resetNRF52v2/${config: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":
@@ -48,7 +48,7 @@
}
},
{
- "label": "make (pca10056)",
+ "label": "Linux: make (pca10056)",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}/pca10056/s140/armgcc"
@@ -57,7 +57,7 @@
"group": "build"
},
{
- "label": "make clean (pca10056)",
+ "label": "Linux: make clean (pca10056)",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}/pca10056/s140/armgcc"
@@ -66,7 +66,7 @@
"group": "build"
},
{
- "label": "make flash (pca10056)",
+ "label": "Linux: make flash (pca10056)",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}/pca10056/s140/armgcc"
@@ -75,7 +75,7 @@
"group": "build"
},
{
- "label": "make (pca10059)",
+ "label": "Linux: make (pca10059)",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}/pca10059/s140/armgcc"
@@ -88,7 +88,7 @@
"problemMatcher": []
},
{
- "label": "make clean (pca10059)",
+ "label": "Linux: make clean (pca10059)",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}/pca10059/s140/armgcc"
@@ -97,7 +97,7 @@
"group": "build"
},
{
- "label": "make flash (pca10059)",
+ "label": "Linux: make flash (pca10059)",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}/pca10059/s140/armgcc"
diff --git a/cw4_template/.vscode/tasks.json b/cw4_template/.vscode/tasks.json
index f14c9a9c50c5d0a08ad12c8cad3f1561588105e9..847cb3890813a2de3322e8608bac1b77a339280f 100644
--- a/cw4_template/.vscode/tasks.json
+++ b/cw4_template/.vscode/tasks.json
@@ -4,7 +4,7 @@
"version": "2.0.0",
"tasks": [
{
- "label": "BLEtest",
+ "label": "Linux: BLEtest",
"type": "shell",
"command": "ssh -p 120${config:group} ${config:userName}@153.19.49.102 -t 'hciconfig hci0 down && hciconfig hci0 up && python3.7 /root/pmk/test_bluepy.py'",
"presentation":
@@ -15,7 +15,7 @@
}
},
{
- "label": "readUSB",
+ "label": "Linux: readUSB",
"type": "shell",
"command": "ssh -p 120${config:group} ${config:userName}@153.19.49.102 -t 'minicom -D /dev/ttyACM0'",
"presentation":
@@ -26,7 +26,7 @@
}
},
{
- "label": "flashNordic",
+ "label": "Linux: flashNordic",
"type": "shell",
"command": "scp -P 120${config:group} pca10059/s140/armgcc/_build/nrf52840_xxaa.hex ${config:userName}@153.19.49.102:/var/tmp && ssh -p 120${config:group} ${config:userName}@153.19.49.102 'curl http://153.19.49.102:3001/resetNRF52v2/${config:group} && sleep 3 && nrfutil pkg generate --hw-version 52 --sd-req 0x00 --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":
@@ -37,7 +37,7 @@
}
},
{
- "label": "flashNordicSD",
+ "label": "Linux: flashNordicSD",
"type": "shell",
"command": "scp -P 120${config:group} pca10059/s140/armgcc/_build/nrf52840_xxaa.hex ${config:nrf52SDKPath}/components/softdevice/s140/hex/s140_nrf52_7.0.1_softdevice.hex ${config:userName}@153.19.49.102:/var/tmp && ssh -p 120${config:group} ${config:userName}@153.19.49.102 'curl http://153.19.49.102:3001/resetNRF52v2/${config: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":
@@ -48,7 +48,7 @@
}
},
{
- "label": "make (pca10056)",
+ "label": "Linux: make (pca10056)",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}/pca10056/s140/armgcc"
@@ -57,7 +57,7 @@
"group": "build"
},
{
- "label": "make clean (pca10056)",
+ "label": "Linux: make clean (pca10056)",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}/pca10056/s140/armgcc"
@@ -66,7 +66,7 @@
"group": "build"
},
{
- "label": "make flash (pca10056)",
+ "label": "Linux: make flash (pca10056)",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}/pca10056/s140/armgcc"
@@ -75,7 +75,7 @@
"group": "build"
},
{
- "label": "make (pca10059)",
+ "label": "Linux: make (pca10059)",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}/pca10059/s140/armgcc"
@@ -88,7 +88,7 @@
"problemMatcher": []
},
{
- "label": "make clean (pca10059)",
+ "label": "Linux: make clean (pca10059)",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}/pca10059/s140/armgcc"
@@ -97,7 +97,7 @@
"group": "build"
},
{
- "label": "make flash (pca10059)",
+ "label": "Linux: make flash (pca10059)",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}/pca10059/s140/armgcc"
diff --git a/cw4_template/pca10059/s140/armgcc/_build/nrf52840_xxaa.bin b/cw4_template/pca10059/s140/armgcc/_build/nrf52840_xxaa.bin
deleted file mode 100755
index e0dec21e874b64a4f5c9e1fb44dd4cceb80d7a22..0000000000000000000000000000000000000000
Binary files a/cw4_template/pca10059/s140/armgcc/_build/nrf52840_xxaa.bin and /dev/null differ
diff --git a/cw4_template/pca10059/s140/armgcc/_build/nrf52840_xxaa.in b/cw4_template/pca10059/s140/armgcc/_build/nrf52840_xxaa.in
deleted file mode 100644
index c204587610c75c89be5fe01213b09899b4480656..0000000000000000000000000000000000000000
--- a/cw4_template/pca10059/s140/armgcc/_build/nrf52840_xxaa.in
+++ /dev/null
@@ -1 +0,0 @@
-_build/nrf52840_xxaa/gcc_startup_nrf52840.S.o _build/nrf52840_xxaa/nrf_log_backend_rtt.c.o _build/nrf52840_xxaa/nrf_log_backend_serial.c.o _build/nrf52840_xxaa/nrf_log_backend_uart.c.o _build/nrf52840_xxaa/nrf_log_default_backends.c.o _build/nrf52840_xxaa/nrf_log_frontend.c.o _build/nrf52840_xxaa/nrf_log_str_formatter.c.o _build/nrf52840_xxaa/app_button.c.o _build/nrf52840_xxaa/app_error.c.o _build/nrf52840_xxaa/app_error_handler_gcc.c.o _build/nrf52840_xxaa/app_error_weak.c.o _build/nrf52840_xxaa/app_scheduler.c.o _build/nrf52840_xxaa/app_timer2.c.o _build/nrf52840_xxaa/app_util_platform.c.o _build/nrf52840_xxaa/drv_rtc.c.o _build/nrf52840_xxaa/hardfault_implementation.c.o _build/nrf52840_xxaa/nrf_assert.c.o _build/nrf52840_xxaa/nrf_atfifo.c.o _build/nrf52840_xxaa/nrf_atflags.c.o _build/nrf52840_xxaa/nrf_atomic.c.o _build/nrf52840_xxaa/nrf_balloc.c.o _build/nrf52840_xxaa/nrf_fprintf.c.o _build/nrf52840_xxaa/nrf_fprintf_format.c.o _build/nrf52840_xxaa/nrf_memobj.c.o _build/nrf52840_xxaa/nrf_pwr_mgmt.c.o _build/nrf52840_xxaa/nrf_ringbuf.c.o _build/nrf52840_xxaa/nrf_section_iter.c.o _build/nrf52840_xxaa/nrf_sortlist.c.o _build/nrf52840_xxaa/nrf_strerror.c.o _build/nrf52840_xxaa/system_nrf52840.c.o _build/nrf52840_xxaa/boards.c.o _build/nrf52840_xxaa/nrf_drv_clock.c.o _build/nrf52840_xxaa/nrf_drv_uart.c.o _build/nrf52840_xxaa/nrfx_atomic.c.o _build/nrf52840_xxaa/nrfx_clock.c.o _build/nrf52840_xxaa/nrfx_gpiote.c.o _build/nrf52840_xxaa/nrfx_prs.c.o _build/nrf52840_xxaa/nrfx_uart.c.o _build/nrf52840_xxaa/nrfx_uarte.c.o _build/nrf52840_xxaa/main.c.o _build/nrf52840_xxaa/SEGGER_RTT.c.o _build/nrf52840_xxaa/SEGGER_RTT_Syscalls_GCC.c.o _build/nrf52840_xxaa/SEGGER_RTT_printf.c.o _build/nrf52840_xxaa/ble_advdata.c.o _build/nrf52840_xxaa/ble_conn_params.c.o _build/nrf52840_xxaa/ble_conn_state.c.o _build/nrf52840_xxaa/ble_srv_common.c.o _build/nrf52840_xxaa/nrf_ble_gatt.c.o _build/nrf52840_xxaa/nrf_ble_qwr.c.o _build/nrf52840_xxaa/utf.c.o _build/nrf52840_xxaa/ble_lbs.c.o _build/nrf52840_xxaa/nrf_sdh.c.o _build/nrf52840_xxaa/nrf_sdh_ble.c.o _build/nrf52840_xxaa/nrf_sdh_soc.c.o _build/nrf52840_xxaa/app_usbd_cdc_acm.c.o _build/nrf52840_xxaa/app_usbd.c.o _build/nrf52840_xxaa/app_usbd_core.c.o _build/nrf52840_xxaa/app_usbd_serial_num.c.o _build/nrf52840_xxaa/app_usbd_string_desc.c.o _build/nrf52840_xxaa/nrfx_usbd.c.o _build/nrf52840_xxaa/nrfx_systick.c.o _build/nrf52840_xxaa/nrfx_power.c.o _build/nrf52840_xxaa/nrf_drv_power.c.o _build/nrf52840_xxaa/bsp.c.o _build/nrf52840_xxaa/kimia_usb_log.c.o -lc -lnosys -lm
diff --git a/cw5_template/centrala/.vscode/tasks.json b/cw5_template/centrala/.vscode/tasks.json
index f14c9a9c50c5d0a08ad12c8cad3f1561588105e9..847cb3890813a2de3322e8608bac1b77a339280f 100644
--- a/cw5_template/centrala/.vscode/tasks.json
+++ b/cw5_template/centrala/.vscode/tasks.json
@@ -4,7 +4,7 @@
"version": "2.0.0",
"tasks": [
{
- "label": "BLEtest",
+ "label": "Linux: BLEtest",
"type": "shell",
"command": "ssh -p 120${config:group} ${config:userName}@153.19.49.102 -t 'hciconfig hci0 down && hciconfig hci0 up && python3.7 /root/pmk/test_bluepy.py'",
"presentation":
@@ -15,7 +15,7 @@
}
},
{
- "label": "readUSB",
+ "label": "Linux: readUSB",
"type": "shell",
"command": "ssh -p 120${config:group} ${config:userName}@153.19.49.102 -t 'minicom -D /dev/ttyACM0'",
"presentation":
@@ -26,7 +26,7 @@
}
},
{
- "label": "flashNordic",
+ "label": "Linux: flashNordic",
"type": "shell",
"command": "scp -P 120${config:group} pca10059/s140/armgcc/_build/nrf52840_xxaa.hex ${config:userName}@153.19.49.102:/var/tmp && ssh -p 120${config:group} ${config:userName}@153.19.49.102 'curl http://153.19.49.102:3001/resetNRF52v2/${config:group} && sleep 3 && nrfutil pkg generate --hw-version 52 --sd-req 0x00 --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":
@@ -37,7 +37,7 @@
}
},
{
- "label": "flashNordicSD",
+ "label": "Linux: flashNordicSD",
"type": "shell",
"command": "scp -P 120${config:group} pca10059/s140/armgcc/_build/nrf52840_xxaa.hex ${config:nrf52SDKPath}/components/softdevice/s140/hex/s140_nrf52_7.0.1_softdevice.hex ${config:userName}@153.19.49.102:/var/tmp && ssh -p 120${config:group} ${config:userName}@153.19.49.102 'curl http://153.19.49.102:3001/resetNRF52v2/${config: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":
@@ -48,7 +48,7 @@
}
},
{
- "label": "make (pca10056)",
+ "label": "Linux: make (pca10056)",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}/pca10056/s140/armgcc"
@@ -57,7 +57,7 @@
"group": "build"
},
{
- "label": "make clean (pca10056)",
+ "label": "Linux: make clean (pca10056)",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}/pca10056/s140/armgcc"
@@ -66,7 +66,7 @@
"group": "build"
},
{
- "label": "make flash (pca10056)",
+ "label": "Linux: make flash (pca10056)",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}/pca10056/s140/armgcc"
@@ -75,7 +75,7 @@
"group": "build"
},
{
- "label": "make (pca10059)",
+ "label": "Linux: make (pca10059)",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}/pca10059/s140/armgcc"
@@ -88,7 +88,7 @@
"problemMatcher": []
},
{
- "label": "make clean (pca10059)",
+ "label": "Linux: make clean (pca10059)",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}/pca10059/s140/armgcc"
@@ -97,7 +97,7 @@
"group": "build"
},
{
- "label": "make flash (pca10059)",
+ "label": "Linux: make flash (pca10059)",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}/pca10059/s140/armgcc"
diff --git a/cw5_template/centrala/pca10059/s140/armgcc/_build/nrf52840_xxaa.bin b/cw5_template/centrala/pca10059/s140/armgcc/_build/nrf52840_xxaa.bin
deleted file mode 100755
index 93b8e5abee9127021e3de10460319281fae0490a..0000000000000000000000000000000000000000
Binary files a/cw5_template/centrala/pca10059/s140/armgcc/_build/nrf52840_xxaa.bin and /dev/null differ
diff --git a/cw5_template/centrala/pca10059/s140/armgcc/_build/nrf52840_xxaa.in b/cw5_template/centrala/pca10059/s140/armgcc/_build/nrf52840_xxaa.in
deleted file mode 100644
index a4340c2f16505256cefebdca1702b0c46203f791..0000000000000000000000000000000000000000
--- a/cw5_template/centrala/pca10059/s140/armgcc/_build/nrf52840_xxaa.in
+++ /dev/null
@@ -1 +0,0 @@
-_build/nrf52840_xxaa/gcc_startup_nrf52840.S.o _build/nrf52840_xxaa/nrf_log_backend_rtt.c.o _build/nrf52840_xxaa/nrf_log_backend_serial.c.o _build/nrf52840_xxaa/nrf_log_backend_uart.c.o _build/nrf52840_xxaa/nrf_log_default_backends.c.o _build/nrf52840_xxaa/nrf_log_frontend.c.o _build/nrf52840_xxaa/nrf_log_str_formatter.c.o _build/nrf52840_xxaa/app_button.c.o _build/nrf52840_xxaa/app_error.c.o _build/nrf52840_xxaa/app_error_handler_gcc.c.o _build/nrf52840_xxaa/app_error_weak.c.o _build/nrf52840_xxaa/app_scheduler.c.o _build/nrf52840_xxaa/app_timer2.c.o _build/nrf52840_xxaa/app_util_platform.c.o _build/nrf52840_xxaa/drv_rtc.c.o _build/nrf52840_xxaa/hardfault_implementation.c.o _build/nrf52840_xxaa/nrf_assert.c.o _build/nrf52840_xxaa/nrf_atfifo.c.o _build/nrf52840_xxaa/nrf_atflags.c.o _build/nrf52840_xxaa/nrf_atomic.c.o _build/nrf52840_xxaa/nrf_balloc.c.o _build/nrf52840_xxaa/nrf_fprintf.c.o _build/nrf52840_xxaa/nrf_fprintf_format.c.o _build/nrf52840_xxaa/nrf_memobj.c.o _build/nrf52840_xxaa/nrf_pwr_mgmt.c.o _build/nrf52840_xxaa/nrf_queue.c.o _build/nrf52840_xxaa/nrf_ringbuf.c.o _build/nrf52840_xxaa/nrf_section_iter.c.o _build/nrf52840_xxaa/nrf_sortlist.c.o _build/nrf52840_xxaa/nrf_strerror.c.o _build/nrf52840_xxaa/system_nrf52840.c.o _build/nrf52840_xxaa/boards.c.o _build/nrf52840_xxaa/nrf_drv_clock.c.o _build/nrf52840_xxaa/nrf_drv_uart.c.o _build/nrf52840_xxaa/nrfx_atomic.c.o _build/nrf52840_xxaa/nrfx_clock.c.o _build/nrf52840_xxaa/nrfx_gpiote.c.o _build/nrf52840_xxaa/nrfx_prs.c.o _build/nrf52840_xxaa/nrfx_uart.c.o _build/nrf52840_xxaa/nrfx_uarte.c.o _build/nrf52840_xxaa/bsp.c.o _build/nrf52840_xxaa/bsp_btn_ble.c.o _build/nrf52840_xxaa/main.c.o _build/nrf52840_xxaa/SEGGER_RTT.c.o _build/nrf52840_xxaa/SEGGER_RTT_Syscalls_GCC.c.o _build/nrf52840_xxaa/SEGGER_RTT_printf.c.o _build/nrf52840_xxaa/ble_advdata.c.o _build/nrf52840_xxaa/ble_advertising.c.o _build/nrf52840_xxaa/ble_conn_state.c.o _build/nrf52840_xxaa/ble_db_discovery.c.o _build/nrf52840_xxaa/ble_srv_common.c.o _build/nrf52840_xxaa/nrf_ble_gatt.c.o _build/nrf52840_xxaa/nrf_ble_gq.c.o _build/nrf52840_xxaa/nrf_ble_scan.c.o _build/nrf52840_xxaa/utf.c.o _build/nrf52840_xxaa/ble_lbs_c.c.o _build/nrf52840_xxaa/nrf_sdh.c.o _build/nrf52840_xxaa/nrf_sdh_ble.c.o _build/nrf52840_xxaa/nrf_sdh_soc.c.o _build/nrf52840_xxaa/app_usbd_cdc_acm.c.o _build/nrf52840_xxaa/app_usbd.c.o _build/nrf52840_xxaa/app_usbd_core.c.o _build/nrf52840_xxaa/app_usbd_serial_num.c.o _build/nrf52840_xxaa/app_usbd_string_desc.c.o _build/nrf52840_xxaa/nrfx_usbd.c.o _build/nrf52840_xxaa/nrfx_systick.c.o _build/nrf52840_xxaa/nrfx_power.c.o _build/nrf52840_xxaa/nrf_drv_power.c.o _build/nrf52840_xxaa/kimia_usb_log.c.o -lc -lnosys -lm