Compare commits

..

14 Commits

Author SHA1 Message Date
Serge
dd52f8039c Version bump 2023-11-12 11:48:29 +01:00
Serge
9f56aa9d3d Detect Z13 keyboard reconnection https://github.com/seerge/g-helper/issues/1581 2023-11-12 11:48:06 +01:00
Serge
f6602fff3c Remove logo/lid backlight checkboxes for G512LI https://github.com/seerge/g-helper/issues/1575 2023-11-09 12:30:59 +01:00
Serge
5a7dc5c707 Merge branch 'main' of https://github.com/seerge/g-helper 2023-11-08 17:59:18 +01:00
Serge
e6d7a6f8b3 Removed RGB color selection for FX516P https://github.com/seerge/g-helper/issues/1571 2023-11-08 17:59:15 +01:00
Serge
5cd77249a7 Update README.md 2023-11-05 14:16:19 +01:00
Serge
d9e0045af5 ROG key binding for DUO models https://github.com/seerge/g-helper/discussions/1560 2023-11-03 21:55:35 +01:00
Serge
a66df0a394 Allow setting GPU clock limit when clock offsets are default https://github.com/seerge/g-helper/issues/1557 2023-11-03 21:54:41 +01:00
Serge
f7435b2789 More flexible GPU clock limit settings https://github.com/seerge/g-helper/discussions/1555#discussioncomment-7454925 2023-11-02 14:58:43 +01:00
Serge
f49e2ee1e8 Merge branch 'main' of https://github.com/seerge/g-helper 2023-10-31 18:03:25 +01:00
Serge
f854c8e088 Fix for (someitmes) not working hotkeys on Z13 https://github.com/seerge/g-helper/issues/1547 2023-10-31 18:03:23 +01:00
Serge
bc6edcb38e New Crowdin updates (#1537)
* New translations strings.resx (French)

* New translations strings.resx (Portuguese, Brazilian)
2023-10-29 11:39:11 +01:00
Serge
dac7c86f1b Update README.md 2023-10-25 22:35:34 +02:00
Serge
369c89cb8d New translations strings.resx (Ukrainian) (#1524) 2023-10-25 14:04:11 +02:00
13 changed files with 58 additions and 51 deletions

View File

@@ -345,7 +345,7 @@ public static class AppConfig
public static bool IsSingleColor() public static bool IsSingleColor()
{ {
return ContainsModel("GA401") || ContainsModel("FX517Z") || ContainsModel("X13"); return ContainsModel("GA401") || ContainsModel("FX517Z") || ContainsModel("FX516P") || ContainsModel("X13");
} }
public static bool IsStrix() public static bool IsStrix()
@@ -355,7 +355,7 @@ public static class AppConfig
public static bool IsStrixLimitedRGB() public static bool IsStrixLimitedRGB()
{ {
return ContainsModel("G614JV") || ContainsModel("G614JZ"); return ContainsModel("G614JV") || ContainsModel("G614JZ") || ContainsModel("G512LI");
} }
public static bool IsZ13() public static bool IsZ13()

View File

@@ -1,10 +1,7 @@
using GHelper.Gpu; using GHelper.Gpu;
using GHelper.Helpers; using GHelper.Helpers;
using HidLibrary;
using NAudio.Gui;
using System.Diagnostics;
using System.Drawing;
using System.Text; using System.Text;
using HidLibrary;
namespace GHelper namespace GHelper
{ {
@@ -281,18 +278,12 @@ namespace GHelper
{ {
input = device; input = device;
//Logger.WriteLine("HID Device("+ reportID + ")" + + device.Capabilities.FeatureReportByteLength + "|" + device.Capabilities.InputReportByteLength + device.DevicePath); //Logger.WriteLine("HID Device("+ reportID + ")" + + device.Capabilities.FeatureReportByteLength + "|" + device.Capabilities.InputReportByteLength + device.DevicePath);
if (reportID == INPUT_HID_ID && device.Attributes.ProductId == 0x1a30) return input;
} }
return input; return input;
} }
public static bool TouchpadToggle()
{
HidDevice? input = GetDevice();
if (input != null) return input.WriteFeatureData(new byte[] { INPUT_HID_ID, 0xf4, 0x6b });
return false;
}
public static byte[] AuraMessage(int mode, Color color, Color color2, int speed, bool mono = false) public static byte[] AuraMessage(int mode, Color color, Color color2, int speed, bool mono = false)
{ {
@@ -575,7 +566,7 @@ namespace GHelper
SetHeatmap(true); SetHeatmap(true);
timer.Enabled = true; timer.Enabled = true;
return; return;
} }
if (Mode == GPUMODE) if (Mode == GPUMODE)
{ {

View File

@@ -153,7 +153,7 @@ namespace GHelper
labelM1.Text = "FN+F2"; labelM1.Text = "FN+F2";
labelM2.Text = "FN+F3"; labelM2.Text = "FN+F3";
labelM3.Text = "FN+F4"; labelM3.Text = "FN+F4";
labelM4.Visible = comboM4.Visible = textM4.Visible = false; labelM4.Visible = comboM4.Visible = textM4.Visible = AppConfig.IsDUO();
labelFNF4.Visible = comboFNF4.Visible = textFNF4.Visible = false; labelFNF4.Visible = comboFNF4.Visible = textFNF4.Visible = false;
} }

View File

@@ -15,7 +15,7 @@
<PlatformTarget>AnyCPU</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
<ProduceReferenceAssembly>False</ProduceReferenceAssembly> <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks> <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<AssemblyVersion>0.130</AssemblyVersion> <AssemblyVersion>0.131</AssemblyVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

View File

@@ -15,10 +15,10 @@ public class NvidiaGpuControl : IGpuControl
public static int MaxCoreOffset => AppConfig.Get("max_gpu_core", 250); public static int MaxCoreOffset => AppConfig.Get("max_gpu_core", 250);
public static int MaxMemoryOffset => AppConfig.Get("max_gpu_memory", 250); public static int MaxMemoryOffset => AppConfig.Get("max_gpu_memory", 250);
public const int MinCoreOffset = -250; public static int MinCoreOffset = AppConfig.Get("min_gpu_core", -250);
public const int MinMemoryOffset = -250; public static int MinMemoryOffset = AppConfig.Get("min_gpu_memory", -250);
public const int MinClockLimit = 1000; public const int MinClockLimit = 400;
public const int MaxClockLimit = 3000; public const int MaxClockLimit = 3000;
private static PhysicalGPU? _internalGpu; private static PhysicalGPU? _internalGpu;

View File

@@ -133,9 +133,10 @@ namespace GHelper.Helpers
cmd.StartInfo.Arguments = args; cmd.StartInfo.Arguments = args;
cmd.Start(); cmd.Start();
Logger.WriteLine(args);
string result = cmd.StandardOutput.ReadToEnd().Replace(Environment.NewLine, " ").Trim(' '); string result = cmd.StandardOutput.ReadToEnd().Replace(Environment.NewLine, " ").Trim(' ');
Logger.WriteLine(args);
Logger.WriteLine(result); Logger.WriteLine(result);
cmd.WaitForExit(); cmd.WaitForExit();

View File

@@ -68,7 +68,7 @@ namespace GHelper.Input
SetBacklightAuto(); SetBacklightAuto();
} }
//Debug.WriteLine(iddle.TotalSeconds); //Logger.WriteLine("Iddle: " + iddle.TotalSeconds);
} }
public void Init() public void Init()
@@ -514,7 +514,7 @@ namespace GHelper.Input
Logger.WriteLine("Tablet: " + tabletState + " Touchpad: " + touchpadState); Logger.WriteLine("Tablet: " + tabletState + " Touchpad: " + touchpadState);
if (tabletState && touchpadState || !tabletState && !touchpadState) AsusUSB.TouchpadToggle(); if (tabletState && touchpadState || !tabletState && !touchpadState) ToggleTouchpad();
} }

