Compare commits

..

23 Commits

Author SHA1 Message Date
Serge
1478f80c1a Ally UI Fix 2024-01-30 15:24:49 +01:00
Serge
b2a64bf012 Ally cleanup 2024-01-30 15:04:12 +01:00
Serge
d734581493 Release logic 2024-01-30 15:02:11 +01:00
Serge
31eef60e75 UI tweaks 2024-01-30 14:59:05 +01:00
Serge
563d49d675 Release logic 2024-01-30 14:58:07 +01:00
Serge
2a7bea83ad Aura cleanup 2024-01-30 14:56:28 +01:00
Serge
e57f61b07a Release Update Logic 2024-01-30 14:35:03 +01:00
Serge
bdc1f92f1b Update release.yml 2024-01-30 11:43:25 +01:00
Serge
621835076b Lightbar toggle for old devices https://github.com/seerge/g-helper/issues/1929 2024-01-30 00:49:04 +01:00
Serge
297ebe5d64 Cleanup 2024-01-29 22:00:10 +01:00
Serge
e04c4cd46f AMD Overlay button 2024-01-29 12:31:31 +01:00
Serge
2b0ea99acc Merge branch 'main' of https://github.com/seerge/g-helper 2024-01-29 12:05:31 +01:00
Serge
f2371b0931 Ally tweaks 2024-01-29 12:05:29 +01:00
Serge
bc75b154c3 New translations strings.resx (Polish) (#1993) 2024-01-29 10:49:03 +01:00
Serge
279d07d674 Controller Toggle tweaks 2024-01-28 21:34:15 +01:00
Serge
8243d87824 Merge branch 'main' of https://github.com/seerge/g-helper 2024-01-28 20:09:43 +01:00
Serge
3d95fb33ce Controller mode binding 2024-01-28 20:09:40 +01:00
Serge
736bead0a9 Merge branch 'main' of https://github.com/seerge/g-helper 2024-01-28 16:04:44 +01:00
Serge
296527d994 UI crash fix https://github.com/seerge/g-helper/issues/1992 2024-01-28 16:04:41 +01:00
Serge
d534f5440b Update release.yml 2024-01-28 12:23:43 +01:00
Serge
9e08114363 Merge branch 'main' of https://github.com/seerge/g-helper 2024-01-27 21:43:08 +01:00
Serge
ca8531cf26 Matrix Pixel Fix 2024-01-27 21:43:06 +01:00
Serge
cda04d3c3b Update README.md 2024-01-27 12:55:12 +01:00
21 changed files with 163 additions and 52 deletions

View File

@@ -23,9 +23,8 @@ jobs:
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.exe GHelper.zip
powershell Compress-Archive app/bin/x64/Release/net7.0-windows/win-x64/publish/WinRing* PluginAdvancedSettings.zip
- name: Upload
env:
GH_TOKEN: ${{ github.token }}
run: |
gh release upload ${{ github.ref_name }} GHelper.zip PluginAdvancedSettings.zip
gh release upload ${{ github.ref_name }} app/bin/x64/Release/net7.0-windows/win-x64/publish/GHelper.exe GHelper.zip

View File

@@ -1,6 +1,6 @@
using GHelper.Gpu.AMD;
using GHelper.Helpers;
using GHelper.Input;
using GHelper.Mode;
using GHelper.USB;
using HidSharp;
using System.Text;
@@ -90,6 +90,7 @@ namespace GHelper.Ally
public const string BindBrightnessDown = "04-04-8C-88-8A-05";
public const string BindBrightnessUp = "04-04-8C-88-8A-06";
public const string BindXGM = "04-04-8C-88-8A-04";
public const string BindToggleMode = "04-04-8C-88-8A-0C";
public const string BindOverlay = "04-03-8C-88-44";
@@ -106,8 +107,8 @@ namespace GHelper.Ally
public const string BindShowKeyboard = "05-19";
static byte[] CommandReady = new byte[] { AsusHid.INPUT_ID, 0xd1, 0x0a, 0x01 };
static byte[] CommandSave = new byte[] { AsusHid.INPUT_ID, 0xd1, 0x0f, 0x20 };
static byte[] CommandReady = new byte[] { AsusHid.INPUT_ID, 0xD1, 0x0A, 0x01 };
static byte[] CommandSave = new byte[] { AsusHid.INPUT_ID, 0xD1, 0x0F, 0x20 };
public static Dictionary<string, string> BindCodes = new Dictionary<string, string>
{
@@ -140,6 +141,8 @@ namespace GHelper.Ally
{ BindXB, "XBox/Steam" },
{ BindToggleMode, "Controller Mode" },
{ BindVolUp, "Vol Up" },
{ BindVolDown, "Vol Down" },
{ BindBrightnessUp, "Bright Up" },
@@ -310,10 +313,12 @@ namespace GHelper.Ally
if (AppConfig.IsAlly()) settings.VisualiseAlly(true);
else return;
SetMode((ControllerMode)AppConfig.Get("controller_mode", (int)ControllerMode.Auto));
SetMode((ControllerMode)AppConfig.Get("controller_mode", (int)ControllerMode.Auto), true);
settings.VisualiseBacklight(InputDispatcher.GetBacklight());
settings.VisualiseFPSLimit(amdControl.GetFPSLimit());
fpsLimit = amdControl.GetFPSLimit();
settings.VisualiseFPSLimit(fpsLimit);
}
@@ -420,7 +425,7 @@ namespace GHelper.Ally
KeyL1 = AppConfig.GetString("bind_ls", desktop ? BindShift : BindLS);
KeyR1 = AppConfig.GetString("bind_rs", desktop ? BindMouseL : BindRS);
KeyL2 = AppConfig.GetString("bind2_ls");
KeyR2 = AppConfig.GetString("bind2_rs");
KeyR2 = AppConfig.GetString("bind2_rs", BindToggleMode);
break;
case BindingZone.Bumper:
KeyL1 = AppConfig.GetString("bind_lb", desktop ? BindTab : BindLB);
@@ -473,11 +478,9 @@ namespace GHelper.Ally
DecodeBinding(KeyR1).CopyTo(bindings, 27);
DecodeBinding(KeyR2).CopyTo(bindings, 38);
AsusHid.WriteInput(CommandReady, null);
//AsusHid.WriteInput(CommandReady, null);
AsusHid.WriteInput(bindings, $"B{zone}");
}
static void WakeUp()
@@ -487,8 +490,6 @@ namespace GHelper.Ally
static public void SetDeadzones()
{
WakeUp();
AsusHid.WriteInput(new byte[] { AsusHid.INPUT_ID, 0xd1, 4, 4,
(byte)AppConfig.Get("ls_min", 0),
(byte)AppConfig.Get("ls_max", 100),
@@ -515,7 +516,7 @@ namespace GHelper.Ally
AsusHid.WriteInput(new byte[] { AsusHid.INPUT_ID, 0xD1, 0x0B, 0x01, AppConfig.Is("controller_disabled") ? (byte)0x02 : (byte)0x01 }, "Status");
}
public static void ApplyMode(ControllerMode applyMode = ControllerMode.Auto)
public static void ApplyMode(ControllerMode applyMode = ControllerMode.Auto, bool init = false)
{
Task.Run(() =>
{
@@ -525,10 +526,10 @@ namespace GHelper.Ally
HidStream? input = AsusHid.FindHidStream(AsusHid.INPUT_ID);
int count = 0;
while (input == null && count++ < 5)
while (input == null && count++ < 10)
{
input = AsusHid.FindHidStream(AsusHid.INPUT_ID);
Thread.Sleep(2000);
Thread.Sleep(500);
}
if (input == null)
@@ -539,14 +540,16 @@ namespace GHelper.Ally
if (applyMode != ControllerMode.Auto) _applyMode = applyMode;
InputDispatcher.SetBacklightAuto(true);
WakeUp();
if (init)
{
WakeUp();
InputDispatcher.SetBacklightAuto(true);
}
AsusHid.WriteInput(new byte[] { AsusHid.INPUT_ID, 0xD1, 0x01, 0x01, (byte)_applyMode }, "Controller");
AsusHid.WriteInput(CommandSave, null);
//AsusHid.WriteInput(CommandSave, null);
BindZone(BindingZone.M1M2);
BindZone(BindingZone.DPadUpDown);
BindZone(BindingZone.DPadLeftRight);
BindZone(BindingZone.StickClick);
@@ -557,18 +560,19 @@ namespace GHelper.Ally
BindZone(BindingZone.Trigger);
AsusHid.WriteInput(CommandSave, null);
SetDeadzones();
});
}
private void SetMode(ControllerMode mode)
private void SetMode(ControllerMode mode, bool init = false)
{
_mode = mode;
AppConfig.Set("controller_mode", (int)mode);
ApplyMode(mode);
ApplyMode(mode, init);
if (mode == ControllerMode.Auto)
{
@@ -584,6 +588,21 @@ namespace GHelper.Ally
settings.VisualiseController(mode);
}
public void ToggleModeHotkey()
{
if (_applyMode == ControllerMode.Gamepad)
{
SetMode(ControllerMode.Mouse);
Program.toast.RunToast("Mouse", ToastIcon.Controller);
}
else
{
SetMode(ControllerMode.Gamepad);
Program.toast.RunToast("Gamepad", ToastIcon.Controller);
}
}
public void ToggleMode()
{
switch (_mode)

View File

@@ -278,7 +278,7 @@ namespace Starlight.AnimeMatrix
if (x >= FirstX(y) && x < Width())
SetLedLinear(RowToLinearAddress(y) - FirstX(y) + x, value);
}
}
public void SetLedDiagonal(int x, int y, byte color, int deltaX = 0, int deltaY = 0)
{
@@ -287,6 +287,9 @@ namespace Starlight.AnimeMatrix
int plX = (x - y) / 2;
int plY = x + y;
if (x - y == -1) plX = -1;
SetLedPlanar(plX, plY, color);
}

View File

@@ -379,7 +379,7 @@ public static class AppConfig
public static bool IsStrix()
{
return ContainsModel("Strix") || ContainsModel("Scar");
return ContainsModel("Strix") || ContainsModel("Scar") || ContainsModel("G703G");
}
public static bool IsStrixLimitedRGB()

View File

@@ -19,7 +19,7 @@
public static void UnSetBatteryLimitFull()
{
AppConfig.Set("charge_full", 0);
Program.settingsForm.VisualiseBatteryFull();
Program.settingsForm.Invoke(Program.settingsForm.VisualiseBatteryFull);
}
public static void AutoBattery(bool init = false)

View File

@@ -44,6 +44,11 @@ namespace GHelper
customActions.Add("screenpad_up", Properties.Strings.ScreenPadUp);
}
if (AppConfig.IsAlly())
{
customActions.Add("controller", "Controller Mode");
}
switch (name)
{
case "m1":

View File

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

View File

@@ -65,8 +65,14 @@ public class AmdGpuControl : IGpuControl
if (!Adl2.Load())
return;
if (Adl2.ADL2_Main_Control_Create(1, out _adlContextHandle) != Adl2.ADL_SUCCESS)
try
{
if (Adl2.ADL2_Main_Control_Create(1, out _adlContextHandle) != Adl2.ADL_SUCCESS) return;
} catch (Exception ex)
{
Logger.WriteLine(ex.Message);
return;
}
ADLAdapterInfo? internalDiscreteAdapter = FindByType(ADLAsicFamilyType.Discrete);

View File

@@ -50,7 +50,8 @@ namespace GHelper.Helpers
MicrophoneMute,
FnLock,
Battery,
Charger
Charger,
Controller
}
public class ToastForm : OSDNativeForm
@@ -111,6 +112,9 @@ namespace GHelper.Helpers
case ToastIcon.Charger:
icon = Properties.Resources.icons8_charging_battery_96;
break;
case ToastIcon.Controller:
icon = Properties.Resources.icons8_controller_96;
break;
}

