[Windows] Rename console listener to HID listener

qmk · Mar 25, 2024 · d9b256f · d9b256f
1 parent 370f0dc
commit d9b256f
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 26 deletions.
diff --git a/...MK Toolbox/HidConsole/HidConsoleDevice.cs → windows/QMK Toolbox/Hid/HidConsoleDevice.cs b/...MK Toolbox/HidConsole/HidConsoleDevice.cs → windows/QMK Toolbox/Hid/HidConsoleDevice.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace QMK_Toolbox.HidConsole
+namespace QMK_Toolbox.Hid
 {
     public class HidConsoleDevice
     {

diff --git a/...x/HidConsole/HidConsoleWindow.Designer.cs → ... Toolbox/Hid/HidConsoleWindow.Designer.cs b/...x/HidConsole/HidConsoleWindow.Designer.cs → ... Toolbox/Hid/HidConsoleWindow.Designer.cs
diff --git a/...MK Toolbox/HidConsole/HidConsoleWindow.cs → windows/QMK Toolbox/Hid/HidConsoleWindow.cs b/...MK Toolbox/HidConsole/HidConsoleWindow.cs → windows/QMK Toolbox/Hid/HidConsoleWindow.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel;
 using System.Windows.Forms;
 
-namespace QMK_Toolbox.HidConsole
+namespace QMK_Toolbox.Hid
 {
     public partial class HidConsoleWindow : Form
     {
@@ -29,27 +29,27 @@ private void HidConsoleWindow_Load(object sender, EventArgs e)
         {
             CenterToParent();
 
-            consoleListener.consoleDeviceConnected += ConsoleDeviceConnected;
-            consoleListener.consoleDeviceDisconnected += ConsoleDeviceDisconnected;
-            consoleListener.consoleReportReceived += ConsoleReportReceived;
-            consoleListener.Start();
+            hidListener.hidDeviceConnected += HidDeviceConnected;
+            hidListener.hidDeviceDisconnected += HidDeviceDisconnected;
+            hidListener.consoleReportReceived += ConsoleReportReceived;
+            hidListener.Start();
         }
 
         private void HidConsoleWindow_FormClosing(object sender, FormClosingEventArgs e)
         {
-            consoleListener.consoleDeviceConnected -= ConsoleDeviceConnected;
-            consoleListener.consoleDeviceDisconnected -= ConsoleDeviceDisconnected;
-            consoleListener.consoleReportReceived -= ConsoleReportReceived;
-            consoleListener.Dispose();
+            hidListener.hidDeviceConnected -= HidDeviceConnected;
+            hidListener.hidDeviceDisconnected -= HidDeviceDisconnected;
+            hidListener.consoleReportReceived -= ConsoleReportReceived;
+            hidListener.Dispose();
         }
         #endregion
 
         #region HID Console
-        private readonly HidConsoleListener consoleListener = new();
+        private readonly HidListener hidListener = new();
 
         private HidConsoleDevice lastReportedDevice;
 
-        private void ConsoleDeviceConnected(HidConsoleDevice device)
+        private void HidDeviceConnected(HidConsoleDevice device)
         {
             Invoke(new Action(() =>
             {
@@ -59,7 +59,7 @@ private void ConsoleDeviceConnected(HidConsoleDevice device)
             }));
         }
 
-        private void ConsoleDeviceDisconnected(HidConsoleDevice device)
+        private void HidDeviceDisconnected(HidConsoleDevice device)
         {
             Invoke(new Action(() =>
             {
@@ -74,7 +74,7 @@ private void ConsoleReportReceived(HidConsoleDevice device, string report)
             Invoke(new Action(() =>
             {
                 int selectedDevice = consoleList.SelectedIndex;
-                if (selectedDevice == 0 || consoleListener.Devices[selectedDevice - 1] == device)
+                if (selectedDevice == 0 || hidListener.Devices[selectedDevice - 1] == device)
                 {
                     if (lastReportedDevice != device)
                     {
@@ -91,7 +91,7 @@ private void UpdateConsoleList()
             var selected = consoleList.SelectedIndex != -1 ? consoleList.SelectedIndex : 0;
             consoleList.Items.Clear();
 
-            foreach (var device in consoleListener.Devices)
+            foreach (var device in hidListener.Devices)
             {
                 if (device != null)
                 {

diff --git a/... Toolbox/HidConsole/HidConsoleWindow.resx → ...ows/QMK Toolbox/Hid/HidConsoleWindow.resx b/... Toolbox/HidConsole/HidConsoleWindow.resx → ...ows/QMK Toolbox/Hid/HidConsoleWindow.resx
diff --git a/... Toolbox/HidConsole/HidConsoleListener.cs → windows/QMK Toolbox/Hid/HidListener.cs b/... Toolbox/HidConsole/HidConsoleListener.cs → windows/QMK Toolbox/Hid/HidListener.cs
@@ -4,20 +4,20 @@
 using System.Linq;
 using System.Management;
 
-namespace QMK_Toolbox.HidConsole
+namespace QMK_Toolbox.Hid
 {
-    public class HidConsoleListener : IDisposable
+    public class HidListener : IDisposable
     {
         private const ushort ConsoleUsagePage = 0xFF31;
         private const ushort ConsoleUsage = 0x0074;
 
         public List<HidConsoleDevice> Devices { get; private set; }
 
-        public delegate void HidConsoleDeviceEventDelegate(HidConsoleDevice device);
+        public delegate void HidDeviceEventDelegate(HidConsoleDevice device);
         public delegate void HidConsoleReportReceivedDelegate(HidConsoleDevice device, string data);
 
-        public HidConsoleDeviceEventDelegate consoleDeviceConnected;
-        public HidConsoleDeviceEventDelegate consoleDeviceDisconnected;
+        public HidDeviceEventDelegate hidDeviceConnected;
+        public HidDeviceEventDelegate hidDeviceDisconnected;
         public HidConsoleReportReceivedDelegate consoleReportReceived;
 
         private void EnumerateHidDevices(bool connected)
@@ -36,12 +36,12 @@ private void EnumerateHidDevices(bool connected)
 
                     if (device != null && !listed)
                     {
-                        HidConsoleDevice consoleDevice = new(device)
+                        HidConsoleDevice hidDevice = new(device)
                         {
                             consoleReportReceived = HidConsoleReportReceived
                         };
-                        Devices.Add(consoleDevice);
-                        consoleDeviceConnected?.Invoke(consoleDevice);
+                        Devices.Add(hidDevice);
+                        hidDeviceConnected?.Invoke(hidDevice);
                     }
                 }
             }
@@ -59,7 +59,7 @@ private void EnumerateHidDevices(bool connected)
                         }
                         Devices.Remove(device);
                         device.consoleReportReceived = null;
-                        consoleDeviceDisconnected?.Invoke(device);
+                        hidDeviceDisconnected?.Invoke(device);
                     }
                 }
             }

diff --git a/windows/QMK Toolbox/MainWindow.cs b/windows/QMK Toolbox/MainWindow.cs
@@ -1,5 +1,5 @@
 using QMK_Toolbox.Helpers;
-using QMK_Toolbox.HidConsole;
+using QMK_Toolbox.Hid;
 using QMK_Toolbox.KeyTester;
 using QMK_Toolbox.Properties;
 using QMK_Toolbox.Usb;