View File

@@ -1,5 +1,4 @@
using GHelper.Battery; using GHelper.Gpu.NVidia;
using GHelper.Gpu.NVidia;
using GHelper.Helpers; using GHelper.Helpers;
using Ryzen; using Ryzen;
@@ -71,7 +70,7 @@ namespace GHelper.Mode
Modes.SetCurrent(mode); Modes.SetCurrent(mode);
int status = Program.acpi.DeviceSet(AsusACPI.PerformanceMode, AppConfig.IsManualModeRequired() ? AsusACPI.PerformanceManual : Modes.GetBase(mode), "Mode"); int status = Program.acpi.DeviceSet(AsusACPI.PerformanceMode, AppConfig.IsManualModeRequired() ? AsusACPI.PerformanceManual : Modes.GetBase(mode), "Mode");
// Vivobook fallback // Vivobook fallback
if (status != 1) if (status != 1)
{ {
@@ -311,13 +310,13 @@ namespace GHelper.Mode
int memory = AppConfig.GetMode("gpu_memory"); int memory = AppConfig.GetMode("gpu_memory");
int clock_limit = AppConfig.GetMode("gpu_clock_limit"); int clock_limit = AppConfig.GetMode("gpu_clock_limit");
if (core == -1 && memory == -1) return; if (core == -1 && memory == -1 && clock_limit == -1) return;
//if ((gpu_core > -5 && gpu_core < 5) && (gpu_memory > -5 && gpu_memory < 5)) launchAsAdmin = false; //if ((gpu_core > -5 && gpu_core < 5) && (gpu_memory > -5 && gpu_memory < 5)) launchAsAdmin = false;
if (Program.acpi.DeviceGet(AsusACPI.GPUEco) == 1) return; if (Program.acpi.DeviceGet(AsusACPI.GPUEco) == 1) { Logger.WriteLine("Clocks: Eco"); return; }
if (HardwareControl.GpuControl is null) return; if (HardwareControl.GpuControl is null) { Logger.WriteLine("Clocks: NoGPUControl"); return; }
if (!HardwareControl.GpuControl!.IsNvidia) return; if (!HardwareControl.GpuControl!.IsNvidia) { Logger.WriteLine("Clocks: NotNvidia"); return; }
using NvidiaGpuControl nvControl = (NvidiaGpuControl)HardwareControl.GpuControl; using NvidiaGpuControl nvControl = (NvidiaGpuControl)HardwareControl.GpuControl;
try try
@@ -328,7 +327,7 @@ namespace GHelper.Mode
} }
catch (Exception ex) catch (Exception ex)
{ {
Logger.WriteLine(ex.ToString()); Logger.WriteLine("Clocks Error:" + ex.ToString());
} }
settings.GPUInit(); settings.GPUInit();

