Uhk60 c2usb integration

.clang-format

@@ -40,3 +40,5 @@ AllowShortFunctionsOnASingleLine: Inline
 AllowShortLambdasOnASingleLine: Inline
 ShortNamespaceLines: 1
 FixNamespaceComments: true
+InsertNewlineAtEOF: true
+KeepEmptyLinesAtEOF: true

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ on:
 
 jobs:
   release:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 25
     env:
       ARM_GCC_DIR: /usr
@@ -42,7 +42,7 @@ jobs:
           app-path: firmware
           manifest-file-name: west_nrfsdk.yml
           toolchains: arm-zephyr-eabi
-          sdk-version: 0.16.8
+          sdk-version: 0.17.4
 
       - name: Git user setup
         run: |

.vscode/tasks.json

@@ -8,15 +8,10 @@
 				"isDefault": true
 			},
 			"options": {
-				"cwd": "${workspaceFolder}"
+				"cwd": "${workspaceFolder:firmware}"
 			},
-			"type": "process",
-			"command": "west",
-			"args": [
-				"config",
-				"manifest.file",
-				"west_nrfsdk.yml"
-			]
+			"type": "shell",
+			"command": "west config manifest.file west_nrfsdk.yml && west config manifest.path firmware"
 		},
 		{
 			"label": "Select McuXpresso SDK",
@@ -25,49 +20,37 @@
 				"isDefault": true
 			},
 			"options": {
-				"cwd": "${workspaceFolder}"
+				"cwd": "${workspaceFolder:firmware}"
 			},
-			"type": "process",
-			"command": "west",
-			"args": [
-				"config",
-				"manifest.file",
-				"west_mcuxsdk.yml"
-			]
+			"type": "shell",
+			"command": "west config manifest.file west_mcuxsdk.yml && west config manifest.path firmware"
 		},
 		{
-			"label": "West update",
+			"label": "West update and patch",
 			"group": {
 				"kind": "none",
 				"isDefault": true
 			},
 			"options": {
-				"cwd": "${workspaceFolder}"
+				"cwd": "${workspaceFolder:firmware}"
 			},
-			"type": "process",
-			"command": "west",
-			"args": [
-				"update"
-			]
+			"type": "shell",
+			"command": "west update && west patch",
 		},
 		{
-			"label": "West patch",
+			"label": "Select SDK by vscode workspace",
 			"group": {
 				"kind": "none",
 				"isDefault": true
 			},
 			"options": {
-				"cwd": "${workspaceFolder}"
+				"cwd": "${workspaceFolder:firmware}"
 			},
-			"type": "process",
-			"command": "west",
-			"args": [
-				"patch"
-			],
-			"dependsOrder": "sequence",
-			"dependsOn": [
-				"West update"
-			]
+			"runOptions": {
+				"runOn": "folderOpen"
+			},
+			"type": "shell",
+			"command": "west config manifest.file west_${config:firmware.startupSdk}.yml && west config manifest.path firmware"
 		}
 	]
 }

README.md

@@ -194,7 +194,7 @@ BUILD_DIR=device/build/uhk-80-right; west flash --build-dir $BUILD_DIR
 
 It is recommended to start development in the IDE once a successful build is available, as the build parameters
 aren't trivial to pass to the IDE, but it does pick up existing build configurations.
-To get started, choose *Open Workspace from File...*, then select the `firmware.code-workspace` file.
+To get started, choose *Open Workspace from File...*, then select either the `mcuxsdk.code-workspace` (for UHK60 and modules) or the `nrfsdk.code-workspace` (for UHK80 and dongle) file.
 Install the recommended extensions or pick the one for your single device depending on the SDK.
 
 > Note that using *MCUXpresso for VS Code* extension currently overwrites the `mcux_includes.json` file,
@@ -217,12 +217,10 @@ On a first try, this error might manifest:
 > Could not start GDB. Check that the file exists, and it can be manually started.
 Error: Error: spawn $env{ARM_GCC_DIR}/bin/arm-none-eabi-gdb ENOENT
 
