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

Merge branch 'main' of https://github.com/seerge/g-helper

Browse Source
This commit is contained in:
Serge
2024-09-07 15:04:14 +02:00
parent 47dcf2a980 1ea3725568
commit 0a419ac1f6
4 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Ally/AllyControl.cs
View File

@@ -347,6 +347,7 @@ namespace GHelper.Ally
if (!autoTDP && _mode != ControllerMode.Auto) return; if (!autoTDP && _mode != ControllerMode.Auto) return;
float fps = amdControl.GetFPS(); float fps = amdControl.GetFPS();
int? usage = 0;
if (autoTDP && fpsLimit > 0 && fpsLimit <= 120) if (autoTDP && fpsLimit > 0 && fpsLimit <= 120)
{ {
@@ -377,7 +378,8 @@ namespace GHelper.Ally
if (_mode == ControllerMode.Auto) if (_mode == ControllerMode.Auto)
{ {
ControllerMode newMode = (fps > 0) ? ControllerMode.Gamepad : ControllerMode.Mouse; if (fps > 0) usage = amdControl.GetiGpuUse();
ControllerMode newMode = (fps > 0 && usage > 15) ? ControllerMode.Gamepad : ControllerMode.Mouse;
if (_applyMode != newMode) _autoCount++; if (_applyMode != newMode) _autoCount++;
else _autoCount = 0; else _autoCount = 0;
@@ -386,7 +388,7 @@ namespace GHelper.Ally
{ {
_autoCount = 0; _autoCount = 0;
ApplyMode(newMode); ApplyMode(newMode);
Logger.WriteLine($"Controller Mode {fps}: {newMode}"); Logger.WriteLine($"Controller Mode (FPS={fps}, USAGE={usage}%): {newMode}");
} }
} }

3
app/Battery/BatteryControl.cs
View File

@@ -38,8 +38,9 @@ namespace GHelper.Battery
if (AppConfig.IsChargeLimit6080()) if (AppConfig.IsChargeLimit6080())
{ {
if (limit > 80) limit = 100; if (limit > 85) limit = 100;
else if (limit < 60) limit = 60; else if (limit < 60) limit = 60;
else limit = 80;
} }
Program.acpi.DeviceSet(AsusACPI.BatteryLimit, limit, "BatteryLimit"); Program.acpi.DeviceSet(AsusACPI.BatteryLimit, limit, "BatteryLimit");

12
app/Gpu/AMD/AmdGpuControl.cs
View File

@@ -119,6 +119,18 @@ public class AmdGpuControl : IGpuControl
} }
public int? GetiGpuUse()
{
if (_adlContextHandle == nint.Zero || _iGPU == null) return null;
if (ADL2_New_QueryPMLogData_Get(_adlContextHandle, ((ADLAdapterInfo)_iGPU).AdapterIndex, out ADLPMLogDataOutput adlpmLogDataOutput) != Adl2.ADL_SUCCESS) return null;
ADLSingleSensorData gpuUsage = adlpmLogDataOutput.Sensors[(int)ADLSensorType.PMLOG_INFO_ACTIVITY_GFX];
if (gpuUsage.Supported == 0) return null;
return gpuUsage.Value;
}
public int? GetGpuPower() public int? GetGpuPower()
{ {
if (_adlContextHandle == nint.Zero || _iGPU == null) return null; if (_adlContextHandle == nint.Zero || _iGPU == null) return null;

2
app/Input/InputDispatcher.cs
View File

@@ -978,7 +978,7 @@ namespace GHelper.Input
} }
else else
{ {
brightness = Math.Max(Math.Min(100, brightness + delta), -10); brightness = Math.Max(Math.Min(100, brightness + delta), 0);
} }
AppConfig.Set("screenpad", brightness); AppConfig.Set("screenpad", brightness);