View File

@@ -239,6 +239,7 @@ namespace GHelper.Peripherals
timer.Stop(); timer.Stop();
Logger.WriteLine("HID Device Event: Checking for new ASUS Mice"); Logger.WriteLine("HID Device Event: Checking for new ASUS Mice");
DetectAllAsusMice(); DetectAllAsusMice();
if (AppConfig.IsZ13()) Program.inputDispatcher.Init();
} }
} }
} }

View File

@@ -244,7 +244,7 @@
<value>Équilibré</value> <value>Équilibré</value>
</data> </data>
<data name="BatteryCharge" xml:space="preserve"> <data name="BatteryCharge" xml:space="preserve">
<value>Charge</value> <value>Charge de la batterie</value>
</data> </data>
<data name="BatteryChargeLimit" xml:space="preserve"> <data name="BatteryChargeLimit" xml:space="preserve">
<value>Limite de charge </value> <value>Limite de charge </value>
@@ -253,7 +253,7 @@
<value>Santé de la batterie</value> <value>Santé de la batterie</value>
</data> </data>
<data name="BatteryLimitFull" xml:space="preserve"> <data name="BatteryLimitFull" xml:space="preserve">
<value>One time charge to 100%</value> <value>Charge unique à 100%</value>
</data> </data>
<data name="BiosAndDriverUpdates" xml:space="preserve"> <data name="BiosAndDriverUpdates" xml:space="preserve">
<value>Mise à jour BIOS et pilotes</value> <value>Mise à jour BIOS et pilotes</value>
@@ -262,7 +262,7 @@
<value>Au démarrage</value> <value>Au démarrage</value>
</data> </data>
<data name="BootSound" xml:space="preserve"> <data name="BootSound" xml:space="preserve">
<value>Boot Sound</value> <value>Son au démarrage</value>
</data> </data>
<data name="Brightness" xml:space="preserve"> <data name="Brightness" xml:space="preserve">
<value>Luminosité</value> <value>Luminosité</value>
@@ -274,7 +274,7 @@
<value>Augmenter la luminosité</value> <value>Augmenter la luminosité</value>
</data> </data>
<data name="Calibrate" xml:space="preserve"> <data name="Calibrate" xml:space="preserve">
<value>Calibrate</value> <value>Calibrer</value>
</data> </data>
<data name="Charging" xml:space="preserve"> <data name="Charging" xml:space="preserve">
<value>Chargement en cours</value> <value>Chargement en cours</value>

View File

