Compare commits

...

27 Commits

Author SHA1 Message Date
Serge
f94d76aab9 Version bump 2023-12-22 21:51:57 +01:00
Serge
57b896d05a Aura GPU mode simplification 2023-12-22 21:41:53 +01:00
Serge
27b78ba1cf Aura tweaks 2023-12-22 20:53:51 +01:00
Serge
eea453b3c4 Airplane mode hotkey https://github.com/seerge/g-helper/issues/1765 2023-12-21 13:20:26 +01:00
Serge
e5dd7f54af Aura tweaks 2023-12-20 12:00:03 +01:00
Serge
149ed7f81b Aura improvements 2023-12-20 11:48:10 +01:00
Serge
88d4e5d3a8 Aura fixes 2023-12-20 01:48:55 +01:00
Serge
77f8d34d13 Version bump 2023-12-20 00:34:25 +01:00
Serge
02aef7f2f3 Merge branch 'main' of https://github.com/seerge/g-helper 2023-12-20 00:23:40 +01:00
Serge
edc434a890 Imprpved ambient mode 2023-12-20 00:23:38 +01:00
Serge
b337a226da Update README.md 2023-12-19 15:30:20 +01:00
Serge
03e6e69fb4 Update README.md 2023-12-19 15:24:20 +01:00
Serge
f852fbadb6 Update README.md 2023-12-19 15:23:18 +01:00
Serge
b95d676285 Merge branch 'main' of https://github.com/seerge/g-helper 2023-12-19 12:31:25 +01:00
Serge
fafa27b2a0 Enable GPU on shutdown option for FA506 https://github.com/seerge/g-helper/issues/1755#issuecomment-1862465947 2023-12-19 12:31:23 +01:00
IceStormNG
e7ceb2feaf Support for ASUS TuF M3 Gen II (#1762)
* Added support for ROG Chakram Core (P511)

* Add support for the TUF M3 Gen II
2023-12-19 12:29:12 +01:00
Serge
62f280b0b9 Custom aura colors will be saved to config 2023-12-18 17:39:58 +01:00
Serge
d179fe6b86 UI Fix 2023-12-18 17:23:23 +01:00
Serge
291909749a Merge branch 'main' of https://github.com/seerge/g-helper 2023-12-18 16:46:58 +01:00
Serge
883ec1828b Version bump 2023-12-18 16:46:55 +01:00
Serge
55a75f79b0 New Crowdin updates (#1752)
* New translations strings.resx (French)

* New translations strings.resx (French)
2023-12-17 19:34:02 +01:00
Serge
5c6deb902c Added G15 2022 to the list of devies with enabling GPU on shutdown https://github.com/seerge/g-helper/issues/1755 2023-12-17 19:33:46 +01:00
Serge
fac634b460 Hide SPPT for unsupported models https://github.com/seerge/g-helper/issues/1753 2023-12-17 19:30:47 +01:00
Serge
41e74084ac Chart temps tooltip rounding tweak https://github.com/seerge/g-helper/discussions/1744 2023-12-17 11:18:47 +01:00
Serge
bc8084f3e0 Matrix brightness control via hotkeys https://github.com/seerge/g-helper/issues/1733 2023-12-16 11:07:56 +01:00
Serge
e8d0030444 Merge branch 'main' of https://github.com/seerge/g-helper 2023-12-16 10:40:48 +01:00
Serge
4cf4e2eb66 Hide unsupported power sliders https://github.com/seerge/g-helper/discussions/1747 2023-12-16 10:40:46 +01:00
11 changed files with 121 additions and 46 deletions

View File

@@ -428,7 +428,7 @@ public static class AppConfig
public static bool IsGPUFixNeeded()
{
return ContainsModel("GA402X") || ContainsModel("GV302") || ContainsModel("GV301") || ContainsModel("GZ301") || ContainsModel("FX506") || ContainsModel("GU603") || ContainsModel("GU604") || ContainsModel("G614J");
return ContainsModel("GA402X") || ContainsModel("GV302") || ContainsModel("GV301") || ContainsModel("GZ301") || ContainsModel("FX506") || ContainsModel("FA506") || ContainsModel("GU603") || ContainsModel("GU604") || ContainsModel("G614J") || ContainsModel("GA503");
}
public static bool IsGPUFix()

View File

@@ -37,6 +37,7 @@ public class AsusACPI
public const uint UniversalControl = 0x00100021;
public const int Airplane = 0x88;
public const int KB_Light_Up = 0xc4;
public const int KB_Light_Down = 0xc5;
public const int Brightness_Down = 0x10;

View File

@@ -599,7 +599,7 @@ namespace GHelper
int Max = FanSensorControl.GetFanMax(device);
if (fanRpm)
return (200 * Math.Round((float)(Min * 100 + (Max - Min) * percentage) / 200)).ToString() + unit;
return (200 * Math.Floor((float)(Min * 100 + (Max - Min) * percentage) / 200)).ToString() + unit;
else
return percentage + "%";
}
@@ -790,6 +790,7 @@ namespace GHelper
{
bool modeA0 = (Program.acpi.DeviceGet(AsusACPI.PPT_TotalA0) >= 0 || RyzenControl.IsAMD());
bool modeA3 = Program.acpi.DeviceGet(AsusACPI.PPT_APUA3) >= 0;
bool modeB0 = Program.acpi.IsAllAmdPPT();
bool modeC1 = Program.acpi.DeviceGet(AsusACPI.PPT_APUC1) >= 0;
@@ -809,12 +810,15 @@ namespace GHelper
}
else
{
panelA3.Visible = modeA3;
if (RyzenControl.IsAMD())
{
labelLeftA0.Text = "CPU Sustained (SPL)";
labelLeftA3.Text = "CPU Slow (sPPT)";
labelLeftC1.Text = "CPU Fast (fPPT)";
panelC1.Visible = modeC1;
}
else
{
@@ -1146,7 +1150,7 @@ namespace GHelper
tip = true;
}
labelTip.Text = Math.Round(curPoint.XValue) + "C, " + ChartYLabel((int)curPoint.YValues[0], device, " " + Properties.Strings.RPM);
labelTip.Text = Math.Floor(curPoint.XValue) + "C, " + ChartYLabel((int)curPoint.YValues[0], device, " " + Properties.Strings.RPM);
labelTip.Top = e.Y + ((Control)sender).Top;
labelTip.Left = e.X - 50;

View File

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

View File

@@ -584,6 +584,9 @@ namespace GHelper.Input
case 55: // Arconym
KeyProcess("m6");
return;
case 136: // FN + F12
Program.acpi.DeviceSet(AsusACPI.UniversalControl, AsusACPI.Airplane, "Airplane");
return;
case 181: // FN + Numpad Enter
KeyProcess("fne");
return;
@@ -634,13 +637,19 @@ namespace GHelper.Input
{
case 16: // FN+F7
if (Control.ModifierKeys == Keys.Shift)
SetScreenpad(-10);
{
if (AppConfig.IsDUO()) SetScreenpad(-10);
else Program.settingsForm.BeginInvoke(Program.settingsForm.CycleMatrix, -1);
}
else
Program.acpi.DeviceSet(AsusACPI.UniversalControl, AsusACPI.Brightness_Down, "Brightness");
break;
case 32: // FN+F8
if (Control.ModifierKeys == Keys.Shift)
SetScreenpad(10);
{
if (AppConfig.IsDUO()) SetScreenpad(10);
else Program.settingsForm.BeginInvoke(Program.settingsForm.CycleMatrix, 1);
}
else
Program.acpi.DeviceSet(AsusACPI.UniversalControl, AsusACPI.Brightness_Up, "Brightness");
break;

View File

@@ -7,6 +7,10 @@
{
}
public TUFM3(ushort productId, string path) : base(0x0B05, productId, path, false)
{
}
public override int DPIProfileCount()
{
return 4;
@@ -109,4 +113,16 @@
|| lightingMode == LightingMode.React;
}
}
public class TUFM3GenII : TUFM3
{
public TUFM3GenII() : base(0x1A9B, "mi_02")
{
}
public override string GetDisplayName()
{
return "TUF GAMING M3 (Gen II)";
}
}
}

View File

@@ -200,6 +200,7 @@ namespace GHelper.Peripherals
DetectMouse(new HarpeAceAimLabEditionWired());
DetectMouse(new HarpeAceAimLabEditionOmni());
DetectMouse(new TUFM3());
DetectMouse(new TUFM3GenII());
DetectMouse(new TUFM5());
DetectMouse(new KerisWirelssAimpoint());
DetectMouse(new KerisWirelssAimpointWired());

View File

@@ -124,10 +124,10 @@
<value>Connexion impossible avec ASUS ACPI. L'application ne peut fonctionner sans. Veuillez installer Asus System Control Interface</value>
</data>
<data name="AlertAPUMemoryRestart" xml:space="preserve">
<value>Restart your device to apply changes</value>
<value>Redémarrez votre appareil pour appliquer les modifications</value>
</data>
<data name="AlertAPUMemoryRestartTitle" xml:space="preserve">
<value>Restart now?</value>
<value>Redémarrer maintenant ?</value>
</data>
<data name="AlertDGPU" xml:space="preserve">
<value>Le GPU semble être surchargé, voulez vous le désactiver ?</value>
@@ -169,7 +169,7 @@
<value>Ajustement auto des modes de gestion alim. Windows</value>
</data>
<data name="APUMemory" xml:space="preserve">
<value>Memory Assigned to GPU</value>
<value>Mémoire attribuée au GPU</value>
</data>
<data name="AsusServicesRunning" xml:space="preserve">
<value>Services Asus actifs</value>
@@ -247,7 +247,7 @@
<value>Allumé</value>
</data>
<data name="BacklightTimeout" xml:space="preserve">
<value>Délai d'activation de la batterie (0 - ON)</value>
<value>Délai branché / sur batterie (0 - ON)</value>
</data>
<data name="Balanced" xml:space="preserve">
<value>Équilibré</value>
@@ -354,7 +354,7 @@ Voulez-vous continuer ?</value>
<value>Profil du ventilateur central</value>
</data>
<data name="FanProfiles" xml:space="preserve">
<value>Profil</value>
<value>Profil des ventilateurs</value>
</data>
<data name="FansAndPower" xml:space="preserve">
<value>Ventilateurs + Puissance</value>
@@ -399,7 +399,7 @@ Voulez-vous continuer ?</value>
<value>Température cible</value>
</data>
<data name="HibernateAfter" xml:space="preserve">
<value>Minutes jusqu'à la mise en veille prolongée sur la batterie (0 - OFF)</value>
<value>Minutes avant mise en veille prolongée sur batterie (0 - OFF)</value>
</data>
<data name="High" xml:space="preserve">
<value>Élevé</value>

View File

@@ -604,16 +604,7 @@ namespace GHelper
private void PictureColor2_Click(object? sender, EventArgs e)
{
ColorDialog colorDlg = new ColorDialog();
colorDlg.AllowFullOpen = true;
colorDlg.Color = pictureColor2.BackColor;
if (colorDlg.ShowDialog() == DialogResult.OK)
{
AppConfig.Set("aura_color2", colorDlg.Color.ToArgb());
SetAura();
}
SetColorPicker("aura_color2");
}
private void PictureColor_Click(object? sender, EventArgs e)
@@ -681,20 +672,31 @@ namespace GHelper
FansToggle();
}
private void ButtonKeyboardColor_Click(object? sender, EventArgs e)
private void SetColorPicker(string colorField = "aura_color")
{
ColorDialog colorDlg = new ColorDialog();
colorDlg.AllowFullOpen = true;
colorDlg.Color = pictureColor.BackColor;
try
{
colorDlg.CustomColors = AppConfig.GetString("aura_color_custom", "").Split('-').Select(int.Parse).ToArray();
}
catch (Exception ex) { }
if (colorDlg.ShowDialog() == DialogResult.OK)
{
AppConfig.Set("aura_color", colorDlg.Color.ToArgb());
AppConfig.Set("aura_color_custom", string.Join("-", colorDlg.CustomColors));
AppConfig.Set(colorField, colorDlg.Color.ToArgb());
SetAura();
}
}
private void ButtonKeyboardColor_Click(object? sender, EventArgs e)
{
SetColorPicker("aura_color");
}
public void InitAura()
{
Aura.Mode = (AuraMode)AppConfig.Get("aura_mode");
@@ -761,6 +763,15 @@ namespace GHelper
}
public void CycleMatrix(int delta)
{
comboMatrix.SelectedIndex = Math.Min(Math.Max(0, comboMatrix.SelectedIndex + delta), comboMatrix.Items.Count - 1);
AppConfig.Set("matrix_brightness", comboMatrix.SelectedIndex);
matrixControl.SetMatrix();
Program.toast.RunToast(comboMatrix.GetItemText(comboMatrix.SelectedItem), delta > 0 ? ToastIcon.BacklightUp : ToastIcon.BacklightDown);
}
public void CycleAuraMode()
{
if (comboKeyboard.SelectedIndex < comboKeyboard.Items.Count - 1)

View File

@@ -248,15 +248,12 @@ namespace GHelper.USB
public static void Init()
{
Task.Run(async () =>
{
AsusHid.Write(new List<byte[]> {
new byte[] { AsusHid.AURA_ID, 0xb9 },
Encoding.ASCII.GetBytes("]ASUS Tech.Inc."),
new byte[] { AsusHid.AURA_ID, 0x05, 0x20, 0x31, 0, 0x1a },
//Encoding.ASCII.GetBytes("^ASUS Tech.Inc."),
//new byte[] { 0x5e, 0x05, 0x20, 0x31, 0, 0x1a }
});
AsusHid.Write(new List<byte[]> {
new byte[] { AsusHid.AURA_ID, 0xb9 },
Encoding.ASCII.GetBytes("]ASUS Tech.Inc."),
new byte[] { AsusHid.AURA_ID, 0x05, 0x20, 0x31, 0, 0x1a },
//Encoding.ASCII.GetBytes("^ASUS Tech.Inc."),
//new byte[] { 0x5e, 0x05, 0x20, 0x31, 0, 0x1a }
});
}
@@ -523,7 +520,7 @@ namespace GHelper.USB
}
public static void ApplyColor(Color color, bool init = false)
public static void ApplyDirect(Color color, bool init = false)
{
if (isACPI)
@@ -532,18 +529,29 @@ namespace GHelper.USB
return;
}
if (isStrix && !isOldHeatmap)
if (isStrix)
{
ApplyDirect(Enumerable.Repeat(color, AURA_ZONES).ToArray(), init);
return;
}
else
if (init)
{
AsusHid.WriteAura(AuraMessage(0, color, color, 0));
AsusHid.WriteAura(MESSAGE_SET);
Init();
AsusHid.WriteAura(new byte[] { AsusHid.AURA_ID, 0xbc, 1 });
}
byte[] buffer = new byte[64];
buffer[0] = AsusHid.AURA_ID;
buffer[1] = 0xbc;
buffer[2] = 1;
buffer[3] = 1;
buffer[9] = color.R;
buffer[10] = color.G;
buffer[11] = color.B;
AsusHid.WriteAura(buffer);
}
public static void ApplyAura()
@@ -556,6 +564,8 @@ namespace GHelper.USB
timer.Enabled = false;
Logger.WriteLine($"AuraMode: {Mode}");
if (Mode == AuraMode.HEATMAP)
{
CustomRGB.ApplyHeatmap(true);
@@ -568,7 +578,7 @@ namespace GHelper.USB
{
CustomRGB.ApplyAmbient(true);
timer.Enabled = true;
timer.Interval = 100;
timer.Interval = 120;
return;
}
@@ -595,18 +605,23 @@ namespace GHelper.USB
{
if ((AuraMode)AppConfig.Get("aura_mode") != AuraMode.GPUMODE) return;
Color color;
switch (GPUModeControl.gpuMode)
{
case AsusACPI.GPUModeUltimate:
ApplyColor(Color.Red, true);
color = Color.Red;
break;
case AsusACPI.GPUModeEco:
ApplyColor(Color.Green, true);
color = Color.Green;
break;
default:
ApplyColor(Color.Yellow, true);
color = Color.Yellow;
break;
}
AsusHid.Write(new List<byte[]> { AuraMessage(AuraMode.AuraStatic, color, color, 0xeb, isSingleColor), MESSAGE_APPLY, MESSAGE_SET });
}
public static void ApplyHeatmap(bool init = false)
@@ -622,7 +637,7 @@ namespace GHelper.USB
else if (cpuTemp < hot) color = ColorUtils.GetWeightedAverage(Color.Yellow, Color.Red, ((float)cpuTemp - warm) / (hot - warm));
else color = Color.Red;
ApplyColor(color, init);
ApplyDirect(color, init);
}
@@ -663,7 +678,7 @@ namespace GHelper.USB
screen_low.Dispose();
screeb_pxl.Dispose();
bool is_fresh = false;
bool is_fresh = init;
for (int i = 0; i < zones; i++)
{
@@ -674,7 +689,7 @@ namespace GHelper.USB
if (is_fresh)
{
if (isStrix) ApplyDirect(AmbientData.result, init);
else ApplyColor(AmbientData.result[0], init);
else ApplyDirect(AmbientData.result[0], init);
}
}

View File

@@ -9,6 +9,7 @@ Small and lightweight Armoury Crate alternative for Asus laptops offering almost
- Don't forget to [**Check Requirements**](#requirements-mandatory) and [**Read FAQ**](#question-faq)
- If you like this app, please give it a star :star: and spread the word about it!
- If you have general problems, you may check [**Troubleshooting section**](https://github.com/seerge/g-helper?tab=readme-ov-file#wrench-troubleshooting)
#### Support project in [:euro: EUR](https://www.paypal.com/donate/?hosted_button_id=4HMSHS4EBQWTA) | [💵 USD](https://www.paypal.com/donate/?hosted_button_id=SRM6QUX6ACXDY)
@@ -180,6 +181,23 @@ Turn OFF laptop. Press and hold the "power" button for 30-40 seconds. Then boot
Small and lightweight Armoury Crate alternative for Asus laptops offering almost same functionality without extra bloat and unnecessary services. Works on ROG G14, G15, G16, M16, X13, Z13, X16, TUF, Scar, Vivobook, ProArt and all other popular models.
-----------------------------
## :wrench: Troubleshooting
_NOTE: This section is not related to G-Helper anyhow, but since people often come to this repository asking about general problems with their laptops I have listed the most frequent troubleshooting advice that I can give._
### Hardware reset / CMOS reset
All Asus laptops have an option to do a hardware reset that can be handy sometimes. It doesn't touch your data, but resets all main hardware-related things (enables your dGPU, wakes up wifi/bt adapter if it hangs for some reason, etc.).
Turn OFF laptop. Press and hold the "power" button for 30-40 seconds. Then boot normally (it will take a bit longer to boot)
### Resetting windows power plan to defaults
Copy and paste the command below into Windows Terminal, and press Enter.
```
powercfg -restoredefaultschemes
```
### Reinstalling GPU drivers
- For AMD devices (including ones who use integrated graphics) you can use [AMD official cleanup utility](https://www.amd.com/en/support/kb/faq/gpu-601) to completely uninstall existing drivers from safe mode. After that you can download and install latest official drivers from [AMD website](https://www.amd.com/en/support)
- For NVidia / Intel devices you can use the [Display Driver Uninstaller](https://www.guru3d.com/download/display-driver-uninstaller-download/) app to completely uninstall existing drivers. After that you can download and install latest official drivers from [Nvidia website](https://www.nvidia.com/download/index.aspx)
## :euro: [Support Project](https://www.paypal.com/donate/?hosted_button_id=4HMSHS4EBQWTA)
#### If you like the app you can make a Donation