Merge pull request #14 from utajum/i2c-hid

utajum · web-flow · commit 03d65ba196fe · 2026-03-08T16:28:13.000+01:00
Add I2C-HID keyboard RGB support and fix power limit controls
diff --git a/.upstream-last-checked b/.upstream-last-checked
@@ -1 +1 @@
-f6614776dee111103b2ae8bf03677c17b6104e2f
+d9f4a60203d0bde376c10f0918687aea3ae831a3
diff --git a/install/90-ghelper.rules b/install/90-ghelper.rules
@@ -105,9 +105,15 @@ SUBSYSTEM=="hwmon", ATTR{name}=="asus_custom_fan_curve", \
 SUBSYSTEM=="input", ATTRS{name}=="Asus WMI hotkeys", TAG+="uaccess"
 
 # ── ASUS HID devices (AURA RGB keyboard control) ──
-# Grant read/write access to ASUS HID raw devices for non-root AURA control
+# Grant read/write access to ASUS HID raw devices for non-root AURA control.
+# USB-HID: match via USB parent's idVendor attribute
 SUBSYSTEM=="hidraw", ATTRS{idVendor}=="0b05", MODE="0666"
 SUBSYSTEM=="usb", ATTRS{idVendor}=="0b05", MODE="0666"
+# I2C-HID: ASUS keyboards connected via I2C (e.g., FA608PP: ITE51368:00 0B05:19B6)
+# have no USB parent, so ATTRS{idVendor} won't match. Match via the HID device
+# uevent which contains the vendor ID in HID_ID field.
+SUBSYSTEM=="hidraw", ACTION=="add", \
+  RUN+="/bin/sh -c 'grep -q 00000B05 /sys%p/device/uevent 2>/dev/null && chmod 0666 /dev/%k'"
 
 # ── Backlight ──
 SUBSYSTEM=="backlight", ACTION=="add", \
diff --git a/src/Helpers/AppConfig.cs b/src/Helpers/AppConfig.cs
@@ -421,7 +421,7 @@ public static bool IsStrixLimitedRGB() =>
         ContainsModel("G513R") || ContainsModel("G713QM") || ContainsModel("G713PV") || ContainsModel("G513IE") ||
         ContainsModel("G713RC") || ContainsModel("G713IC") || ContainsModel("G713PU") || ContainsModel("G513QM") ||
         ContainsModel("G513QC") || ContainsModel("G531G") || ContainsModel("G615JMR") || ContainsModel("G615LM") ||
-        ContainsModel("G615LR") || ContainsModel("G815LR");
+        ContainsModel("G815LR");
     public static bool IsPossible4ZoneRGB() =>
         ContainsModel("G614JI_") || ContainsModel("G614JV_") || ContainsModel("G614JZ") ||
         ContainsModel("G614JU") || IsStrixLimitedRGB();
diff --git a/src/Helpers/Diagnostics.cs b/src/Helpers/Diagnostics.cs
@@ -200,6 +200,8 @@ private static void AppendSysfsState(StringBuilder sb)
             // Keyboard
             "/sys/class/leds/asus::kbd_backlight/brightness",
             "/sys/class/leds/asus::kbd_backlight/multi_intensity",
+            "/sys/class/leds/asus::kbd_backlight/kbd_rgb_mode",
+            "/sys/class/leds/asus::kbd_backlight/kbd_rgb_state",
             // Platform profile
             "/sys/firmware/acpi/platform_profile",
             "/sys/firmware/acpi/platform_profile_choices",
@@ -228,6 +230,27 @@ private static void AppendSysfsState(StringBuilder sb)
             sb.AppendLine($"  {shortPath}: {perms} = {value}");
         }
 
+        // Keyboard backlight directory listing (TUF kbd_rgb_mode/state diagnostics)
+        const string kbdDir = "/sys/class/leds/asus::kbd_backlight";
+        if (Directory.Exists(kbdDir))
+        {
+            sb.AppendLine();
+            sb.AppendLine("  kbd_backlight attributes:");
+            try
+            {
+                foreach (var file in Directory.GetFiles(kbdDir).OrderBy(f => f))
+                {
+                    var name = Path.GetFileName(file);
+                    var perms = GetFilePermissions(file);
+                    sb.AppendLine($"    {name}: {perms}");
+                }
+            }
+            catch (Exception ex)
+            {
+                sb.AppendLine($"    (error: {ex.Message})");
+            }
+        }
+
         // Resolved WMI attributes (may be legacy sysfs or firmware-attributes)
         sb.AppendLine();
         sb.AppendLine("  WMI attributes (resolved via ResolveAttrPath):");
