EA to public

HandheldCompanion.iss

@@ -26,7 +26,7 @@
 #define InstallerVersion '0.2'
 #define MyAppSetupName 'Handheld Companion'
 #define MyBuildId 'HandheldCompanion'
-#define MyAppVersion '0.21.0.1'
+#define MyAppVersion '0.21.2.4'
 #define MyAppPublisher 'BenjaminLSR'
 #define MyAppCopyright 'Copyright @ BenjaminLSR'
 #define MyAppURL 'https://github.com/Valkirie/HandheldCompanion'

HandheldCompanion/App.config

@@ -68,12 +68,6 @@
    <setting name="OverlayControllerRestingPitch" serializeAs="String">
     <value>0</value>
    </setting>
-   <setting name="OverlayControllerRestingYaw" serializeAs="String">
-    <value>0</value>
-   </setting>
-   <setting name="OverlayControllerRestingRoll" serializeAs="String">
-    <value>0</value>
-   </setting>
    <setting name="SensorPlacementUpsideDown" serializeAs="String">
     <value>False</value>
    </setting>
@@ -87,7 +81,7 @@
     <value>30</value>
    </setting>
    <setting name="OverlayRenderAntialiasing" serializeAs="String">
-    <value>False</value>
+    <value>True</value>
    </setting>
    <setting name="OverlayFaceCamera" serializeAs="String">
     <value>True</value>
@@ -186,7 +180,7 @@
     <value>True</value>
    </setting>
    <setting name="QuickToolsLocation" serializeAs="String">
-    <value>3</value>
+    <value>1</value>
    </setting>
    <setting name="QuicktoolsBackdrop" serializeAs="String">
     <value>1</value>
@@ -269,9 +263,6 @@
    <setting name="OnScreenDisplayVRAMLevel" serializeAs="String">
     <value>2</value>
    </setting>
-   <setting name="OnScreenDisplayBatteryLevel" serializeAs="String">
-    <value>2</value>
-   </setting>
    <setting name="OnScreenDisplayFPSLevel" serializeAs="String">
     <value>2</value>
    </setting>

HandheldCompanion/App.xaml.cs

@@ -36,10 +36,8 @@ protected override void OnStartup(StartupEventArgs args)
         var CurrentAssembly = Assembly.GetExecutingAssembly();
         var fileVersionInfo = FileVersionInfo.GetVersionInfo(CurrentAssembly.Location);
 
-        // set environment variables
-        Environment.SetEnvironmentVariable("APP_BASE_DIRECTORY", AppContext.BaseDirectory);
-
         // initialize log
+        Environment.SetEnvironmentVariable("APP_BASE_DIRECTORY", AppContext.BaseDirectory);
         LogManager.Initialize("HandheldCompanion");
         LogManager.LogInformation("{0} ({1})", CurrentAssembly.GetName(), fileVersionInfo.FileVersion);
 

HandheldCompanion/Controls/ProcessEx.cs

@@ -71,38 +71,55 @@ public static string GetAppCompatFlags(string Path)
         if (string.IsNullOrEmpty(Path))
             return string.Empty;
 
-        using (var key = Registry.CurrentUser.OpenSubKey(AppCompatRegistry))
+        lock (registryLock)
         {
-            string valueStr = (string)key?.GetValue(Path);
-            return valueStr;
+            try
+            {
+                using (var key = Registry.CurrentUser.OpenSubKey(AppCompatRegistry))
+                {
+                    string valueStr = (string)key?.GetValue(Path);
+                    return valueStr;
+                }
+            }
+            catch { }
         }
+
+        return string.Empty;
     }
 