@@ -118,7 +118,7 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<data name="Acceleration" xml:space="preserve"> <data name="Acceleration" xml:space="preserve">
<value>Acceleration</value> <value>Aceleração</value>
</data> </data>
<data name="ACPIError" xml:space="preserve"> <data name="ACPIError" xml:space="preserve">
<value>Não foi possível conectar ao ASUS ACPI. O aplicativo não pode funcionar sem isso. Tente instalar Asus System Controle Interface</value> <value>Não foi possível conectar ao ASUS ACPI. O aplicativo não pode funcionar sem isso. Tente instalar Asus System Controle Interface</value>
@@ -151,7 +151,7 @@
<value>G-Helper já está em execução. Verifique a barra de sistema</value> <value>G-Helper já está em execução. Verifique a barra de sistema</value>
</data> </data>
<data name="Apply" xml:space="preserve"> <data name="Apply" xml:space="preserve">
<value>Apply</value> <value>Aplicar</value>
</data> </data>
<data name="ApplyFanCurve" xml:space="preserve"> <data name="ApplyFanCurve" xml:space="preserve">
<value>Aplicar a curva personalizada</value> <value>Aplicar a curva personalizada</value>
@@ -172,7 +172,7 @@
<value>Repiração</value> <value>Repiração</value>
</data> </data>
<data name="AuraClockwise" xml:space="preserve"> <data name="AuraClockwise" xml:space="preserve">
<value>Clockwise</value> <value>Sentido horário</value>
</data> </data>
<data name="AuraColorCycle" xml:space="preserve"> <data name="AuraColorCycle" xml:space="preserve">
<value>Ciclo de cores</value> <value>Ciclo de cores</value>
@@ -181,7 +181,7 @@
<value>Comet</value> <value>Comet</value>
</data> </data>
<data name="AuraCounterClockwise" xml:space="preserve"> <data name="AuraCounterClockwise" xml:space="preserve">
<value>Counterclockwise</value> <value>Sentido anti-horário</value>
</data> </data>
<data name="AuraFast" xml:space="preserve"> <data name="AuraFast" xml:space="preserve">
<value>Rápido</value> <value>Rápido</value>
@@ -196,7 +196,7 @@
<value>Arco-íris</value> <value>Arco-íris</value>
</data> </data>
<data name="AuraRandomColor" xml:space="preserve"> <data name="AuraRandomColor" xml:space="preserve">
<value>Random</value> <value>Aleatório</value>
</data> </data>
<data name="AuraReact" xml:space="preserve"> <data name="AuraReact" xml:space="preserve">
<value>React</value> <value>React</value>
@@ -211,7 +211,7 @@
<value>Estroboscópio</value> <value>Estroboscópio</value>
</data> </data>
<data name="AuraZoneAll" xml:space="preserve"> <data name="AuraZoneAll" xml:space="preserve">
<value>All</value> <value>Tudo</value>
</data> </data>
<data name="AuraZoneDock" xml:space="preserve"> <data name="AuraZoneDock" xml:space="preserve">
<value>Dock</value> <value>Dock</value>
@@ -226,7 +226,7 @@
<value>Underglow</value> <value>Underglow</value>
</data> </data>
<data name="AutoApply" xml:space="preserve"> <data name="AutoApply" xml:space="preserve">
<value>Auto Apply</value> <value>Aplicar automaticamente</value>
</data> </data>
<data name="AutoMode" xml:space="preserve"> <data name="AutoMode" xml:space="preserve">
<value>Automático</value> <value>Automático</value>
@@ -250,7 +250,7 @@
<value>Limite de carga</value> <value>Limite de carga</value>
</data> </data>
<data name="BatteryHealth" xml:space="preserve"> <data name="BatteryHealth" xml:space="preserve">
<value>Battery Health</value> <value>Saúde da bateria</value>
</data> </data>
<data name="BatteryLimitFull" xml:space="preserve"> <data name="BatteryLimitFull" xml:space="preserve">
<value>One time charge to 100%</value> <value>One time charge to 100%</value>
@@ -262,7 +262,7 @@
<value>Ao ligar</value> <value>Ao ligar</value>
</data> </data>
<data name="BootSound" xml:space="preserve"> <data name="BootSound" xml:space="preserve">
<value>Boot Sound</value> <value>Som de inicialização</value>
</data> </data>
<data name="Brightness" xml:space="preserve"> <data name="Brightness" xml:space="preserve">
<value>Nível do brilho</value> <value>Nível do brilho</value>
@@ -289,7 +289,7 @@
<value>Personalizado</value> <value>Personalizado</value>
</data> </data>
<data name="Deceleration" xml:space="preserve"> <data name="Deceleration" xml:space="preserve">
<value>Deceleration</value> <value>Desaceleração</value>
</data> </data>
<data name="Default" xml:space="preserve"> <data name="Default" xml:space="preserve">
<value>Padrão</value> <value>Padrão</value>
@@ -301,7 +301,7 @@
<value>Descarregando</value> <value>Descarregando</value>
</data> </data>
<data name="DownloadUpdate" xml:space="preserve"> <data name="DownloadUpdate" xml:space="preserve">
<value>Download</value> <value>Baixar</value>
</data> </data>
<data name="DriverAndSoftware" xml:space="preserve"> <data name="DriverAndSoftware" xml:space="preserve">
<value>Drivers and Software</value> <value>Drivers and Software</value>

