From 182aa0e374d0c6145e6d92092395d44d302d71e3 Mon Sep 17 00:00:00 2001 From: Maxim Devaev Date: Sat, 22 Feb 2025 19:33:56 +0200 Subject: [PATCH] otg: renamed product, removed configuration name --- kvmd/apps/__init__.py | 4 ++-- kvmd/apps/otg/__init__.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/kvmd/apps/__init__.py b/kvmd/apps/__init__.py index ef258044..3860bc42 100644 --- a/kvmd/apps/__init__.py +++ b/kvmd/apps/__init__.py @@ -561,15 +561,15 @@ def _get_config_scheme() -> dict: "vendor_id": Option(0x1D6B, type=valid_otg_id), # Linux Foundation "product_id": Option(0x0104, type=valid_otg_id), # Multifunction Composite Gadget "manufacturer": Option("PiKVM", type=valid_stripped_string), - "product": Option("Composite KVM Device", type=valid_stripped_string), + "product": Option("PiKVM Composite Device", type=valid_stripped_string), "serial": Option("CAFEBABE", type=valid_stripped_string, if_none=None), + "config": Option("", type=valid_stripped_string), "device_version": Option(-1, type=functools.partial(valid_number, min=-1, max=0xFFFF)), "usb_version": Option(0x0200, type=valid_otg_id), "max_power": Option(250, type=functools.partial(valid_number, min=50, max=500)), "remote_wakeup": Option(True, type=valid_bool), "gadget": Option("kvmd", type=valid_otg_gadget), - "config": Option("PiKVM device", type=valid_stripped_string_not_empty), "udc": Option("", type=valid_stripped_string), "endpoints": Option(9, type=valid_int_f0), "init_delay": Option(3.0, type=valid_float_f01), diff --git a/kvmd/apps/otg/__init__.py b/kvmd/apps/otg/__init__.py index 076fe6b8..670c03c1 100644 --- a/kvmd/apps/otg/__init__.py +++ b/kvmd/apps/otg/__init__.py @@ -285,8 +285,9 @@ def _cmd_start(config: Section) -> None: # pylint: disable=too-many-statements, profile_path = join(gadget_path, usb.G_PROFILE) _mkdir(profile_path) - _mkdir(join(profile_path, "strings/0x409")) - _write(join(profile_path, "strings/0x409/configuration"), f"Config 1: {config.otg.config}") + if config.otg.config: + _mkdir(join(profile_path, "strings/0x409")) + _write(join(profile_path, "strings/0x409/configuration"), config.otg.config) _write(join(profile_path, "MaxPower"), config.otg.max_power) if config.otg.remote_wakeup: # XXX: Should we use MaxPower=100 with Remote Wakeup?