+    private static object registryLock = new();
     public static void SetAppCompatFlag(string Path, string Flag, bool value)
     {
         if (string.IsNullOrEmpty(Path))
             return;
 
-        using (var key = Registry.CurrentUser.CreateSubKey(AppCompatRegistry, RegistryKeyPermissionCheck.ReadWriteSubTree))
+        lock (registryLock)
         {
-            if (key != null)
+            try
             {
-                List<string> values = new List<string> { "~" }; ;
-                string valueStr = (string)key.GetValue(Path);
+                using (var key = Registry.CurrentUser.CreateSubKey(AppCompatRegistry, RegistryKeyPermissionCheck.ReadWriteSubTree))
+                {
+                    if (key != null)
+                    {
+                        List<string> values = new List<string> { "~" }; ;
+                        string valueStr = (string)key.GetValue(Path);
 
-                if (!string.IsNullOrEmpty(valueStr))
-                    values = valueStr.Split(' ').ToList();
+                        if (!string.IsNullOrEmpty(valueStr))
+                            values = valueStr.Split(' ').ToList();
 
-                values.Remove(Flag);
+                        values.Remove(Flag);
 
-                if (value)
-                    values.Add(Flag);
+                        if (value)
+                            values.Add(Flag);
 
-                if (values.Count == 1 && values[0] == "~" && !string.IsNullOrEmpty(valueStr))
-                    key.DeleteValue(Path);
-                else
-                    key.SetValue(Path, string.Join(" ", values), RegistryValueKind.String);
+                            if (values.Count == 1 && values[0] == "~" && !string.IsNullOrEmpty(valueStr))
+                                key.DeleteValue(Path);
+                            else
+                                key.SetValue(Path, string.Join(" ", values), RegistryValueKind.String);
+                    }
+                }
             }
+            catch { }
         }
     }
 

HandheldCompanion/Devices/AOKZOE/AOKZOEA1.cs

@@ -127,6 +127,6 @@ public override string GetGlyph(ButtonFlags button)
                 return "\u2211";
         }
 
-        return defaultGlyph;
+        return base.GetGlyph(button);
     }
 }

HandheldCompanion/Devices/AOKZOE/AOKZOEA2.cs