View File

@@ -118,7 +118,7 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<data name="Acceleration" xml:space="preserve"> <data name="Acceleration" xml:space="preserve">
<value>Acceleration</value> <value>Прискорення</value>
</data> </data>
<data name="ACPIError" xml:space="preserve"> <data name="ACPIError" xml:space="preserve">
<value>Не вдається під'єднатися до ASUS ACPI. Програма не може працювати без нього. Спробуйте встановити Asus System Control Interface</value> <value>Не вдається під'єднатися до ASUS ACPI. Програма не може працювати без нього. Спробуйте встановити Asus System Control Interface</value>
@@ -253,7 +253,7 @@
<value>Стан батареї</value> <value>Стан батареї</value>
</data> </data>
<data name="BatteryLimitFull" xml:space="preserve"> <data name="BatteryLimitFull" xml:space="preserve">
<value>One time charge to 100%</value> <value>Одноразовий заряд до 100%</value>
</data> </data>
<data name="BiosAndDriverUpdates" xml:space="preserve"> <data name="BiosAndDriverUpdates" xml:space="preserve">
<value>Оновлення BIOS та драйверів</value> <value>Оновлення BIOS та драйверів</value>
@@ -262,7 +262,7 @@
<value>Старт</value> <value>Старт</value>
</data> </data>
<data name="BootSound" xml:space="preserve"> <data name="BootSound" xml:space="preserve">
<value>Boot Sound</value> <value>Звук завантаження</value>
</data> </data>
<data name="Brightness" xml:space="preserve"> <data name="Brightness" xml:space="preserve">
<value>Яскравість</value> <value>Яскравість</value>
@@ -274,7 +274,7 @@
<value>Підвищити яскравість</value> <value>Підвищити яскравість</value>
</data> </data>
<data name="Calibrate" xml:space="preserve"> <data name="Calibrate" xml:space="preserve">
<value>Calibrate</value> <value>Калібрування</value>
</data> </data>
<data name="Charging" xml:space="preserve"> <data name="Charging" xml:space="preserve">
<value>Зарядка</value> <value>Зарядка</value>
@@ -289,7 +289,7 @@
<value>Своє</value> <value>Своє</value>
</data> </data>
<data name="Deceleration" xml:space="preserve"> <data name="Deceleration" xml:space="preserve">
<value>Deceleration</value> <value>Уповільнення</value>
</data> </data>
<data name="Default" xml:space="preserve"> <data name="Default" xml:space="preserve">
<value>За замовчуванням</value> <value>За замовчуванням</value>

View File

@@ -74,6 +74,21 @@ Each BIOS mode is paired with matching Windows Power Mode. You can adjust this s
![GPU Modes](https://github.com/seerge/g-helper/assets/5920850/65c6bdd5-728c-4965-b544-fcf5a85ed6a2) ![GPU Modes](https://github.com/seerge/g-helper/assets/5920850/65c6bdd5-728c-4965-b544-fcf5a85ed6a2)
### :mouse: Asus Mouse and other peripherals support
[Currently supported models](https://github.com/seerge/g-helper/discussions/900)
- ROG Harpe Ace Aim Lab Edition
- ROG Keris Wireless
- ROG Chakram X (P708)
- ROG Strix III Gladius III Aimpoint Wireless (P711)
- ROG Gladius III
- ROG Gladius III Wireless
- ROG Strix Impact II Wireless
- TUF Gaming M4 Wireless (P306)
- TUF Gaming M3
Huge thanks to [@IceStormNG](https://github.com/IceStormNG) 👑 for contribution and research (!).
## :question: FAQ ## :question: FAQ
#### How do I stop the Armoury Crate install popup appearing every time I press the M4 / Rog key? #### How do I stop the Armoury Crate install popup appearing every time I press the M4 / Rog key?
@@ -298,7 +313,7 @@ If you don't want this bindings to work you can add
### Toggle Performance Mode or Toggle App Window key binding ### Toggle Performance Mode or Toggle App Window key binding
To change binding for Toggle Performance Modes to ``Ctrl + Shift + KEY`` To change binding for Toggle Performance Modes forward / backward to ``Ctrl + Shift + KEY`` / ``Ctrl + Shift + Alt + KEY``
``` ```
"keybind_profile": 116, "keybind_profile": 116,
``` ```