mirror of
https://github.com/jkocon/g-helper.git
synced 2026-02-23 13:00:52 +01:00
Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a45d693937 | ||
|
|
0db49af310 | ||
|
|
28daaf9a4c | ||
|
|
38d02ee7f9 | ||
|
|
c6d1b29a49 | ||
|
|
79cd773632 | ||
|
|
897de4ed27 | ||
|
|
afa6dbb542 | ||
|
|
80fbee2609 | ||
|
|
e1c83da19b | ||
|
|
59b5888632 | ||
|
|
cd74c62908 | ||
|
|
000fbe466f |
@@ -111,8 +111,6 @@ namespace GHelper.AnimeMatrix
|
||||
deviceSlash.SetEnabled(true);
|
||||
deviceSlash.Init();
|
||||
|
||||
deviceSlash.SetLidMode(false);
|
||||
|
||||
switch ((SlashMode)running)
|
||||
{
|
||||
case SlashMode.Static:
|
||||
@@ -150,6 +148,11 @@ namespace GHelper.AnimeMatrix
|
||||
{
|
||||
bool matrixLid = AppConfig.Is("matrix_lid");
|
||||
|
||||
if (deviceSlash is not null)
|
||||
{
|
||||
deviceSlash.SetLidMode(!matrixLid && AppConfig.Is("slash_sleep"));
|
||||
}
|
||||
|
||||
if (matrixLid || force)
|
||||
{
|
||||
Logger.WriteLine($"Matrix LidClosed: {lidClose}");
|
||||
|
||||
@@ -209,7 +209,7 @@ namespace GHelper.AnimeMatrix
|
||||
|
||||
public void SetLidMode(bool status)
|
||||
{
|
||||
Set(CreatePacket([0xD8, 0x00, 0x00, 0x02, 0xA5, status ? (byte)0x80 : (byte)0x00]), $"DisableLidClose {status}");
|
||||
Set(CreatePacket([0xD8, 0x00, 0x00, 0x02, 0xA5, status ? (byte)0x80 : (byte)0x00]), $"SlashLidCloseAnimation {status}");
|
||||
}
|
||||
|
||||
public void SetSleepActive(bool status)
|
||||
|
||||
@@ -12,7 +12,7 @@ public static class AppConfig
|
||||
private static string? _bios;
|
||||
|
||||
private static Dictionary<string, object> config = new Dictionary<string, object>();
|
||||
private static System.Timers.Timer timer = new System.Timers.Timer(1000);
|
||||
private static System.Timers.Timer timer = new System.Timers.Timer(2000);
|
||||
|
||||
static AppConfig()
|
||||
{
|
||||
@@ -92,7 +92,9 @@ public static class AppConfig
|
||||
|
||||
Thread.Sleep(500);
|
||||
|
||||
if (File.ReadAllText(backup).Contains("}"))
|
||||
var backupText = File.ReadAllText(backup);
|
||||
|
||||
if (backupText.Contains("{") && backupText.Contains("}"))
|
||||
{
|
||||
File.Copy(backup, configFile, true);
|
||||
}
|
||||
@@ -219,6 +221,7 @@ public static class AppConfig
|
||||
|
||||
private static void Write()
|
||||
{
|
||||
timer.Stop();
|
||||
timer.Start();
|
||||
}
|
||||
|
||||
@@ -302,27 +305,32 @@ public static class AppConfig
|
||||
|
||||
switch (mode)
|
||||
{
|
||||
case 1:
|
||||
if (device == AsusFan.GPU)
|
||||
curve = StringToBytes("14-3F-44-48-4C-50-54-62-16-1F-26-2D-39-47-55-5F");
|
||||
else
|
||||
curve = StringToBytes("14-3F-44-48-4C-50-54-62-11-1A-22-29-34-43-51-5A");
|
||||
break;
|
||||
case 2:
|
||||
if (device == AsusFan.GPU)
|
||||
curve = StringToBytes("3C-41-42-46-47-4B-4C-62-08-11-11-1D-1D-26-26-2D");
|
||||
else
|
||||
curve = StringToBytes("3C-41-42-46-47-4B-4C-62-03-0C-0C-16-16-22-22-29");
|
||||
break;
|
||||
case AsusACPI.PerformanceTurbo:
|
||||
switch (device)
|
||||
{
|
||||
case AsusFan.GPU:
|
||||
return StringToBytes("14-3F-44-48-4C-50-54-62-16-1F-26-2D-39-47-55-5F");
|
||||
default:
|
||||
return StringToBytes("14-3F-44-48-4C-50-54-62-11-1A-22-29-34-43-51-5A");
|
||||
}
|
||||
case AsusACPI.PerformanceSilent:
|
||||
switch (device)
|
||||
{
|
||||
case AsusFan.GPU:
|
||||
return StringToBytes("3C-41-42-46-47-4B-4C-62-08-11-11-1D-1D-26-26-2D");
|
||||
default:
|
||||
return StringToBytes("3C-41-42-46-47-4B-4C-62-03-0C-0C-16-16-22-22-29");
|
||||
}
|
||||
default:
|
||||
if (device == AsusFan.GPU)
|
||||
curve = StringToBytes("3A-3D-40-44-48-4D-51-62-0C-16-1D-1F-26-2D-34-4A");
|
||||
else
|
||||
curve = StringToBytes("3A-3D-40-44-48-4D-51-62-08-11-16-1A-22-29-30-45");
|
||||
break;
|
||||
switch (device)
|
||||
{
|
||||
case AsusFan.GPU:
|
||||
return StringToBytes("3A-3D-40-44-48-4D-51-62-0C-16-1D-1F-26-2D-34-4A");
|
||||
default:
|
||||
return StringToBytes("3A-3D-40-44-48-4D-51-62-08-11-16-1A-22-29-30-45");
|
||||
}
|
||||
}
|
||||
|
||||
return curve;
|
||||
}
|
||||
|
||||
public static string GetModeString(string name)
|
||||
|
||||
@@ -44,6 +44,7 @@ namespace GHelper.Display
|
||||
|
||||
private static int _brightness = 100;
|
||||
private static bool _init = true;
|
||||
private static bool _download = true;
|
||||
private static string? _splendidPath = null;
|
||||
|
||||
private static System.Timers.Timer brightnessTimer = new System.Timers.Timer(200);
|
||||
@@ -217,6 +218,11 @@ namespace GHelper.Display
|
||||
{
|
||||
Logger.WriteLine("Gamut setting refused, reverting.");
|
||||
RunSplendid(SplendidCommand.GamutMode, 0, (int)GetDefaultGamut());
|
||||
if (ProcessHelper.IsUserAdministrator() && _download)
|
||||
{
|
||||
_download = false;
|
||||
ColorProfileHelper.InstallProfile();
|
||||
}
|
||||
}
|
||||
if (result == 1 && _init)
|
||||
{
|
||||
@@ -262,8 +268,13 @@ namespace GHelper.Display
|
||||
if (result == 0) return;
|
||||
if (result == -1)
|
||||
{
|
||||
Logger.WriteLine("Visual setting refused, reverting.");
|
||||
Logger.WriteLine("Visual mode setting refused, reverting.");
|
||||
RunSplendid(SplendidCommand.Default, 0, DefaultColorTemp);
|
||||
if (ProcessHelper.IsUserAdministrator() && _download)
|
||||
{
|
||||
_download = false;
|
||||
ColorProfileHelper.InstallProfile();
|
||||
}
|
||||
}
|
||||
if (result == 1 && _init)
|
||||
{
|
||||
@@ -356,7 +367,7 @@ namespace GHelper.Display
|
||||
public static int SetBrightness(int brightness = -1, int delta = 0)
|
||||
{
|
||||
if (!AppConfig.IsOLED()) return -1;
|
||||
if (brightness < 0) GetBrightness();
|
||||
if (brightness < 0) brightness = GetBrightness();
|
||||
|
||||
_brightness = Math.Max(0, Math.Min(100, brightness + delta));
|
||||
AppConfig.Set(IsOnBattery() ? "brightness_battery" : "brightness", _brightness);
|
||||
|
||||
@@ -505,7 +505,10 @@ namespace GHelper
|
||||
return;
|
||||
}
|
||||
|
||||
eCoresMax = Math.Max(8, eCoresMax);
|
||||
if (eCoresMax == 0) eCoresMax = 8;
|
||||
if (pCoresMax == 0) pCoresMax = 6;
|
||||
|
||||
eCoresMax = Math.Max(4, eCoresMax);
|
||||
pCoresMax = Math.Max(6, pCoresMax);
|
||||
|
||||
panelCores.Visible = true;
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<ProduceReferenceAssembly>False</ProduceReferenceAssembly>
|
||||
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
|
||||
<AssemblyVersion>0.191</AssemblyVersion>
|
||||
<AssemblyVersion>0.193</AssemblyVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
|
||||
@@ -2,21 +2,31 @@
|
||||
|
||||
public static class TouchscreenHelper
|
||||
{
|
||||
public static bool? ToggleTouchscreen()
|
||||
|
||||
public static bool? GetStatus()
|
||||
{
|
||||
try
|
||||
{
|
||||
ProcessHelper.RunAsAdmin();
|
||||
return ProcessHelper.RunCMD("powershell", "(Get-PnpDevice -FriendlyName '*touch*screen*').Status").Contains("OK");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.WriteLine($"Can't get touchscreen status: {ex.Message}");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
var status = !ProcessHelper.RunCMD("powershell", "(Get-PnpDevice -FriendlyName '*touch*screen*').Status").Contains("OK");
|
||||
public static void ToggleTouchscreen(bool status)
|
||||
{
|
||||
try
|
||||
{
|
||||
ProcessHelper.RunAsAdmin();
|
||||
ProcessHelper.RunCMD("powershell", (status ? "Enable-PnpDevice" : "Disable-PnpDevice") + " -InstanceId (Get-PnpDevice -FriendlyName '*touch*screen*').InstanceId -Confirm:$false");
|
||||
|
||||
return status;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.WriteLine($"Can't toggle touchscreen: {ex.Message}");
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -591,9 +591,13 @@ namespace GHelper.Input
|
||||
Program.settingsForm.BeginInvoke(Program.settingsForm.allyControl.ToggleModeHotkey);
|
||||
break;
|
||||
case "touchscreen":
|
||||
var touchscreenStatus = TouchscreenHelper.ToggleTouchscreen();
|
||||
if (touchscreenStatus is not null)
|
||||
Program.toast.RunToast(Properties.Strings.Touchscreen + " " + ((bool)touchscreenStatus ? Properties.Strings.On : Properties.Strings.Off), ToastIcon.Touchpad);
|
||||
var status = !TouchscreenHelper.GetStatus();
|
||||
Logger.WriteLine("Touchscreen status: " + status);
|
||||
if (status is not null)
|
||||
{
|
||||
Program.toast.RunToast(Properties.Strings.Touchscreen + " " + ((bool)status ? Properties.Strings.On : Properties.Strings.Off), ToastIcon.Touchpad);
|
||||
TouchscreenHelper.ToggleTouchscreen((bool)status);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
||||
@@ -278,6 +278,7 @@ namespace GHelper
|
||||
}
|
||||
|
||||
if (SystemInformation.PowerStatus.PowerLineStatus == isPlugged) return;
|
||||
if (AppConfig.Is("disable_power_event")) return;
|
||||
SetAutoModes(true);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user