From a99a71d5689b2108666282daa82746cd3250bb8d Mon Sep 17 00:00:00 2001 From: Karel Tucek Date: Sat, 28 Feb 2026 21:46:03 +0100 Subject: [PATCH] Enable logging buffer UI for uhk60. --- packages/uhk-agent/src/services/device.service.ts | 3 ++- .../advanced-settings/advanced-settings.page.component.html | 2 +- .../advanced-settings/advanced-settings.page.component.ts | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/uhk-agent/src/services/device.service.ts b/packages/uhk-agent/src/services/device.service.ts index bd3b1de4c04..631f1503b41 100644 --- a/packages/uhk-agent/src/services/device.service.ts +++ b/packages/uhk-agent/src/services/device.service.ts @@ -1420,12 +1420,13 @@ export class DeviceService { private async readZephyrLog(): Promise { try { + const uhkDeviceProduct = await getCurrentUhkDeviceProduct(this.options); const log = await this.operations.getVariable(UsbVariables.ShellBuffer) this.logService.misc(`[DeviceService] Right half zephyr log: ${log}`); const logEntry: ZephyrLogEntry = { log: log as string, level: 'info', - device: UHK_80_DEVICE.logName, + device: uhkDeviceProduct.logName, } this.win.webContents.send(IpcEvents.device.zephyrLog, logEntry) } diff --git a/packages/uhk-web/src/app/components/device/advanced-settings/advanced-settings.page.component.html b/packages/uhk-web/src/app/components/device/advanced-settings/advanced-settings.page.component.html index 3e75682611b..e713b44383d 100644 --- a/packages/uhk-web/src/app/components/device/advanced-settings/advanced-settings.page.component.html +++ b/packages/uhk-web/src/app/components/device/advanced-settings/advanced-settings.page.component.html @@ -63,7 +63,7 @@

[disabled]="state.isLeftHalfPairing" (click)="onToggleZephyrLogging()" > - Zephyr logging + Logging diff --git a/packages/uhk-web/src/app/components/device/advanced-settings/advanced-settings.page.component.ts b/packages/uhk-web/src/app/components/device/advanced-settings/advanced-settings.page.component.ts index 99a012a3238..f019edc1269 100644 --- a/packages/uhk-web/src/app/components/device/advanced-settings/advanced-settings.page.component.ts +++ b/packages/uhk-web/src/app/components/device/advanced-settings/advanced-settings.page.component.ts @@ -87,7 +87,9 @@ export class AdvancedSettingsPageComponent implements OnInit, OnDestroy { this.connectedDeviceSubscription = this.store.select(getConnectedDevice) .subscribe(connectedDevice => { this.isHalvesPairingAllowed = connectedDevice?.id === UHK_80_DEVICE.id; - this.isZephyrLoggingAllowed = connectedDevice?.id === UHK_80_DEVICE.id; + this.isZephyrLoggingAllowed = connectedDevice?.id === UHK_80_DEVICE.id + || connectedDevice?.id === UHK_60_DEVICE.id + || connectedDevice?.id === UHK_60_V2_DEVICE.id; this.showI2CRecoverButton = connectedDevice?.id === UHK_60_DEVICE.id || connectedDevice?.id === UHK_60_V2_DEVICE.id; this.cdRef.detectChanges(); });