Skip to content
This repository has been archived by the owner on Dec 18, 2024. It is now read-only.

Commit

Permalink
chore: copy UHK specific user-config.bin into the device release dir
Browse files Browse the repository at this point in the history
  • Loading branch information
ert78gb committed Dec 3, 2024
1 parent 9783278 commit 3693522
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/agent
Submodule agent updated 230 files
2 changes: 1 addition & 1 deletion scripts/.nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.14.0
20.18.0
5 changes: 4 additions & 1 deletion scripts/make-release.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
12 changes: 8 additions & 4 deletions scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,31 +32,35 @@
"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,
"name": "uhk60v2-right",
"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,
"name": "uhk-80-left",
"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,
"name": "uhk-80-right",
"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,
Expand Down

0 comments on commit 3693522

Please sign in to comment.