View File

@@ -146,6 +146,7 @@ namespace GHelper.Input
hook.RegisterHotKey(ModifierKeys.Shift | ModifierKeys.Control | ModifierKeys.Alt, Keys.F1);
hook.RegisterHotKey(ModifierKeys.Shift | ModifierKeys.Control | ModifierKeys.Alt, Keys.F2);
hook.RegisterHotKey(ModifierKeys.Shift | ModifierKeys.Control | ModifierKeys.Alt, Keys.F3);
hook.RegisterHotKey(ModifierKeys.Shift | ModifierKeys.Control | ModifierKeys.Alt, Keys.F4);
}
// FN-Lock group
@@ -374,6 +375,9 @@ namespace GHelper.Input
case Keys.F3:
Program.settingsForm.gpuControl.ToggleXGM(true);
break;
case Keys.F4:
Program.settingsForm.BeginInvoke(Program.settingsForm.allyControl.ToggleModeHotkey);
break;
case Keys.F14:
Program.settingsForm.gpuControl.SetGPUMode(AsusACPI.GPUModeEco);
break;
@@ -516,6 +520,9 @@ namespace GHelper.Input
case "calculator":
LaunchProcess("calc");
break;
case "controller":
Program.settingsForm.BeginInvoke(Program.settingsForm.allyControl.ToggleModeHotkey);
break;
default:
break;
}

