XGM button fix

This commit is contained in:
Serge
2023-06-08 11:17:06 +02:00
parent ca7dfff357
commit 306dfe2bd7
5 changed files with 40 additions and 21 deletions

View File

@@ -420,6 +420,7 @@ public class AsusACPI
return DeviceGet(PPT_CPUB0) >= 0 && DeviceGet(PPT_GPUC0) < 0; return DeviceGet(PPT_CPUB0) >= 0 && DeviceGet(PPT_GPUC0) < 0;
} }
/*
public void ScanRange() public void ScanRange()
{ {
int value; int value;
@@ -437,6 +438,7 @@ public class AsusACPI
} }
} }
*/
public void TUFKeyboardBrightness(int brightness) public void TUFKeyboardBrightness(int brightness)
{ {

View File

@@ -124,7 +124,8 @@ namespace GHelper
_modes.Remove(3); _modes.Remove(3);
} }
if (AppConfig.ContainsModel("G513QY")) { if (AppConfig.ContainsModel("G513QY"))
{
return _modes; return _modes;
} }
@@ -260,18 +261,31 @@ namespace GHelper
{ {
byte[] msg = { AURA_HID_ID, 0xba, 0xc5, 0xc4, (byte)brightness }; byte[] msg = { AURA_HID_ID, 0xba, 0xc5, 0xc4, (byte)brightness };
byte[] msgBackup = { INPUT_HID_ID, 0xba, 0xc5, 0xc4, (byte)brightness };
var devices = GetHidDevices(deviceIds); var devices = GetHidDevices(deviceIds, 0);
foreach (HidDevice device in devices) foreach (HidDevice device in devices)
{ {
device.OpenDevice(); device.OpenDevice();
device.WriteFeatureData(msg);
Logger.WriteLine(log + ":" + BitConverter.ToString(msg)); if (device.ReadFeatureData(out byte[] data, AURA_HID_ID))
{
device.WriteFeatureData(msg);
Logger.WriteLine(log + ":" + BitConverter.ToString(msg));
}
if (AppConfig.ContainsModel("GA503") && device.ReadFeatureData(out byte[] dataBackkup, INPUT_HID_ID))
{
device.WriteFeatureData(msgBackup);
Logger.WriteLine(log + ":" + BitConverter.ToString(msgBackup));
}
device.CloseDevice(); device.CloseDevice();
} }
// Backup payload for old models // Backup payload for old models
if (AppConfig.ContainsModel("503")) /*
if (AppConfig.ContainsModel("GA503RW"))
{ {
byte[] msgBackup = { INPUT_HID_ID, 0xba, 0xc5, 0xc4, (byte)brightness }; byte[] msgBackup = { INPUT_HID_ID, 0xba, 0xc5, 0xc4, (byte)brightness };
@@ -283,6 +297,7 @@ namespace GHelper
device.CloseDevice(); device.CloseDevice();
} }
} }
*/
}); });

View File

@@ -242,7 +242,7 @@ namespace GHelper
if (OptimizationService.IsRunning()) buttonServices.Text = Properties.Strings.Stop; if (OptimizationService.IsRunning()) buttonServices.Text = Properties.Strings.Stop;
else buttonServices.Text = Properties.Strings.Start; else buttonServices.Text = Properties.Strings.Start;
labelServices.Text = Properties.Strings.AsusServicesRunning + ": " + OptimizationService.GetRunningCount(); labelServices.Text = Properties.Strings.AsusServicesRunning + ": " + OptimizationService.GetRunningCount();
buttonServices.Enabled = true; buttonServices.Enabled = true;
Program.inputDispatcher.Init(); Program.inputDispatcher.Init();

View File

