jkocon/archived-g-helper
1
0
Fork 0
mirror of https://github.com/jkocon/g-helper.git synced 2026-02-23 13:00:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ally tweaks

Browse Source
This commit is contained in:
Serge
2024-01-29 12:05:29 +01:00
parent 279d07d674
commit f2371b0931
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Ally/AllyControl.cs
View File

@@ -1,7 +1,6 @@
using GHelper.Gpu.AMD; using GHelper.Gpu.AMD;
using GHelper.Helpers; using GHelper.Helpers;
using GHelper.Input; using GHelper.Input;
using GHelper.Mode;
using GHelper.USB; using GHelper.USB;
using HidSharp; using HidSharp;
using System.Text; using System.Text;
@@ -108,8 +107,8 @@ namespace GHelper.Ally
public const string BindShowKeyboard = "05-19"; public const string BindShowKeyboard = "05-19";
static byte[] CommandReady = new byte[] { AsusHid.INPUT_ID, 0xd1, 0x0a, 0x01 }; static byte[] CommandReady = new byte[] { AsusHid.INPUT_ID, 0xD1, 0x0A, 0x01 };
static byte[] CommandSave = new byte[] { AsusHid.INPUT_ID, 0xd1, 0x0f, 0x20 }; static byte[] CommandSave = new byte[] { AsusHid.INPUT_ID, 0xD1, 0x0F, 0x20 };
public static Dictionary<string, string> BindCodes = new Dictionary<string, string> public static Dictionary<string, string> BindCodes = new Dictionary<string, string>
{ {
@@ -317,7 +316,9 @@ namespace GHelper.Ally
SetMode((ControllerMode)AppConfig.Get("controller_mode", (int)ControllerMode.Auto), true); SetMode((ControllerMode)AppConfig.Get("controller_mode", (int)ControllerMode.Auto), true);
settings.VisualiseBacklight(InputDispatcher.GetBacklight()); settings.VisualiseBacklight(InputDispatcher.GetBacklight());
settings.VisualiseFPSLimit(amdControl.GetFPSLimit());
fpsLimit = amdControl.GetFPSLimit();
settings.VisualiseFPSLimit(fpsLimit);
} }
@@ -424,7 +425,7 @@ namespace GHelper.Ally
KeyL1 = AppConfig.GetString("bind_ls", desktop ? BindShift : BindLS); KeyL1 = AppConfig.GetString("bind_ls", desktop ? BindShift : BindLS);
KeyR1 = AppConfig.GetString("bind_rs", desktop ? BindMouseL : BindRS); KeyR1 = AppConfig.GetString("bind_rs", desktop ? BindMouseL : BindRS);
KeyL2 = AppConfig.GetString("bind2_ls"); KeyL2 = AppConfig.GetString("bind2_ls");
KeyR2 = AppConfig.GetString("bind2_rs"); KeyR2 = AppConfig.GetString("bind2_rs", BindToggleMode);
break; break;
case BindingZone.Bumper: case BindingZone.Bumper:
KeyL1 = AppConfig.GetString("bind_lb", desktop ? BindTab : BindLB); KeyL1 = AppConfig.GetString("bind_lb", desktop ? BindTab : BindLB);
@@ -480,8 +481,6 @@ namespace GHelper.Ally
//AsusHid.WriteInput(CommandReady, null); //AsusHid.WriteInput(CommandReady, null);
AsusHid.WriteInput(bindings, $"B{zone}"); AsusHid.WriteInput(bindings, $"B{zone}");
} }
static void WakeUp() static void WakeUp()
@@ -529,10 +528,10 @@ namespace GHelper.Ally
HidStream? input = AsusHid.FindHidStream(AsusHid.INPUT_ID); HidStream? input = AsusHid.FindHidStream(AsusHid.INPUT_ID);
int count = 0; int count = 0;
while (input == null && count++ < 5) while (input == null && count++ < 10)
{ {
input = AsusHid.FindHidStream(AsusHid.INPUT_ID); input = AsusHid.FindHidStream(AsusHid.INPUT_ID);
Thread.Sleep(2000); Thread.Sleep(500);
} }
if (input == null) if (input == null)

2
app/GHelper.csproj
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.150</AssemblyVersion> <AssemblyVersion>0.151</AssemblyVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

6
app/Program.cs
View File

@@ -278,7 +278,11 @@ namespace GHelper
settingsForm.Activate(); settingsForm.Activate();
settingsForm.Left = Screen.FromControl(settingsForm).WorkingArea.Width - 10 - settingsForm.Width; 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 = Screen.FromControl(settingsForm).Bounds.Height - 100 - settingsForm.Height;
else
settingsForm.Top = Screen.FromControl(settingsForm).WorkingArea.Height - 10 - settingsForm.Height;
settingsForm.VisualiseGPUMode(); settingsForm.VisualiseGPUMode();
} }