From 318594ae64066ef33a012c134092752a138bfbc1 Mon Sep 17 00:00:00 2001 From: Adrian Date: Sat, 25 Jan 2025 15:44:20 -0600 Subject: [PATCH] added config default values --- config.go | 4 ++-- usb.go | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/config.go b/config.go index 5537834..4b067da 100644 --- a/config.go +++ b/config.go @@ -39,8 +39,8 @@ var defaultConfig = &Config{ CloudURL: "https://api.jetkvm.com", AutoUpdateEnabled: true, // Set a default value UsbConfig: UsbConfig{ - UsbVendorId: "0x1d6b", - UsbProductId: "0104", + UsbVendorId: "0x1d6b", //The Linux Foundation + UsbProductId: "0x0104", //Multifunction Composite Gadget¬ UsbSerialNumber: "", UsbManufacturer: "JetKVM", UsbProduct: "JetKVM USB Emulation Device", diff --git a/usb.go b/usb.go index 9ed43fd..e8e0dfa 100644 --- a/usb.go +++ b/usb.go @@ -117,10 +117,11 @@ func writeGadgetConfig() error { return err } + LoadConfig() err = writeGadgetAttrs(kvmGadgetPath, [][]string{ - {"bcdUSB", "0x0200"}, //USB 2.0 - {"idVendor", "0x1d6b"}, //The Linux Foundation - {"idProduct", "0104"}, //Multifunction Composite Gadget¬ + {"bcdUSB", "0x0200"}, //USB 2.0 + {"idVendor", config.UsbConfig.UsbVendorId}, + {"idProduct", config.UsbConfig.UsbProductId}, {"bcdDevice", "0100"}, }) if err != nil { @@ -135,8 +136,8 @@ func writeGadgetConfig() error { err = writeGadgetAttrs(gadgetStringsPath, [][]string{ {"serialnumber", GetDeviceID()}, - {"manufacturer", "JetKVM"}, - {"product", "JetKVM USB Emulation Device"}, + {"manufacturer", config.UsbConfig.UsbManufacturer}, + {"product", config.UsbConfig.UsbProduct}, }) if err != nil { return err