View File

@@ -229,10 +229,15 @@ namespace GHelper
BatteryControl.AutoBattery(init);
settingsForm.AutoKeyboard();
settingsForm.matrixControl.SetMatrix(true);
allyControl.Init();
if (AppConfig.IsAlly())
{
allyControl.Init();
} else
{
settingsForm.AutoKeyboard();
}
}
private static void SystemEvents_PowerModeChanged(object sender, PowerModeChangedEventArgs e)
@@ -273,7 +278,11 @@ namespace GHelper
settingsForm.Activate();
settingsForm.Left = Screen.FromControl(settingsForm).WorkingArea.Width - 10 - settingsForm.Width;
settingsForm.Top = Screen.FromControl(settingsForm).WorkingArea.Height - 10 - settingsForm.Height;
if (AppConfig.IsAlly())
settingsForm.Top = Math.Max(10, Screen.FromControl(settingsForm).Bounds.Height - 110 - settingsForm.Height);
else
settingsForm.Top = Screen.FromControl(settingsForm).WorkingArea.Height - 10 - settingsForm.Height;
settingsForm.VisualiseGPUMode();
}

View File

@@ -250,6 +250,16 @@ namespace GHelper.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap icons8_controller_96 {
get {
object obj = ResourceManager.GetObject("icons8_controller_96", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
@@ -330,6 +340,16 @@ namespace GHelper.Properties {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap icons8_heartbeat_32 {
get {
object obj = ResourceManager.GetObject("icons8-heartbeat-32", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>

View File

@@ -136,9 +136,6 @@
<data name="icons8-bicycle-48 (1)" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8-bicycle-48 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="standard" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\standard.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="eco" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\eco.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -196,6 +193,9 @@
<data name="icons8_remove_64" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8-remove-64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_share_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8-share-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_function" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8-function-mac-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -226,6 +226,12 @@
<data name="icons8-keyboard-32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8-keyboard-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8-xbox-rt-32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8-xbox-rt-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_controller_96" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8-controller-96.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8-fan-48" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8-fan-48.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -313,8 +319,8 @@
<data name="icons8_software_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8-software-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8_share_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8-share-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="standard" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\standard.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8-soonvibes-32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8-soonvibes-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -325,7 +331,7 @@
<data name="icons8-charging-battery-32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8-charging-battery-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icons8-xbox-rt-32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8-xbox-rt-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="icons8-heartbeat-32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icons8-heartbeat-32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

View File

@@ -504,10 +504,10 @@ Nadal chcesz kontynuować?</value>
<value>Synchronizuj z myszką</value>
</data>
<data name="Multizone" xml:space="preserve">
<value>Multi Zone</value>
<value>Wiele stref</value>
</data>
<data name="MultizoneStrong" xml:space="preserve">
<value>Multi Zone Strong</value>
<value>Wiele stref (mocniejsze)</value>
</data>
<data name="MuteMic" xml:space="preserve">
<value>Wyciszenie mikrofonu</value>
@@ -525,7 +525,7 @@ Nadal chcesz kontynuować?</value>
<value>Nie połączono</value>
</data>
<data name="OneZone" xml:space="preserve">
<value>One Zone</value>
<value>Jedna strefa</value>
</data>
<data name="OpenGHelper" xml:space="preserve">
<value>Otwórz okno G-Helper</value>

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 387 B

View File

@@ -154,8 +154,9 @@ namespace Ryzen
public static void DownloadRing()
{
var appVersion = new Version(Assembly.GetExecutingAssembly().GetName().Version.ToString());
string requestUri = "https://github.com/seerge/g-helper/releases/download/v" + appVersion.Major + "." + appVersion.Minor + "/PluginAdvancedSettings.zip";
//var appVersion = new Version(Assembly.GetExecutingAssembly().GetName().Version.ToString());
//string requestUri = "https://github.com/seerge/g-helper/releases/download/v" + appVersion.Major + "." + appVersion.Minor + "/PluginAdvancedSettings.zip";
string requestUri = "https://github.com/seerge/g-helper/releases/download/v0.150/PluginAdvancedSettings.zip";
Uri uri = new Uri(requestUri);

View File

@@ -118,6 +118,7 @@ namespace GHelper
panelAllyTitle = new Panel();
pictureAlly = new PictureBox();
labelAlly = new Label();
buttonOverlay = new RButton();
panelMatrix.SuspendLayout();
tableLayoutMatrix.SuspendLayout();
panelMatrixTitle.SuspendLayout();
@@ -694,6 +695,7 @@ namespace GHelper
tableAMD.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33F));
tableAMD.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33F));
tableAMD.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33F));
tableAMD.Controls.Add(buttonOverlay, 0, 0);
tableAMD.Controls.Add(buttonFPS, 0, 0);
tableAMD.Dock = DockStyle.Top;
tableAMD.Location = new Point(20, 316);
@@ -1584,6 +1586,28 @@ namespace GHelper
labelAlly.TabIndex = 26;
labelAlly.Text = "Ally Controller";
//
// buttonOverlay
//
buttonOverlay.Activated = false;
buttonOverlay.BackColor = SystemColors.ControlLightLight;
buttonOverlay.BorderColor = Color.Transparent;
buttonOverlay.BorderRadius = 5;
buttonOverlay.Dock = DockStyle.Fill;
buttonOverlay.FlatAppearance.BorderSize = 0;
buttonOverlay.FlatStyle = FlatStyle.Flat;
buttonOverlay.ForeColor = SystemColors.ControlText;
buttonOverlay.Image = Properties.Resources.icons8_heartbeat_32;
buttonOverlay.ImageAlign = ContentAlignment.MiddleRight;
buttonOverlay.Location = new Point(266, 4);
buttonOverlay.Margin = new Padding(4);
buttonOverlay.Name = "buttonOverlay";
buttonOverlay.Secondary = false;
buttonOverlay.Size = new Size(254, 72);
buttonOverlay.TabIndex = 12;
buttonOverlay.Text = "AMD Overlay";
buttonOverlay.TextImageRelation = TextImageRelation.ImageBeforeText;
buttonOverlay.UseVisualStyleBackColor = false;
//
// SettingsForm
//
AutoScaleDimensions = new SizeF(192F, 192F);
@@ -1759,5 +1783,6 @@ namespace GHelper
private TableLayoutPanel tableAMD;
private RButton buttonFPS;
private RButton buttonController;
private RButton buttonOverlay;
}
}