-There are two problems to solve:
-1. The arm-none-eabi package doesn't ship with gdb by default.
+This is due to the arm-none-eabi apt package not shipping with gdb by default.
 You can follow [this guide](https://interrupt.memfault.com/blog/installing-gdb#binaries-from-arm)
 to get a full toolchain installed.
-2. The extension doesn't expand the environment variable, so you'll need to modify the `.vscode/mcuxpresso-tools.json` file,
-to have a hardcoded `toolchainPath` variable. (Don't push this change into the repository, obviously.)
+
 
 ### Releasing
 

boards/ugl/uhk-60-right/Kconfig.board

@@ -1,7 +1,9 @@
-# Copyright (c) 2018, Prevas A/S
-# SPDX-License-Identifier: Apache-2.0
+config BOARD_UHK_60_RIGHT_V1
+    bool "UHK 60 v1"
+    depends on SOC_SERIES_KINETIS_K2X
+    select SOC_PART_NUMBER_MK22FN512VLH12
 
-config BOARD_UHK_60_RIGHT
-    bool "UHK 60 right"
+config BOARD_UHK_60_RIGHT_V2
+    bool "UHK 60 v2"
     depends on SOC_SERIES_KINETIS_K2X
     select SOC_PART_NUMBER_MK22FN512VLH12

boards/ugl/uhk-80/Kconfig.defconfig

@@ -25,28 +25,22 @@ endif # BT_DIS && BT_DIS_PNP
 if BOARD_UHK_80_LEFT
     config USB_DEVICE_PRODUCT
         default "UHK 80 left half bootloader" if MCUBOOT
-        default "UHK 80 Left USB"
     config USB_DEVICE_PID
-        default 0x0006 if !BT
-        default 0x0007
+        default 0x0006 if MCUBOOT
 endif # BOARD_UHK_80_LEFT
 
 if BOARD_UHK_80_RIGHT
     config USB_DEVICE_PRODUCT
         default "UHK 80 right half bootloader" if MCUBOOT
-        default "UHK 80 Right USB"
     config USB_DEVICE_PID
         default 0x0008 if MCUBOOT
-        default 0x0009
 endif # BOARD_UHK_80_RIGHT
 
 if BOARD_UHK_DONGLE
     config USB_DEVICE_PRODUCT
         default "UHK dongle bootloader" if MCUBOOT
-        default "UHK dongle"
     config USB_DEVICE_PID
         default 0x0004 if MCUBOOT
-        default 0x0005
 endif # BOARD_UHK_DONGLE
 
 if BT

boards/ugl/uhk-80/board.cmake

@@ -1,12 +1,9 @@
-# Copyright (c) 2021 Nordic Semiconductor ASA
 # SPDX-License-Identifier: Apache-2.0
 
-board_runner_args(jlink "--device=nrf52" "--speed=4000")
+board_runner_args(jlink "--device=nRF52840_xxAA" "--speed=4000")
 board_runner_args(pyocd "--target=nrf52840" "--frequency=4000000")
-
-set(OPENOCD_NRF5_SUBFAMILY "nrf52")
-
 include(${ZEPHYR_BASE}/boards/common/nrfjprog.board.cmake)
+include(${ZEPHYR_BASE}/boards/common/nrfutil.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/pyocd.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd-nrf5.board.cmake)

build.sh

@@ -158,17 +158,23 @@ function dealiasDeviceZephyr() {
 }
 
 function dealiasDeviceMcux() {
+    if [ "$DEBUG" == "1" ]; then
+        BUILD_TYPE="debug"
+    else
+        BUILD_TYPE="release"
+    fi
+
     case $DEVICE in
         uhk-60v1-right|rightv1|right)
             DEVICE="uhk-60v1-right"
-            VARIANT="v1-release"
+            VARIANT="v1-$BUILD_TYPE"
             BUILD_DIR="right/build/$VARIANT"
             DEVICE_DIR="right"
             USBDEVICEARG="--vid=0x37a8 --pid=1"
             ;;
         uhk-60v2-right|rightv2|right)
             DEVICE="uhk-60v2-right"
-            VARIANT="v2-release"
+            VARIANT="v2-$BUILD_TYPE"
             BUILD_DIR="right/build/$VARIANT"
             DEVICE_DIR="right"
             USBDEVICEARG="--vid=0x37a8 --pid=3"
@@ -315,33 +321,22 @@ function performZephyrAction() {
     case $ACTION in
         build)
             # reference version of the build process is to be found in scripts/make-release.mjs
-            nrfutil toolchain-manager launch --shell --ncs-version $NCS_VERSION << END
-                unset PYTHONPATH
-                unset PYTHONHOME
-                ZEPHYR_TOOLCHAIN_VARIANT=zephyr west build \
-                    --build-dir "$ROOT/device/build/$DEVICE" "$ROOT/device" \
-                    --pristine \
-                    -- \
-                    --preset $DEVICE
-                exit $?
-END
+            ZEPHYR_TOOLCHAIN_VARIANT=zephyr west build \
+                --build-dir "$ROOT/device/build/$DEVICE" "$ROOT/device" \
+                --pristine \
+                -- \
+                --preset $DEVICE
             exitOnFail $?
             createCentralCompileCommands
             ;;
         make)
