From d29a6e56c0578b68ec2b2a0421ff298009bef1bd Mon Sep 17 00:00:00 2001 From: Markus Merklinger Date: Tue, 14 Jan 2025 17:17:19 +0100 Subject: [PATCH] List NK3 and NKPK devices --- nitrokeyapp/device_data.py | 4 +++- nitrokeyapp/gui.py | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nitrokeyapp/device_data.py b/nitrokeyapp/device_data.py index fc345994..9b663643 100644 --- a/nitrokeyapp/device_data.py +++ b/nitrokeyapp/device_data.py @@ -23,7 +23,9 @@ def __init__(self, device: TrussedBase) -> None: @classmethod def list(cls) -> List["DeviceData"]: - return [cls(dev) for dev in nk3.list()] + nk3_devices = [cls(dev) for dev in nk3.list()] + nkpk_devices = [cls(dev) for dev in nkpk.list()] + return nk3_devices + nkpk_devices @property def name(self) -> str: diff --git a/nitrokeyapp/gui.py b/nitrokeyapp/gui.py index 7c0099eb..ad6270c2 100644 --- a/nitrokeyapp/gui.py +++ b/nitrokeyapp/gui.py @@ -159,8 +159,7 @@ def detect_added_devices( logger.info("failed adding device") return - # add as nk3 device - logger.info(f"nk3 connected: {devs}") + logger.info(f"Connected devices: {devs}") self.trigger_update_devices.emit()