View File

@@ -24,8 +24,8 @@ namespace GHelper
ToolStripMenuItem menuSilent, menuBalanced, menuTurbo, menuEco, menuStandard, menuUltimate, menuOptimized;
public GPUModeControl gpuControl;
public AllyControl allyControl;
ScreenControl screenControl = new ScreenControl();
AllyControl allyControl;
AutoUpdateControl updateControl;
AsusMouseSettings? mouseSettings;
@@ -235,7 +235,9 @@ namespace GHelper
buttonControllerMode.Click += ButtonControllerMode_Click;
buttonBacklight.Click += ButtonBacklight_Click;
buttonFPS.Click += ButtonFPS_Click;
buttonOverlay.Click += ButtonOverlay_Click;
Text = "G-Helper " + (ProcessHelper.IsUserAdministrator() ? "—" : "-") + " " + AppConfig.GetModelShort();
TopMost = AppConfig.Is("topmost");
@@ -250,6 +252,11 @@ namespace GHelper
panelPerformance.Focus();
}
private void ButtonOverlay_Click(object? sender, EventArgs e)
{
KeyboardHook.KeyKeyKeyPress(Keys.LControlKey, Keys.LShiftKey, Keys.O);
}
private void ButtonHandheld_Click(object? sender, EventArgs e)
{
if (handheldForm == null || handheldForm.Text == "")

View File

@@ -238,19 +238,19 @@ namespace GHelper.USB
}
public static byte[] AuraMessage(AuraMode mode, Color color, Color color2, int speed, bool mono = false)
public static byte[] AuraMessage(AuraMode mode, Color color, Color color2, int speed, bool mono = false, byte zoneByte = 0x00)
{
byte[] msg = new byte[17];
msg[0] = AsusHid.AURA_ID;
msg[1] = 0xb3;
msg[2] = 0x00; // Zone
msg[1] = 0xB3;
msg[2] = zoneByte; // Zone
msg[3] = (byte)mode; // Aura Mode
msg[4] = color.R; // R
msg[5] = mono ? (byte)0 : color.G; // G
msg[6] = mono ? (byte)0 : color.B; // B
msg[7] = (byte)speed; // aura.speed as u8;
msg[8] = 0; // aura.direction as u8;
msg[8] = 0x00; // aura.direction as u8;
msg[9] = mode == AuraMode.AuraBreathe ? (byte)1 : (byte)0;
msg[10] = color2.R; // R
msg[11] = mono ? (byte)0 : color2.G; // G
@@ -294,12 +294,12 @@ namespace GHelper.USB
if (delay) await Task.Delay(TimeSpan.FromSeconds(1));
if (isACPI) Program.acpi.TUFKeyboardBrightness(brightness);
AsusHid.Write(new byte[] { AsusHid.AURA_ID, 0xba, 0xc5, 0xc4, (byte)brightness }, log);
AsusHid.Write(new byte[] { AsusHid.AURA_ID, 0xBA, 0xC5, 0xC4, (byte)brightness }, log);
if (AppConfig.IsAlly()) ApplyAura();
if (AppConfig.ContainsModel("GA503"))
AsusHid.WriteInput(new byte[] { AsusHid.INPUT_ID, 0xba, 0xc5, 0xc4, (byte)brightness }, log);
AsusHid.WriteInput(new byte[] { AsusHid.INPUT_ID, 0xBA, 0xC5, 0xC4, (byte)brightness }, log);
});
@@ -318,6 +318,7 @@ namespace GHelper.USB
if (flags.ShutdownLogo) keyb |= 1 << 6;
if (flags.ShutdownKeyb) keyb |= 1 << 7;
if (flags.AwakeBar) bar |= 1 << 0;
if (flags.BootBar) bar |= 1 << 1;
if (flags.AwakeBar) bar |= 1 << 2;
if (flags.SleepBar) bar |= 1 << 3;
@@ -663,7 +664,6 @@ namespace GHelper.USB
}
int _speed = (Speed == AuraSpeed.Normal) ? 0xeb : (Speed == AuraSpeed.Fast) ? 0xf5 : 0xe1;
AsusHid.Write(new List<byte[]> { AuraMessage(Mode, _Color1, _Color2, _speed, isSingleColor), MESSAGE_SET, MESSAGE_APPLY });
if (isACPI)

View File

@@ -136,7 +136,7 @@ Huge thanks to [@IceStormNG](https://github.com/IceStormNG) 👑 for contributio
G-Helper is **NOT** an operating system, firmware, or driver. It **DOES NOT** "run" your hardware in real-time anyhow.
It's an app that lets you select one of the predefined operating modes created by Asus (and stored in BIOS) and optionally(!) set some settings that already exist on your device same as Armoury Crate can. It does it by using the Asus System Control Interface "driver" that Armoury uses for it.
It's an app that lets you select one of the predefined operating modes created by manufacturer (and stored in BIOS) and optionally(!) set some settings that already exist on your device same as Armoury Crate can. It does it by using the Asus System Control Interface "driver" that Armoury uses for it.
If you use equivalent mode/settings as in Armoury Crate - the performance or the behavior of your device won't be different.