ayufan/steam-deck-tools
1
0
Fork 0
mirror of https://github.com/ayufan/steam-deck-tools.git synced 2026-04-05 06:15:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move FanMode and OverlayMode to GlobalConfig

Browse source
This commit is contained in:
Kamil Trzciński 2022-11-15 23:40:54 +01:00
parent 39fb809e01
commit 604a7e5b0b
8 changed files with 66 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

17
FanControl/FanControlForm.cs
View file

@ -1,5 +1,6 @@
using CommonHelpers;
using CommonHelpers;
using CommonHelpers.FromLibreHardwareMonitor;
using FanControl.Properties;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@ -40,7 +41,7 @@ namespace FanControl
propertyGrid1.SelectedObject = fanControl;
propertyGrid1.ExpandAllGridItems();
foreach (var item in Enum.GetValues(typeof(FanController.FanMode)))
foreach (var item in Enum.GetValues(typeof(FanMode)))
{
fanModeSelectMenu.Items.Add(item);
fanModeSelectNotifyMenu.Items.Add(item);
@ -48,12 +49,12 @@ namespace FanControl
try
{
var fanMode = Enum.Parse(typeof(FanController.FanMode), Properties.Settings.Default.FanMode);
setFanMode((FanController.FanMode)fanMode);
var fanMode = Enum.Parse(typeof(FanMode), Properties.Settings.Default.FanMode);
setFanMode((FanMode)fanMode);
}
catch(System.ArgumentException)
{
setFanMode(FanController.FanMode.Default);
setFanMode(FanMode.Default);
}
notifyIcon.ShowBalloonTip(3000, Text, "Fan Control Started", ToolTipIcon.Info);
@ -76,7 +77,7 @@ namespace FanControl
}
}
private void setFanMode(FanController.FanMode mode)
private void setFanMode(FanMode mode)
{
fanControl.SetMode(mode);
fanModeSelectMenu.SelectedItem = mode;
@ -88,7 +89,7 @@ namespace FanControl
private void fanModeSelect_SelectedValueChanged(object sender, EventArgs e)
{
var comboBox = (ToolStripComboBox)sender;
var selectedMode = (FanController.FanMode)comboBox.SelectedItem;
var selectedMode = (FanMode)comboBox.SelectedItem;
setFanMode(selectedMode);
}
@ -118,7 +119,7 @@ namespace FanControl
private void FanControlForm_FormClosed(object sender, FormClosedEventArgs e)
{
// Always revert to default on closing
fanControl.SetMode(FanController.FanMode.Default);
fanControl.SetMode(FanMode.Default);
}
private void fanLoopTimer_Tick(object sender, EventArgs e)

7
FanControl/FanController.cs
View file

@ -16,13 +16,6 @@ namespace FanControl
[RefreshProperties(RefreshProperties.Repaint)]
internal partial class FanController : IDisposable
{
public enum FanMode
{
Default,
SteamOS,
Max
}
[CategoryAttribute("Fan")]
public FanMode Mode { get; private set; }

3
FanControl/FanControllerSensors.cs
View file

@ -1,4 +1,5 @@
using LibreHardwareMonitor.Hardware;
using CommonHelpers;
using LibreHardwareMonitor.Hardware;
using System;
using System.Collections.Generic;
using System.ComponentModel;

13
FanControl/FanSensor.cs
View file

@ -1,4 +1,5 @@
using LibreHardwareMonitor.Hardware;
using CommonHelpers;
using LibreHardwareMonitor.Hardware;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@ -27,7 +28,7 @@ namespace FanControl
private List<float> AllSamples = new List<float>();
internal Dictionary<FanController.FanMode, Profile> Profiles { get; set; } = new Dictionary<FanController.FanMode, Profile>();
internal Dictionary<FanMode, Profile> Profiles { get; set; } = new Dictionary<FanMode, Profile>();
internal class Profile
{
@ -136,7 +137,7 @@ namespace FanControl
sensor.Name == SensorName;
}
public bool Update(ISensor hwSensor, FanController.FanMode mode)
public bool Update(ISensor hwSensor, FanMode mode)
{
if (!Matches(hwSensor))
return false;
@ -149,7 +150,7 @@ namespace FanControl
hwSensor.Value, mode);
}
public bool Update(string name, float? newValue, FanController.FanMode mode)
public bool Update(string name, float? newValue, FanMode mode)
{
if (!newValue.HasValue || newValue <= 0.0)
return false;
@ -174,7 +175,7 @@ namespace FanControl
return true;
}
public bool IsValid(FanController.FanMode mode)
public bool IsValid(FanMode mode)
{
// If we have profile, but no sensor value to consume it
// it is invalid
@ -217,7 +218,7 @@ namespace FanControl
return value;
}
public ushort? CalculateRPM(FanController.FanMode mode)
public ushort? CalculateRPM(FanMode mode)
{
if (!Profiles.ContainsKey(mode) || !Value.HasValue)
return null;