@@ -318,6 +341,32 @@ private static void AppendUsbDevices(StringBuilder sb)
             "-c \"lsusb 2>/dev/null | grep -i '0b05' || echo '(none found)'\"");
         sb.AppendLine(lsusb ?? "(lsusb failed)");
         sb.AppendLine();
+
+        // Also scan native hidraw devices (catches I2C-HID that lsusb misses)
+        sb.AppendLine("--- HID Raw Devices (ASUS, incl. I2C-HID) ---");
+        try
+        {
+            var devices = USB.HidrawHelper.EnumerateAsusDevices();
+            if (devices.Count == 0)
+            {
+                sb.AppendLine("(none found)");
+            }
+            else
+            {
+                foreach (var dev in devices)
+                {
+                    sb.AppendLine($"  {dev.Path}: VID=0x{dev.Vendor:X4} PID=0x{dev.Product:X4} Bus={dev.BusName} Aura={dev.HasAuraReport}");
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            sb.AppendLine($"  (error: {ex.Message})");
+        }
+
+        sb.AppendLine($"AsusHid.IsAvailable: {USB.AsusHid.IsAvailable()}");
+        sb.AppendLine($"AsusHid.UsingI2cHidraw: {USB.AsusHid.UsingI2cHidraw}");
+        sb.AppendLine();
     }
 
     private static void AppendFirmwareAttributes(StringBuilder sb)
diff --git a/src/Mode/ModeControl.cs b/src/Mode/ModeControl.cs
@@ -233,6 +233,16 @@ private void AutoPower(int mode)
             Helpers.Logger.WriteLine($"AutoPower: PL2 = {pl2}W (max={maxTotal}W)");
         }
 
+        // fPPT (fast boost)
+        int fppt = Helpers.AppConfig.GetMode("limit_fppt");
+        if (fppt > maxTotal || fppt < MinTotal) fppt = -1;
+        if (fppt > 0 && wmi.IsFeatureSupported("ppt_fppt"))
+        {
+            wmi.SetPptLimit("ppt_fppt", fppt);
+            if (fppt > _customPower) _customPower = fppt;
+            Helpers.Logger.WriteLine($"AutoPower: fPPT = {fppt}W (max={maxTotal}W)");
+        }
+
         // NVIDIA dynamic boost
         int nvBoost = Helpers.AppConfig.GetMode("gpu_boost");
         if (nvBoost > maxGpuBoost) nvBoost = maxGpuBoost;
diff --git a/src/UI/Views/FansWindow.axaml b/src/UI/Views/FansWindow.axaml
@@ -83,6 +83,19 @@
                                VerticalAlignment="Center" />
                 </Grid>
 
+                <!-- PPT fPPT (fast boost) -->
+                <Grid x:Name="gridFppt" ColumnDefinitions="120,*,50" Margin="0,4" IsVisible="False">
+                    <TextBlock Grid.Column="0" Text="CPU fPPT (Fast)"
+                               Classes="label-dim" VerticalAlignment="Center" />
+                    <Slider Grid.Column="1" x:Name="sliderFppt"
+                            Minimum="5" Maximum="150" Value="65"
+                            TickFrequency="5"
+                            ValueChanged="SliderFppt_ValueChanged" />
+                    <TextBlock Grid.Column="2" x:Name="labelFppt" Classes="value"
+                               Text="65W" HorizontalAlignment="Center"
+                               VerticalAlignment="Center" />
+                </Grid>
+
                 <!-- CPU Boost -->
                 <Grid ColumnDefinitions="120,*" Margin="0,8,0,0">
                     <TextBlock Grid.Column="0" Text="CPU Boost"
@@ -95,6 +108,12 @@
                     </StackPanel>
                 </Grid>
 
+                <!-- Auto-apply power -->
+                <CheckBox x:Name="checkApplyPower"
+                          Content="Auto-apply power limits on mode change" Margin="0,8,0,0"
+                          Checked="CheckApplyPower_Changed"
+                          Unchecked="CheckApplyPower_Changed" />
+
                 <!-- Sensor readings -->
                 <TextBlock x:Name="labelSensors" Classes="label-dim"
                            Text="" Margin="0,8,0,0" />
diff --git a/src/UI/Views/FansWindow.axaml.cs b/src/UI/Views/FansWindow.axaml.cs
@@ -130,15 +130,25 @@ private void CheckApplyFans_Changed(object? sender, RoutedEventArgs e)
         Helpers.AppConfig.SetMode("auto_apply_fans", enabled ? 1 : 0);
     }
 