-            nrfutil toolchain-manager launch --shell --ncs-version $NCS_VERSION << END
-                west build --build-dir $ROOT/device/build/$DEVICE device
-                exit $?
-END
+            west build --build-dir $ROOT/device/build/$DEVICE device
             exitOnFail $?
             ;;
         flash)
             export BUILD_DIR="$ROOT/device/build/$DEVICE"
             export DEVICE="$DEVICE"
-            nrfutil toolchain-manager launch --shell --ncs-version $NCS_VERSION << END
-                west flash --softreset --build-dir $BUILD_DIR $DEVICEARG $OTHER_ARGS
-                exit $?
-END
+            west flash --softreset --build-dir $BUILD_DIR $DEVICEARG $OTHER_ARGS
             exitOnFail $?
             ;;
         flashUsb)

device/.vscode/tasks.json

@@ -10,17 +10,8 @@
 			"options": {
 				"cwd": "${workspaceFolder}"
 			},
-			"type": "process",
-			"command": "west",
-			"args": [
-				"build",
-				"--build-dir",
-				"${cwd}/build/uhk-80-left",
-				"${cwd}",
-				"--",
-				"--preset",
-				"uhk-80-left"
-			],
+			"type": "shell",
+			"command": "west build --build-dir ${cwd}/build/uhk-80-left ${cwd} -- --preset uhk-80-left",
 			"problemMatcher": [
 				"$gcc"
 			]
@@ -34,17 +25,8 @@
 			"options": {
 				"cwd": "${workspaceFolder}"
 			},
-			"type": "process",
-			"command": "west",
-			"args": [
-				"build",
-				"--build-dir",
-				"${cwd}/build/uhk-80-right",
-				"${cwd}",
-				"--",
-				"--preset",
-				"uhk-80-right"
-			],
+			"type": "shell",
+			"command": "west build --build-dir ${cwd}/build/uhk-80-right ${cwd} -- --preset uhk-80-right",
 			"problemMatcher": [
 				"$gcc"
 			]
@@ -58,17 +40,8 @@
 			"options": {
 				"cwd": "${workspaceFolder}"
 			},
-			"type": "process",
-			"command": "west",
-			"args": [
-				"build",
-				"--build-dir",
-				"${cwd}/build/uhk-dongle",
-				"${cwd}",
-				"--",
-				"--preset",
-				"uhk-dongle"
-			],
+			"type": "shell",
+			"command": "west build --build-dir ${cwd}/build/uhk-dongle ${cwd} -- --preset uhk-dongle",
 			"problemMatcher": [
 				"$gcc"
 			]