@@ -135,7 +135,7 @@ namespace GHelper
panelMatrix.Controls.Add(panelMatrixTitle); panelMatrix.Controls.Add(panelMatrixTitle);
panelMatrix.Controls.Add(checkMatrix); panelMatrix.Controls.Add(checkMatrix);
panelMatrix.Dock = DockStyle.Top; panelMatrix.Dock = DockStyle.Top;
panelMatrix.Location = new Point(10, 783); panelMatrix.Location = new Point(10, 891);
panelMatrix.Margin = new Padding(0); panelMatrix.Margin = new Padding(0);
panelMatrix.Name = "panelMatrix"; panelMatrix.Name = "panelMatrix";
panelMatrix.Padding = new Padding(20, 20, 20, 10); panelMatrix.Padding = new Padding(20, 20, 20, 10);
@@ -264,7 +264,7 @@ namespace GHelper
panelBattery.Controls.Add(sliderBattery); panelBattery.Controls.Add(sliderBattery);
panelBattery.Controls.Add(panelBatteryTitle); panelBattery.Controls.Add(panelBatteryTitle);
panelBattery.Dock = DockStyle.Top; panelBattery.Dock = DockStyle.Top;
panelBattery.Location = new Point(10, 954); panelBattery.Location = new Point(10, 1062);
panelBattery.Margin = new Padding(0); panelBattery.Margin = new Padding(0);
panelBattery.Name = "panelBattery"; panelBattery.Name = "panelBattery";
panelBattery.Padding = new Padding(20); panelBattery.Padding = new Padding(20);
@@ -335,7 +335,7 @@ namespace GHelper
panelFooter.Controls.Add(buttonQuit); panelFooter.Controls.Add(buttonQuit);
panelFooter.Controls.Add(checkStartup); panelFooter.Controls.Add(checkStartup);
panelFooter.Dock = DockStyle.Top; panelFooter.Dock = DockStyle.Top;
panelFooter.Location = new Point(10, 1136); panelFooter.Location = new Point(10, 1244);
panelFooter.Margin = new Padding(0); panelFooter.Margin = new Padding(0);
panelFooter.Name = "panelFooter"; panelFooter.Name = "panelFooter";
panelFooter.Padding = new Padding(20); panelFooter.Padding = new Padding(20);
@@ -570,14 +570,14 @@ namespace GHelper
panelGPU.Margin = new Padding(0); panelGPU.Margin = new Padding(0);
panelGPU.Name = "panelGPU"; panelGPU.Name = "panelGPU";
panelGPU.Padding = new Padding(20, 20, 20, 0); panelGPU.Padding = new Padding(20, 20, 20, 0);
panelGPU.Size = new Size(810, 243); panelGPU.Size = new Size(810, 351);
panelGPU.TabIndex = 37; panelGPU.TabIndex = 37;
// //
// labelTipGPU // labelTipGPU
// //
labelTipGPU.Dock = DockStyle.Top; labelTipGPU.Dock = DockStyle.Top;
labelTipGPU.ForeColor = SystemColors.GrayText; labelTipGPU.ForeColor = SystemColors.GrayText;
labelTipGPU.Location = new Point(20, 207); labelTipGPU.Location = new Point(20, 315);
labelTipGPU.Margin = new Padding(4, 0, 4, 0); labelTipGPU.Margin = new Padding(4, 0, 4, 0);
labelTipGPU.Name = "labelTipGPU"; labelTipGPU.Name = "labelTipGPU";
labelTipGPU.Size = new Size(770, 36); labelTipGPU.Size = new Size(770, 36);
@@ -603,8 +603,8 @@ namespace GHelper
tableGPU.Name = "tableGPU"; tableGPU.Name = "tableGPU";
tableGPU.RowCount = 1; tableGPU.RowCount = 1;
tableGPU.RowStyles.Add(new RowStyle(SizeType.Absolute, 128F)); tableGPU.RowStyles.Add(new RowStyle(SizeType.Absolute, 128F));
tableGPU.RowStyles.Add(new RowStyle(SizeType.Absolute, 20F)); tableGPU.RowStyles.Add(new RowStyle(SizeType.Absolute, 128F));
tableGPU.Size = new Size(770, 148); tableGPU.Size = new Size(770, 256);
tableGPU.TabIndex = 16; tableGPU.TabIndex = 16;
// //
// buttonEco // buttonEco
@@ -668,7 +668,7 @@ namespace GHelper
buttonXGM.Margin = new Padding(4); buttonXGM.Margin = new Padding(4);
buttonXGM.Name = "buttonXGM"; buttonXGM.Name = "buttonXGM";
buttonXGM.Secondary = false; buttonXGM.Secondary = false;
buttonXGM.Size = new Size(184, 12); buttonXGM.Size = new Size(184, 120);
buttonXGM.TabIndex = 2; buttonXGM.TabIndex = 2;
buttonXGM.Text = "XG Mobile"; buttonXGM.Text = "XG Mobile";
buttonXGM.TextImageRelation = TextImageRelation.ImageAboveText; buttonXGM.TextImageRelation = TextImageRelation.ImageAboveText;
@@ -771,7 +771,7 @@ namespace GHelper
panelScreen.Controls.Add(tableScreen); panelScreen.Controls.Add(tableScreen);
panelScreen.Controls.Add(panelScreenTitle); panelScreen.Controls.Add(panelScreenTitle);
panelScreen.Dock = DockStyle.Top; panelScreen.Dock = DockStyle.Top;
panelScreen.Location = new Point(10, 460); panelScreen.Location = new Point(10, 568);
panelScreen.Margin = new Padding(0); panelScreen.Margin = new Padding(0);
panelScreen.Name = "panelScreen"; panelScreen.Name = "panelScreen";
panelScreen.Padding = new Padding(20, 20, 20, 10); panelScreen.Padding = new Padding(20, 20, 20, 10);
@@ -939,7 +939,7 @@ namespace GHelper
panelKeyboard.Controls.Add(tableLayoutKeyboard); panelKeyboard.Controls.Add(tableLayoutKeyboard);
panelKeyboard.Controls.Add(panelKeyboardTitle); panelKeyboard.Controls.Add(panelKeyboardTitle);
panelKeyboard.Dock = DockStyle.Top; panelKeyboard.Dock = DockStyle.Top;
panelKeyboard.Location = new Point(10, 645); panelKeyboard.Location = new Point(10, 753);
panelKeyboard.Margin = new Padding(0); panelKeyboard.Margin = new Padding(0);
panelKeyboard.Name = "panelKeyboard"; panelKeyboard.Name = "panelKeyboard";
panelKeyboard.Padding = new Padding(20); panelKeyboard.Padding = new Padding(20);
@@ -1113,7 +1113,7 @@ namespace GHelper
panelVersion.Controls.Add(labelVersion); panelVersion.Controls.Add(labelVersion);
panelVersion.Controls.Add(labelModel); panelVersion.Controls.Add(labelModel);
panelVersion.Dock = DockStyle.Top; panelVersion.Dock = DockStyle.Top;
panelVersion.Location = new Point(10, 1079); panelVersion.Location = new Point(10, 1187);
panelVersion.Name = "panelVersion"; panelVersion.Name = "panelVersion";
panelVersion.Size = new Size(810, 57); panelVersion.Size = new Size(810, 57);
panelVersion.TabIndex = 41; panelVersion.TabIndex = 41;

