Merge branch 'main' of https://github.com/seerge/g-helper

.github/workflows/release.yml

@@ -3,6 +3,8 @@ name: Release
 on:
   release:
     types: [ published ]
+  workflow_dispatch:
+  
 
 permissions:
   contents: write
@@ -20,9 +22,18 @@ jobs:
     - name: Publish
       run: |
         dotnet publish app/GHelper.sln --configuration Release --runtime win-x64 -p:PublishSingleFile=true --no-self-contained
-        powershell Compress-Archive app/bin/x64/Release/net7.0-windows/win-x64/publish/* GHelper.zip
+        powershell Compress-Archive app/bin/x64/Release/net7.0-windows/win-x64/publish/* GHelper-${{ github.sha }}.zip
+    
     - name: Upload
+      if: github.event_name != 'workflow_dispatch'
       env:
         GH_TOKEN: ${{ github.token }}
       run: |
         gh release upload ${{ github.ref_name }} GHelper.zip
+
+    - name: Artifact
+      if: github.event_name == 'workflow_dispatch'
+      uses: actions/upload-artifact@v3
+      with:
+        name: GHelper-release-${{ github.sha }}
+        path: GHelper-*.zip

app/Peripherals/Mouse/Models/Chakram.cs

@@ -0,0 +1,209 @@
+
+namespace GHelper.Peripherals.Mouse.Models
+{
+    //P704
+    public class Chakram : AsusMouse
+    {
+        public Chakram() : base(0x0B05, 0x18E5, "mi_00", true) { 
+        
+        }
+
+        protected Chakram(ushort vendorId, bool wireless) : base(0x0B05, vendorId, "mi_00", wireless)
+        {
+        }
+        public override int DPIProfileCount()
+        {
+            return 4;
+        }
+
+        public override string GetDisplayName()
+        {
+            return "ROG Chakram (Wireless)";
+        }
+
+        public override PollingRate[] SupportedPollingrates()
+        {
+            return new PollingRate[] {
+                PollingRate.PR125Hz,
+                PollingRate.PR250Hz,
+                PollingRate.PR500Hz,
+                PollingRate.PR1000Hz
+            };
+        }
+
+
+        public override int ProfileCount()
+        {
+            return 3;
+        }
+        public override int MaxDPI()
+        {
+            return 16_000;
+        }
+
+        public override bool HasDebounceSetting()
+        {
+            return true;
+        }
+        public override bool HasLiftOffSetting()
+        {
+            return true;
+        }
+        public override int DPIIncrements()
+        {
+            return 100;
+        }
+
+        public override bool HasRGB()
+        {
+            return true;
+        }
+        public override int MaxBrightness()
+        {
+            return 4;
+        }
+
+        public override LightingZone[] SupportedLightingZones()
+        {
+            return new LightingZone[] { LightingZone.Logo, LightingZone.Scrollwheel, LightingZone.Underglow };
+        }
+
+        public override bool HasAutoPowerOff()
+        {
+            return true;
+        }
+
+        public override bool HasAngleSnapping()
+        {
+            return true;
+        }
+
+        public override bool HasAngleTuning()
+        {
+            return false;
+        }
+
+        public override bool HasLowBatteryWarning()
+        {
+            return true;
+        }
+
+        public override int LowBatteryWarningStep()
+        {
+            return 25;
+        }
+
+        public override int LowBatteryWarningMax()
+        {
+            return 100;
+        }
+
+        protected override int ParseBattery(byte[] packet)
+        {
+            return base.ParseBattery(packet) * 25;
+        }
+        protected override int ParseLowBatteryWarning(byte[] packet)
+        {
+            return base.ParseLowBatteryWarning(packet) * 25;
+        }
+        protected override byte[] GetUpdateEnergySettingsPacket(int lowBatteryWarning, PowerOffSetting powerOff)
+        {
+            return base.GetUpdateEnergySettingsPacket(lowBatteryWarning / 25, powerOff);
+        }
+        protected override byte[] GetReadLightingModePacket(LightingZone zone)
+        {
+            return new byte[] { 0x00, 0x12, 0x03, 0x00 };
+        }
+
+        protected LightingSetting? ParseLightingSetting(byte[] packet, LightingZone zone)
+        {
+            if (packet[1] != 0x12 || packet[2] != 0x03)
+            {
+                return null;
+            }
+
+            int offset = 5 + (((int)zone) * 5);
+
+            LightingSetting setting = new LightingSetting();
+
+            setting.LightingMode = LightingModeForIndex(packet[offset + 0]);
+            setting.Brightness = packet[offset + 1];
+
+            setting.RGBColor = Color.FromArgb(packet[offset + 2], packet[offset + 3], packet[offset + 4]);
+
+            setting.AnimationDirection = SupportsAnimationDirection(setting.LightingMode)
+                 ? (AnimationDirection)packet[21]
+                 : AnimationDirection.Clockwise;
+
+            if (setting.AnimationDirection != AnimationDirection.Clockwise
+                && setting.AnimationDirection != AnimationDirection.CounterClockwise)
+            {
+                setting.AnimationDirection = AnimationDirection.Clockwise;
+            }
+
+            setting.RandomColor = SupportsRandomColor(setting.LightingMode) && packet[22] == 0x01;
+            setting.AnimationSpeed = SupportsAnimationSpeed(setting.LightingMode)
+                ? (AnimationSpeed)packet[23]
+                : AnimationSpeed.Medium;
+
+            //If the mouse reports an out of range value, which it does when the current setting has no speed option, chose medium as default
+            if (setting.AnimationSpeed != AnimationSpeed.Fast
+                && setting.AnimationSpeed != AnimationSpeed.Medium
+                && setting.AnimationSpeed != AnimationSpeed.Slow)
+            {
+                setting.AnimationSpeed = AnimationSpeed.Medium;
+            }
+            return setting;
+        }
+
+        public override void ReadLightingSetting()
+        {
+            if (!HasRGB())
+            {
+                return;
+            }
+            //Mouse sends all lighting zones in one response
+            //21: Direction
+            //22: Random
+            //23: Speed
+            //                                                                  20 21 22 23
+            //00 12 03 00 00 [03 04 00 00 ff] [03 04 00 00 ff] [03 04 00 00 ff] 00 04 00 00
+            //00 12 03 00 00 [05 02 ff 00 ff] [05 02 ff 00 ff] [05 02 ff 00 ff] 00 01 01 00
+            //00 12 03 00 00 [03 01 00 00 ff] [03 01 00 00 ff] [03 01 00 00 ff] 00 01 00 01
+            byte[]? response = WriteForResponse(GetReadLightingModePacket(LightingZone.All));
+            if (response is null) return;
+
+            LightingZone[] lz = SupportedLightingZones();
+            for (int i = 0; i < lz.Length; ++i)
+            {
+                LightingSetting? ls = ParseLightingSetting(response, lz[i]);
+                if (ls is null)
+                {
+                    Logger.WriteLine(GetDisplayName() + ": Failed to read RGB Setting for Zone " + lz[i].ToString());
+                    continue;
+                }
+
+                Logger.WriteLine(GetDisplayName() + ": Read RGB Setting for Zone " + lz[i].ToString() + ": " + ls.ToString());
+                LightingSetting[i] = ls;
+            }
+        }
+
+        public override bool CanChangeDPIProfile()
+        {
+            return false;
+        }
+    }
+
+
+    public class ChakramWired : Chakram
+    {
+        public ChakramWired() : base(0x18E3, false)
+        {
+        }
+
+        public override string GetDisplayName()
+        {
+            return "ROG Chakram (Wired)";
+        }
+    }
+}

app/Peripherals/PeripheralsProvider.cs

@@ -206,6 +206,8 @@ namespace GHelper.Peripherals
             DetectMouse(new PugioII());
             DetectMouse(new PugioIIWired());
             DetectMouse(new StrixImpactII());
+            DetectMouse(new Chakram());
+            DetectMouse(new ChakramWired());
         }
 
         public static void DetectMouse(AsusMouse am)

app/Properties/Strings.pl.resx

@@ -253,7 +253,7 @@
     <value>Stan baterii</value>
   </data>
   <data name="BatteryLimitFull" xml:space="preserve">
-    <value>One time charge to 100%</value>
+    <value>Jednorazowo naładuj do 100%</value>
   </data>
   <data name="BiosAndDriverUpdates" xml:space="preserve">
     <value>Aktualizacje BIOS i sterowników</value>

app/Properties/Strings.zh-CN.resx

@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Acceleration" xml:space="preserve">
-    <value>Acceleration</value>
+    <value>加速</value>
   </data>
   <data name="ACPIError" xml:space="preserve">
     <value>无法连接到ASUS ACPI。 没有它应用程序将无法运行。 请尝试安装Asus System Control Interface驱动。</value>
@@ -223,7 +223,7 @@
     <value>滚轮</value>
   </data>
   <data name="AuraZoneUnderglow" xml:space="preserve">
-    <value>Underglow</value>
+    <value>底灯</value>
   </data>
   <data name="AutoApply" xml:space="preserve">
     <value>自动应用</value>
@@ -253,7 +253,7 @@
     <value>电池健康</value>
   </data>
   <data name="BatteryLimitFull" xml:space="preserve">
-    <value>One time charge to 100%</value>
+    <value>一次性充电至 100%</value>
   </data>
   <data name="BiosAndDriverUpdates" xml:space="preserve">
     <value>BIOS 和驱动程序更新</value>
@@ -274,7 +274,7 @@
     <value>提高亮度</value>
   </data>
   <data name="Calibrate" xml:space="preserve">
-    <value>Calibrate</value>
+    <value>校准</value>
   </data>
   <data name="Charging" xml:space="preserve">
     <value>充电中</value>
@@ -289,7 +289,7 @@
     <value>自定义设置</value>
   </data>
   <data name="Deceleration" xml:space="preserve">
-    <value>Deceleration</value>
+    <value>减速</value>
   </data>
   <data name="Default" xml:space="preserve">
     <value>默认</value>
@@ -313,12 +313,12 @@
     <value>集显模式</value>
   </data>
   <data name="EnableOptimusText" xml:space="preserve">
-    <value>若未在nVIDIA控制面板的混合显示模式中设置为Optimus，关闭独立显卡可能会导致亮度控制在系统重启前都不可用。 
+    <value>NVIDIA 控制面板中的显示模式未设置为 Optimus 时，通过集显模式禁用独立显卡可能会使亮度控制出现问题，直到下次重启后才能恢复。
 
 确定还要继续吗？</value>
   </data>
   <data name="EnableOptimusTitle" xml:space="preserve">
-    <value>NVIDIA 显示模式未设置为自动切换</value>
+    <value>NVIDIA 显示模式未设置为 Optimus</value>
   </data>
   <data name="EnergySettings" xml:space="preserve">
     <value>电源设置</value>
@@ -342,7 +342,7 @@
     <value>GPU 风扇配置文件</value>
   </data>
   <data name="FanProfileMid" xml:space="preserve">
-    <value>中等风扇配置</value>
+    <value>Mid 风扇配置文件</value>
   </data>
   <data name="FanProfiles" xml:space="preserve">
     <value>风扇配置</value>
@@ -465,7 +465,7 @@
     <value>分钟</value>
   </data>
   <data name="Minutes" xml:space="preserve">
-    <value>分组</value>
+    <value>分钟</value>
   </data>
   <data name="MouseAngleSnapping" xml:space="preserve">
     <value>角度校正</value>
@@ -477,7 +477,7 @@
     <value>按键响应</value>
   </data>
   <data name="MouseLiftOffDistance" xml:space="preserve">
-    <value>静默高度</value>
+    <value>响应高度</value>
   </data>
   <data name="MouseLowBatteryWarning" xml:space="preserve">
     <value>低于该电量时警告</value>