Compare commits

...

11 Commits

Author SHA1 Message Date
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
8 changed files with 69 additions and 20 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") || ContainsModel("GA503");
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

@@ -794,7 +794,7 @@ namespace GHelper
bool modeB0 = Program.acpi.IsAllAmdPPT();
bool modeC1 = Program.acpi.DeviceGet(AsusACPI.PPT_APUC1) >= 0;
panelA0.Visible = panelA3.Visible = modeA0;
panelA0.Visible = modeA0;
panelB0.Visible = modeB0;
panelApplyPower.Visible = panelTitleCPU.Visible = modeA0 || modeB0 || modeC1;
@@ -810,13 +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;
panelA3.Visible = modeA3;
}
else
{

View File

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

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

@@ -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");

View File

@@ -532,7 +532,7 @@ namespace GHelper.USB
return;
}
if (isStrix && !isOldHeatmap)
if (isStrix)
{
ApplyDirect(Enumerable.Repeat(color, AURA_ZONES).ToArray(), init);
return;
@@ -540,8 +540,18 @@ namespace GHelper.USB
else
{
AsusHid.WriteAura(AuraMessage(0, color, color, 0));
AsusHid.WriteAura(MESSAGE_SET);
if (init) AsusHid.WriteAura(new byte[] { AsusHid.AURA_ID, 0xbc });
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);
}
}

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