View File

@@ -354,6 +354,8 @@ namespace GHelper
else else
{ {
Program.acpi.DeviceSet(AsusACPI.GPUXG, 1, "GPU XGM"); Program.acpi.DeviceSet(AsusACPI.GPUXG, 1, "GPU XGM");
AsusUSB.ApplyXGMLight(AppConfig.isConfig("xmg_light"));
await Task.Delay(TimeSpan.FromSeconds(15)); await Task.Delay(TimeSpan.FromSeconds(15));
if (AppConfig.isConfigPerf("auto_apply")) if (AppConfig.isConfigPerf("auto_apply"))
@@ -1193,13 +1195,13 @@ namespace GHelper
private static bool isManualModeRequired() private static bool isManualModeRequired()
{ {
if (!AppConfig.isConfigPerf("auto_apply_power")) if (!AppConfig.isConfigPerf("auto_apply_power"))
return false; return false;
return return
AppConfig.isConfig("manual_mode") || AppConfig.isConfig("manual_mode") ||
AppConfig.ContainsModel("GU604") || AppConfig.ContainsModel("GU604") ||
AppConfig.ContainsModel("FX517") || AppConfig.ContainsModel("FX517") ||
AppConfig.ContainsModel("G733"); AppConfig.ContainsModel("G733");
} }