@@ -0,0 +1,166 @@
+using HidLibrary;
+using System;
+using System.Linq;
+using System.Windows.Media;
+using static HandheldCompanion.Utils.DeviceUtils;
+
+namespace HandheldCompanion.Devices;
+
+public class AOKZOEA2 : AOKZOEA1Pro
+{
+    HidDevice hidDevice;
+
+    public AOKZOEA2()
+    {
+        // device specific settings
+        ProductModel = "AOKZOEA2";
+
+        // device specific capacities
+        Capabilities |= DeviceCapabilities.DynamicLighting;
+        Capabilities |= DeviceCapabilities.DynamicLightingBrightness;
+        DynamicLightingCapabilities |= LEDLevel.SolidColor;
+        DynamicLightingCapabilities |= LEDLevel.Rainbow;
+
+        // LED HID Device
+        _vid = 0x1A2C;
+        _pid = 0xB001;
+    }
+    public override bool IsReady()
+    {
+        // Prepare list for all HID devices
+        HidDevice[] HidDeviceList = HidDevices.Enumerate(_vid, new int[] { _pid }).ToArray();
+
+        // Check every HID device to find LED device
+        foreach (HidDevice device in HidDeviceList)
+        {
+            // OneXFly device for LED control does not support a FeatureReport, hardcoded to match the Interface Number
+            if (device.IsConnected && device.DevicePath.Contains("&mi_00"))
+            {
+                hidDevice = device;
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public override bool SetLedBrightness(int brightness)
+    {
+        // OneXFly brightness range is: 0 - 4 range, 0 is off, convert from 0 - 100 % range
+        brightness = (int)Math.Round(brightness / 20.0);
+
+        // Check if device is availible
+        if (hidDevice is null || !hidDevice.IsConnected)
+            return false;
+
+        // Define the HID message for setting brightness.
+        byte[] msg = { 0x00, 0x07, 0xFF, 0xFD, 0x01, 0x05, (byte)brightness };
+
+        // Write the HID message to set the LED brightness.
+        hidDevice.Write(msg);
+
+        return true;
+    }
+
+    public override bool SetLedColor(Color mainColor, Color secondaryColor, LEDLevel level, int speed = 100)
+    {
+        if (!DynamicLightingCapabilities.HasFlag(level))
+            return false;
+
+        // Data message consists of a prefix, LED option, RGB data, and closing byte (0x00)
+        byte[] prefix = { 0x00, 0x07, 0xFF };
+        byte[] LEDOption = { 0x00 };
+        byte[] rgbData = { 0x00 };
+
+        // Perform functions and command build-up based on LED level
+        switch (level)
+        {
+            case LEDLevel.SolidColor:
+                // Find nearest possible color due to RGB limitations of the device
+                Color ledColor = FindClosestColor(mainColor);
+
+                LEDOption = new byte[] { 0xFE };
+
+                // RGB data repeats 20 times, fill accordingly
+                rgbData = Enumerable.Repeat(new[] { ledColor.R, ledColor.G, ledColor.B }, 20)
+                                    .SelectMany(colorBytes => colorBytes)
+                                    .ToArray();
+                break;
+
+            case LEDLevel.Rainbow:
+                // OneXConsole "Flowing Light" effect as a rainbow effect
+                LEDOption = new byte[] { 0x03 };
+
+                // RGB data empty, repeats 60 times, fill accordingly
+                rgbData = Enumerable.Repeat((byte)0x00, 60).ToArray();
+                break;
+
+            default:
+                return false;
+        }
+
+        // Check if device is availible
+        if (hidDevice is null || !hidDevice.IsConnected)
+            return false;
+
+        // Combine prefix, LED Option, RGB data, and closing byte (0x00)
+        byte[] msg = prefix.Concat(LEDOption).Concat(rgbData).Concat(new byte[] { 0x00 }).ToArray();
+
+        // Write the HID message to set the RGB color effect
+        hidDevice.Write(msg);
+
+        return true;
+    }
+
+    static Color FindClosestColor(Color inputColor)
+    {
+        // Predefined colors that work on the device
+        Color[] predefinedColors = new Color[]
+        {
+            Color.FromRgb(255, 0, 0),         // Red (255,0,0) 
+            Color.FromRgb(255, 82, 0),        // Orange (255, 165, 0)
+            Color.FromRgb(255, 255, 0),       // Yellow (255, 255, 0)
+            Color.FromRgb(130, 255, 0),       // Lime Green (50, 205, 50)
+            Color.FromRgb(0, 255, 0),         // Green (0, 128, 0)
+            Color.FromRgb(0, 255, 110),       // Turquoise (Cyan) (0, 255, 255)
+            Color.FromRgb(0, 255, 255),       // Teal (0, 128, 128)
+            Color.FromRgb(130, 255, 255),     // Blue (? ? ?)
+            Color.FromRgb(0, 0, 255),         // Dark Blue (? ? ?)
+            Color.FromRgb(122, 0, 255),       // Purple (Violet) (128, 0, 128)
+            Color.FromRgb(255, 0, 255),       // Pink (255, 182, 193)
+            Color.FromRgb(255, 0, 129),       // Magenta (255, 0, 255)
+        };
+
+        // Initialize with the first color
+        Color closestColor = predefinedColors[0];
+        double minDistance = CalculateDistance(inputColor, closestColor);
+
+        // Iterate through predefined colors to find the closest one
+        foreach (var predefinedColor in predefinedColors)
+        {
+            double distance = CalculateDistance(inputColor, predefinedColor);
+
+            // Update closest color if a closer one is found
+            if (distance < minDistance)
+            {
+                minDistance = distance;
+                closestColor = predefinedColor;
+            }
+        }
+
+        // Return the closest predefined color
+        return closestColor;
+    }
+
+    static double CalculateDistance(Color color1, Color color2)
+    {
+        // Helper method to calculate the Euclidean distance between two colors
+
+        int deltaR = color2.R - color1.R;
+        int deltaG = color2.G - color1.G;
+        int deltaB = color2.B - color1.B;
+
+        // Euclidean distance formula
+        return Math.Sqrt(deltaR * deltaR + deltaG * deltaG + deltaB * deltaB);
+    }
+}

HandheldCompanion/Devices/ASUS/ROGAlly.cs

@@ -328,6 +328,15 @@ public override bool Open()
         if (asusACPI is null)
             return false;
 
+        if (hidDevices.TryGetValue(INPUT_HID_ID, out HidDevice device))
+        {
+            device.OpenDevice();
+            device.MonitorDeviceEvents = true;
+
+            Task<HidReport> ReportDevice = Task.Run(async () => await device.ReadReportAsync());
+            ReportDevice.ContinueWith(t => OnReport(ReportDevice.Result, device));
+        }
+
         // force M1/M2 to send F17 and F18
         ConfigureController(true);
 
@@ -369,32 +378,27 @@ public override bool IsReady()
 
             if (device.ReadFeatureData(out byte[] data, INPUT_HID_ID))
             {
-                device.OpenDevice();
-                device.MonitorDeviceEvents = true;
-
                 hidDevices[INPUT_HID_ID] = device;
-
-                Task<HidReport> ReportDevice = Task.Run(async () => await device.ReadReportAsync());
-                ReportDevice.ContinueWith(t => OnReport(ReportDevice.Result, device));
             }
             else if (device.ReadFeatureData(out data, AURA_HID_ID))
             {
                 hidDevices[AURA_HID_ID] = device;
             }
         }
 
-        hidDevices.TryGetValue(INPUT_HID_ID, out HidDevice hidDevice);
-        if (hidDevice is null || !hidDevice.IsConnected)
-            return false;
+        if (hidDevices.TryGetValue(INPUT_HID_ID, out HidDevice hidDevice))
+        {
+            PnPDevice pnpDevice = PnPDevice.GetDeviceByInterfaceId(hidDevice.DevicePath);
+            string device_parent = pnpDevice.GetProperty<string>(DevicePropertyKey.Device_Parent);
 
-        PnPDevice pnpDevice = PnPDevice.GetDeviceByInterfaceId(hidDevice.DevicePath);
-        string device_parent = pnpDevice.GetProperty<string>(DevicePropertyKey.Device_Parent);
+            PnPDevice pnpParent = PnPDevice.GetDeviceByInstanceId(device_parent);
+            Guid parent_guid = pnpParent.GetProperty<Guid>(DevicePropertyKey.Device_ClassGuid);
+            string parent_instanceId = pnpParent.GetProperty<string>(DevicePropertyKey.Device_InstanceId);
 
-        PnPDevice pnpParent = PnPDevice.GetDeviceByInstanceId(device_parent);
-        Guid parent_guid = pnpParent.GetProperty<Guid>(DevicePropertyKey.Device_ClassGuid);
-        string parent_instanceId = pnpParent.GetProperty<string>(DevicePropertyKey.Device_InstanceId);
+            return DeviceHelper.IsDeviceAvailable(parent_guid, parent_instanceId);
+        }
 
-        return DeviceHelper.IsDeviceAvailable(parent_guid, parent_instanceId);
+        return false;
     }
 
     private void OnReport(HidReport result, HidDevice device)
@@ -612,7 +616,7 @@ public override string GetGlyph(ButtonFlags button)
                 return "\u2213";
         }
 
-        return defaultGlyph;
+        return base.GetGlyph(button);
     }
 
     private void ConfigureController(bool Remap)

HandheldCompanion/Devices/AYANEO/AYANEO2021.cs

@@ -70,6 +70,6 @@ public override string GetGlyph(ButtonFlags button)
                 return "\u243D";
         }
 
-        return defaultGlyph;
+        return base.GetGlyph(button);
     }
 }