mirror of
https://github.com/jkocon/g-helper.git
synced 2026-02-23 13:00:52 +01:00
Minior tweaks
This commit is contained in:
@@ -65,7 +65,13 @@ namespace GHelper.AnimeMatrix
|
|||||||
StopMatrixTimer();
|
StopMatrixTimer();
|
||||||
StopMatrixAudio();
|
StopMatrixAudio();
|
||||||
|
|
||||||
mat.SetProvider();
|
try
|
||||||
|
{
|
||||||
|
mat.SetProvider();
|
||||||
|
} catch (Exception ex) {
|
||||||
|
Logger.WriteLine(ex.Message);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (wakeUp && AppConfig.ContainsModel("401")) mat.WakeUp();
|
if (wakeUp && AppConfig.ContainsModel("401")) mat.WakeUp();
|
||||||
|
|
||||||
|
|||||||
50
app/Fans.cs
50
app/Fans.cs
@@ -21,6 +21,7 @@ namespace GHelper
|
|||||||
static int MinRPM, MaxRPM;
|
static int MinRPM, MaxRPM;
|
||||||
|
|
||||||
static bool gpuVisible = true;
|
static bool gpuVisible = true;
|
||||||
|
static bool fanRpm = true;
|
||||||
|
|
||||||
const int fansMax = 100;
|
const int fansMax = 100;
|
||||||
|
|
||||||
@@ -87,6 +88,11 @@ namespace GHelper
|
|||||||
chartXGM.MouseMove += (sender, e) => ChartCPU_MouseMove(sender, e, AsusFan.XGM);
|
chartXGM.MouseMove += (sender, e) => ChartCPU_MouseMove(sender, e, AsusFan.XGM);
|
||||||
chartXGM.MouseUp += ChartCPU_MouseUp;
|
chartXGM.MouseUp += ChartCPU_MouseUp;
|
||||||
|
|
||||||
|
chartCPU.MouseClick += ChartCPU_MouseClick;
|
||||||
|
chartGPU.MouseClick += ChartCPU_MouseClick;
|
||||||
|
chartMid.MouseClick += ChartCPU_MouseClick;
|
||||||
|
chartXGM.MouseClick += ChartCPU_MouseClick;
|
||||||
|
|
||||||
buttonReset.Click += ButtonReset_Click;
|
buttonReset.Click += ButtonReset_Click;
|
||||||
|
|
||||||
trackA0.Maximum = AsusACPI.MaxTotal;
|
trackA0.Maximum = AsusACPI.MaxTotal;
|
||||||
@@ -195,6 +201,24 @@ namespace GHelper
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void ChartCPU_MouseClick(object? sender, MouseEventArgs e)
|
||||||
|
{
|
||||||
|
if (sender is null) return;
|
||||||
|
Chart chart = (Chart)sender;
|
||||||
|
|
||||||
|
HitTestResult result = chart.HitTest(e.X, e.Y);
|
||||||
|
|
||||||
|
if ((result.ChartElementType == ChartElementType.AxisLabels || result.ChartElementType == ChartElementType.Axis) && result.Axis == chart.ChartAreas[0].AxisY)
|
||||||
|
{
|
||||||
|
fanRpm = !fanRpm;
|
||||||
|
SetAxis(chartCPU, AsusFan.CPU);
|
||||||
|
SetAxis(chartGPU, AsusFan.GPU);
|
||||||
|
if (chartMid.Visible) SetAxis(chartMid, AsusFan.Mid);
|
||||||
|
if (chartXGM.Visible) SetAxis(chartXGM, AsusFan.XGM);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
private void Fans_FormClosed(object? sender, FormClosedEventArgs e)
|
private void Fans_FormClosed(object? sender, FormClosedEventArgs e)
|
||||||
{
|
{
|
||||||
//Because windows charts seem to eat a lot of memory :(
|
//Because windows charts seem to eat a lot of memory :(
|
||||||
@@ -548,7 +572,24 @@ namespace GHelper
|
|||||||
int Max = MaxRPM;
|
int Max = MaxRPM;
|
||||||
if (device == AsusFan.XGM) Max = 72;
|
if (device == AsusFan.XGM) Max = 72;
|
||||||
|
|
||||||
return (200 * Math.Round((float)(MinRPM * 100 + (Max - MinRPM) * percentage) / 200)).ToString() + unit;
|
if (fanRpm)
|
||||||
|
return (200 * Math.Round((float)(MinRPM * 100 + (Max - MinRPM) * percentage) / 200)).ToString() + unit;
|
||||||
|
else
|
||||||
|
return percentage + "%";
|
||||||
|
}
|
||||||
|
|
||||||
|
void SetAxis(Chart chart, AsusFan device)
|
||||||
|
{
|
||||||
|
|
||||||
|
chart.ChartAreas[0].AxisY.CustomLabels.Clear();
|
||||||
|
|
||||||
|
for (int i = 0; i <= fansMax - 10; i += 10)
|
||||||
|
{
|
||||||
|
chart.ChartAreas[0].AxisY.CustomLabels.Add(i - 2, i + 2, ChartPercToRPM(i, device));
|
||||||
|
}
|
||||||
|
|
||||||
|
chart.ChartAreas[0].AxisY.CustomLabels.Add(fansMax - 2, fansMax + 2, Properties.Strings.RPM);
|
||||||
|
chart.ChartAreas[0].AxisY.Interval = 10;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SetChart(Chart chart, AsusFan device)
|
void SetChart(Chart chart, AsusFan device)
|
||||||
@@ -588,12 +629,7 @@ namespace GHelper
|
|||||||
chart.ChartAreas[0].AxisX.LineColor = chartGrid;
|
chart.ChartAreas[0].AxisX.LineColor = chartGrid;
|
||||||
chart.ChartAreas[0].AxisY.LineColor = chartGrid;
|
chart.ChartAreas[0].AxisY.LineColor = chartGrid;
|
||||||
|
|
||||||
for (int i = 0; i <= fansMax - 10; i += 10)
|
SetAxis(chart, device);
|
||||||
chart.ChartAreas[0].AxisY.CustomLabels.Add(i - 2, i + 2, ChartPercToRPM(i, device));
|
|
||||||
|
|
||||||
chart.ChartAreas[0].AxisY.CustomLabels.Add(fansMax - 2, fansMax + 2, Properties.Strings.RPM);
|
|
||||||
|
|
||||||
chart.ChartAreas[0].AxisY.Interval = 10;
|
|
||||||
|
|
||||||
if (chart.Legends.Count > 0)
|
if (chart.Legends.Count > 0)
|
||||||
chart.Legends[0].Enabled = false;
|
chart.Legends[0].Enabled = false;
|
||||||
|
|||||||
@@ -103,7 +103,12 @@ namespace GHelper.Input
|
|||||||
string actionM1 = AppConfig.GetString("m1");
|
string actionM1 = AppConfig.GetString("m1");
|
||||||
string actionM2 = AppConfig.GetString("m2");
|
string actionM2 = AppConfig.GetString("m2");
|
||||||
|
|
||||||
if (keyProfile != Keys.None) hook.RegisterHotKey(ModifierKeys.Shift | ModifierKeys.Control, keyProfile);
|
if (keyProfile != Keys.None)
|
||||||
|
{
|
||||||
|
hook.RegisterHotKey(ModifierKeys.Shift | ModifierKeys.Control, keyProfile);
|
||||||
|
hook.RegisterHotKey(ModifierKeys.Shift | ModifierKeys.Control | ModifierKeys.Alt, keyProfile);
|
||||||
|
}
|
||||||
|
|
||||||
if (keyApp != Keys.None) hook.RegisterHotKey(ModifierKeys.Shift | ModifierKeys.Control, keyApp);
|
if (keyApp != Keys.None) hook.RegisterHotKey(ModifierKeys.Shift | ModifierKeys.Control, keyApp);
|
||||||
|
|
||||||
if (!AppConfig.Is("skip_hotkeys"))
|
if (!AppConfig.Is("skip_hotkeys"))
|
||||||
@@ -280,6 +285,11 @@ namespace GHelper.Input
|
|||||||
if (e.Key == Keys.F20) KeyProcess("m3");
|
if (e.Key == Keys.F20) KeyProcess("m3");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (e.Modifier == (ModifierKeys.Control | ModifierKeys.Shift | ModifierKeys.Alt))
|
||||||
|
{
|
||||||
|
if (e.Key == keyProfile) modeControl.CyclePerformanceMode(true);
|
||||||
|
}
|
||||||
|
|
||||||
if (e.Modifier == (ModifierKeys.Control))
|
if (e.Modifier == (ModifierKeys.Control))
|
||||||
{
|
{
|
||||||
switch (e.Key)
|
switch (e.Key)
|
||||||
@@ -354,7 +364,7 @@ namespace GHelper.Input
|
|||||||
Program.settingsForm.BeginInvoke(Program.settingsForm.CycleAuraMode);
|
Program.settingsForm.BeginInvoke(Program.settingsForm.CycleAuraMode);
|
||||||
break;
|
break;
|
||||||
case "performance":
|
case "performance":
|
||||||
modeControl.CyclePerformanceMode();
|
modeControl.CyclePerformanceMode(Control.ModifierKeys == Keys.Shift);
|
||||||
break;
|
break;
|
||||||
case "ghelper":
|
case "ghelper":
|
||||||
Program.settingsForm.BeginInvoke(delegate
|
Program.settingsForm.BeginInvoke(delegate
|
||||||
@@ -470,7 +480,7 @@ namespace GHelper.Input
|
|||||||
KeyProcess("fne");
|
KeyProcess("fne");
|
||||||
return;
|
return;
|
||||||
case 174: // FN+F5
|
case 174: // FN+F5
|
||||||
modeControl.CyclePerformanceMode();
|
modeControl.CyclePerformanceMode(Control.ModifierKeys == Keys.Shift);
|
||||||
return;
|
return;
|
||||||
case 179: // FN+F4
|
case 179: // FN+F4
|
||||||
case 178: // FN+F4
|
case 178: // FN+F4
|
||||||
|
|||||||
@@ -116,9 +116,9 @@ namespace GHelper.Mode
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void CyclePerformanceMode()
|
public void CyclePerformanceMode(bool back = false)
|
||||||
{
|
{
|
||||||
SetPerformanceMode(Modes.GetNext(Control.ModifierKeys == Keys.Shift), true);
|
SetPerformanceMode(Modes.GetNext(back), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void AutoFans(bool force = false)
|
public void AutoFans(bool force = false)
|
||||||
|
|||||||
Reference in New Issue
Block a user