+    private void CheckApplyPower_Changed(object? sender, RoutedEventArgs e)
+    {
+        bool enabled = checkApplyPower.IsChecked ?? false;
+        Helpers.AppConfig.SetMode("auto_apply_power", enabled ? 1 : 0);
+    }
+
     // ── Power Limits ──
 
     private void LoadPowerLimits()
     {
         var wmi = App.Wmi;
         if (wmi == null) return;
 
+        // Read from hardware, fall back to saved config
         int pl1 = wmi.GetPptLimit("ppt_pl1_spl");
+        if (pl1 <= 0) pl1 = Helpers.AppConfig.GetMode("limit_slow");
+
         int pl2 = wmi.GetPptLimit("ppt_pl2_sppt");
+        if (pl2 <= 0) pl2 = Helpers.AppConfig.GetMode("limit_fast");
 
         if (pl1 > 0)
         {
@@ -151,6 +161,22 @@ private void LoadPowerLimits()
             sliderPL2.Value = pl2;
             labelPL2.Text = $"{pl2}W";
         }
+
+        // fPPT (fast boost) — only show if supported
+        bool hasFppt = wmi.IsFeatureSupported("ppt_fppt");
+        gridFppt.IsVisible = hasFppt;
+        if (hasFppt)
+        {
+            int fppt = wmi.GetPptLimit("ppt_fppt");
+            if (fppt <= 0) fppt = Helpers.AppConfig.GetMode("limit_fppt");
+            if (fppt > 0)
+            {
+                sliderFppt.Value = fppt;
+                labelFppt.Text = $"{fppt}W";
+            }
+        }
+
+        checkApplyPower.IsChecked = Helpers.AppConfig.IsMode("auto_apply_power");
     }
 
     private void SliderPL1_ValueChanged(object? sender,
@@ -159,6 +185,7 @@ private void SliderPL1_ValueChanged(object? sender,
         int watts = (int)e.NewValue;
         labelPL1.Text = $"{watts}W";
         App.Wmi?.SetPptLimit("ppt_pl1_spl", watts);
+        Helpers.AppConfig.SetMode("limit_slow", watts);
     }
 
     private void SliderPL2_ValueChanged(object? sender,
@@ -167,6 +194,16 @@ private void SliderPL2_ValueChanged(object? sender,
         int watts = (int)e.NewValue;
         labelPL2.Text = $"{watts}W";
         App.Wmi?.SetPptLimit("ppt_pl2_sppt", watts);
+        Helpers.AppConfig.SetMode("limit_fast", watts);
+    }
+
+    private void SliderFppt_ValueChanged(object? sender,
+        Avalonia.Controls.Primitives.RangeBaseValueChangedEventArgs e)
+    {
+        int watts = (int)e.NewValue;
+        labelFppt.Text = $"{watts}W";
+        App.Wmi?.SetPptLimit("ppt_fppt", watts);
+        Helpers.AppConfig.SetMode("limit_fppt", watts);
     }
 
     // ── CPU Boost ──
diff --git a/src/UI/Views/MainWindow.axaml.cs b/src/UI/Views/MainWindow.axaml.cs
@@ -700,12 +700,26 @@ private void InitAura()
 
         Helpers.Logger.WriteLine("AURA HID device found — initializing RGB controls");
 
-        // Load saved values
+        // Send AURA HID init handshake (wake up the LED controller).
+        // This is critical for I2C-HID keyboards (e.g., FA608PP) that need
+        // the handshake before they respond to any RGB commands.
+        // On Windows, G-Helper's Aura.Init() does this in InputDispatcher.AutoKeyboard().
+        Aura.Init();
+
+        // Load saved values into static fields BEFORE applying to hardware
         Aura.Mode = (AuraMode)Helpers.AppConfig.Get("aura_mode");
         Aura.Speed = (AuraSpeed)Helpers.AppConfig.Get("aura_speed");
         Aura.SetColor(Helpers.AppConfig.Get("aura_color", unchecked((int)0xFFFFFFFF)));
         Aura.SetColor2(Helpers.AppConfig.Get("aura_color2", 0));
 
+        // Apply saved power state + mode so the keyboard lights up on startup
+        // (runs on background thread after config values are loaded above)
+        Task.Run(() =>
+        {
+            Aura.ApplyPower();
+            Aura.ApplyAura();
+        });
+
         _suppressAuraEvents = true;
 
         // Populate mode combo
diff --git a/src/USB/AsusHid.cs b/src/USB/AsusHid.cs
diff --git a/src/USB/Aura.cs b/src/USB/Aura.cs
diff --git a/src/USB/HidrawHelper.cs b/src/USB/HidrawHelper.cs

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-f6614776dee111103b2ae8bf03677c17b6104e2f`
	`1`	`+d9f4a60203d0bde376c10f0918687aea3ae831a3`