From 36935221d84586857a37d42916fbd76f7a5761ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kiss=20R=C3=B3bert?= <ert78gb@gmail.com>
Date: Tue, 3 Dec 2024 22:22:39 +0100
Subject: [PATCH] chore: copy UHK specific user-config.bin into the device
 release dir

---
 .gitmodules              |  2 +-
 lib/agent                |  2 +-
 scripts/.nvmrc           |  2 +-
 scripts/make-release.mjs |  5 ++++-
 scripts/package.json     | 12 ++++++++----
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 3e5c6e8e..993c59bb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,7 +9,7 @@
 	url = https://github.com/UltimateHackingKeyboard/bootloader.git
 [submodule "lib/agent"]
 	path = lib/agent
-	url = git@github.com:UltimateHackingKeyboard/agent80.git
+	url = https://github.com/UltimateHackingKeyboard/agent80.git
 [submodule "lib/SDK_2.8.0_MKL17Z32xxx4"]
 	path = lib/SDK_2.8.0_MKL17Z32xxx4
 	url = https://github.com/UltimateHackingKeyboard/SDK_2.8.0_MKL17Z32xxx4.git
diff --git a/lib/agent b/lib/agent
index 0de5542a..001757fc 160000
--- a/lib/agent
+++ b/lib/agent
@@ -1 +1 @@
-Subproject commit 0de5542adff404d3934b8bfeed98b75b4e3d1256
+Subproject commit 001757fc74b59ec5c7938feabde9284f78f3200c
diff --git a/scripts/.nvmrc b/scripts/.nvmrc
index 48b14e6b..2a393af5 100644
--- a/scripts/.nvmrc
+++ b/scripts/.nvmrc
@@ -1 +1 @@
-20.14.0
+20.18.0
diff --git a/scripts/make-release.mjs b/scripts/make-release.mjs
index cb3a70f5..a6e6d176 100755
--- a/scripts/make-release.mjs
+++ b/scripts/make-release.mjs
@@ -89,7 +89,10 @@ for (const device of packageJson.devices) {
     shell.chmod(644, deviceSource);
     shell.cp(deviceSource, `${deviceDir}/firmware${path.extname(device.source)}`);
     shell.cp(deviceMMap, `${deviceDir}/firmware.map`);
-    shell.exec(`npm run convert-user-config-to-bin -- ${deviceDir}/config.bin`, { cwd: agentDir });
+
+    if (device.userConfigType) {
+        shell.exec(`npm run convert-user-config-to-bin -- ${device.userConfigType} ${deviceDir}/config.bin`, { cwd: agentDir });
+    }
 
     if (device.kboot) {
       const kbootPath = path.join(__dirname, '..', device.kboot);
diff --git a/scripts/package.json b/scripts/package.json
index e465ed01..80921143 100644
--- a/scripts/package.json
+++ b/scripts/package.json
@@ -32,7 +32,8 @@
       "source": "right/uhk60v1/build_make/uhk60v1.hex",
       "mmap": "right/uhk60v1/build_make/uhk60v1.map",
       "kboot": "scripts/kboot-releases/uhk60-right/kboot.hex",
-      "platform": "kinetis"
+      "platform": "kinetis",
+      "userConfigType": "uhk60"
     },
     {
       "deviceId": 2,
@@ -40,7 +41,8 @@
       "source": "right/uhk60v2/build_make/uhk60v2.hex",
       "mmap": "right/uhk60v2/build_make/uhk60v2.map",
       "kboot": "scripts/kboot-releases/uhk60v2-right/kboot.hex",
-      "platform": "kinetis"
+      "platform": "kinetis",
+      "userConfigType": "uhk60"
     },
     {
       "deviceId": 3,
@@ -48,7 +50,8 @@
       "source": "device/build/uhk-80-left/zephyr/app_update.bin",
       "mmap": "device/build/uhk-80-left/zephyr/zephyr.map",
       "merged": "device/build/uhk-80-left/zephyr/merged.hex",
-      "platform": "nordic"
+      "platform": "nordic",
+      "userConfigType": "uhk80"
     },
     {
       "deviceId": 4,
@@ -56,7 +59,8 @@
       "source": "device/build/uhk-80-right/zephyr/app_update.bin",
       "mmap": "device/build/uhk-80-right/zephyr/zephyr.map",
       "merged": "device/build/uhk-80-right/zephyr/merged.hex",
-      "platform": "nordic"
+      "platform": "nordic",
+      "userConfigType": "uhk80"
     },
     {
       "deviceId": 5,