From 834952ca335e5028b05f32fd62fc818f7d4d45f0 Mon Sep 17 00:00:00 2001 From: IceStormNG Date: Tue, 25 Jul 2023 19:14:40 +0200 Subject: [PATCH 1/2] Use device correct name for logging --- app/Peripherals/PeripheralsProvider.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Peripherals/PeripheralsProvider.cs b/app/Peripherals/PeripheralsProvider.cs index 702c2631..69bff958 100644 --- a/app/Peripherals/PeripheralsProvider.cs +++ b/app/Peripherals/PeripheralsProvider.cs @@ -145,7 +145,7 @@ namespace GHelper.Peripherals { if (am.IsDeviceConnected() && !ConnectedMice.Contains(am)) { - Logger.WriteLine("Detected a new ROG Chakram X. Connecting..."); + Logger.WriteLine("Detected a new" + am.GetDisplayName() + " . Connecting..."); Connect(am); } } From a706d447f68d1816ff78c2729e5dc5de6f575812 Mon Sep 17 00:00:00 2001 From: IceStormNG Date: Tue, 25 Jul 2023 19:18:51 +0200 Subject: [PATCH 2/2] Only do packet logging if config usb_packet_logger is 1 or if it is a debug build. --- app/Peripherals/Mouse/AsusMouse.cs | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/app/Peripherals/Mouse/AsusMouse.cs b/app/Peripherals/Mouse/AsusMouse.cs index dfb2b656..59d92223 100644 --- a/app/Peripherals/Mouse/AsusMouse.cs +++ b/app/Peripherals/Mouse/AsusMouse.cs @@ -206,6 +206,16 @@ namespace GHelper.Peripherals.Mouse } } + private static bool IsPacketLoggerEnabled() + { +#if DEBUG + return true; +#else + + return AppConfig.Get("usb_packet_logger") == 1; +#endif + } + [MethodImpl(MethodImplOptions.Synchronized)] protected virtual byte[]? WriteForResponse(byte[] packet) { @@ -213,11 +223,15 @@ namespace GHelper.Peripherals.Mouse try { - Logger.WriteLine(GetDisplayName() + ": Sending packet: " + ByteArrayToString(packet)); + if (IsPacketLoggerEnabled()) + Logger.WriteLine(GetDisplayName() + ": Sending packet: " + ByteArrayToString(packet)); + Write(packet); Read(response); - Logger.WriteLine(GetDisplayName() + ": Read packet: " + ByteArrayToString(response)); + + if (IsPacketLoggerEnabled()) + Logger.WriteLine(GetDisplayName() + ": Read packet: " + ByteArrayToString(response)); } catch (IOException e) {