Skip to content

Commit

Permalink
v1.5.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@lich426
lich426 committed Nov 19, 2022
1 parent 89b852f commit 48366ac
Show file tree
Hide file tree
Showing 43 changed files with 569 additions and 1,952 deletions.
2 changes: 1 addition & 1 deletion App.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
</startup>
</configuration>
28 changes: 11 additions & 17 deletions FanCtrl.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<OutputType>WinExe</OutputType>
<RootNamespace>FanCtrl</RootNamespace>
<AssemblyName>FanCtrl</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
Expand All @@ -28,7 +28,7 @@
<PublisherName>Lich</PublisherName>
<SuiteName>FanCtrl</SuiteName>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.5.2.0</ApplicationVersion>
<ApplicationVersion>1.5.3.0</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<CreateDesktopShortcut>true</CreateDesktopShortcut>
<PublishWizardCompleted>true</PublishWizardCompleted>
Expand Down Expand Up @@ -194,18 +194,13 @@
<Compile Include="FanCtrl\Hardware\Control\BaseControl.cs" />
<Compile Include="FanCtrl\Hardware\Control\CLCFanControl.cs" />
<Compile Include="FanCtrl\Hardware\Control\CLCPumpControl.cs" />
<Compile Include="FanCtrl\Hardware\Control\GigabyteAmdGpuFanControl.cs" />
<Compile Include="FanCtrl\Hardware\Control\GigabyteFanControl.cs" />
<Compile Include="FanCtrl\Hardware\Control\GigabyteNvidiaGpuFanControl.cs" />
<Compile Include="FanCtrl\Hardware\Control\OHMControl.cs" />
<Compile Include="FanCtrl\Hardware\Control\LHMControl.cs" />
<Compile Include="FanCtrl\Hardware\Control\NvAPIFanControl.cs" />
<Compile Include="FanCtrl\Hardware\Control\KrakenFanControl.cs" />
<Compile Include="FanCtrl\Hardware\Control\KrakenPumpControl.cs" />
<Compile Include="FanCtrl\Hardware\Control\RGBnFCControl.cs" />
<Compile Include="FanCtrl\Hardware\BaseDevice.cs" />
<Compile Include="FanCtrl\Hardware\HardwareDevice.cs" />
<Compile Include="FanCtrl\Hardware\Gigabyte.cs" />
<Compile Include="FanCtrl\Hardware\HardwareManager.cs" />
<Compile Include="FanCtrl\Hardware\HWInfo\HWInfoManager.cs" />
<Compile Include="FanCtrl\Hardware\HWInfo\HWInfoCategory.cs" />
Expand All @@ -216,32 +211,22 @@
<Compile Include="FanCtrl\Hardware\Kraken.cs" />
<Compile Include="FanCtrl\Hardware\LHM.cs" />
<Compile Include="FanCtrl\Hardware\OSD\HWInfoOSDSensor.cs" />
<Compile Include="FanCtrl\Hardware\OSD\OHMOSDSensor.cs" />
<Compile Include="FanCtrl\Hardware\OSD\LHMOSDSensor.cs" />
<Compile Include="FanCtrl\Hardware\Sensor\HWInfoFanSpeed.cs" />
<Compile Include="FanCtrl\Hardware\Control\LiquidctlControl.cs" />
<Compile Include="FanCtrl\Hardware\Sensor\LiquidctlSpeed.cs" />
<Compile Include="FanCtrl\Hardware\Sensor\LiquidctlTemp.cs" />
<Compile Include="FanCtrl\Hardware\Sensor\HWInfoTemp.cs" />
<Compile Include="FanCtrl\Hardware\Sensor\OHMFanSpeed.cs" />
<Compile Include="FanCtrl\Hardware\Sensor\LHMFanSpeed.cs" />
<Compile Include="FanCtrl\Hardware\Sensor\OHMTemp.cs" />
<Compile Include="FanCtrl\Hardware\Sensor\LHMTemp.cs" />
<Compile Include="FanCtrl\Hardware\Define.cs" />
<Compile Include="FanCtrl\Hardware\OSD\NvAPIOSDSensor.cs" />
<Compile Include="FanCtrl\Hardware\USBDevice.cs" />
<Compile Include="FanCtrl\Hardware\OHM.cs" />
<Compile Include="FanCtrl\Hardware\RGBnFC.cs" />
<Compile Include="FanCtrl\Hardware\Sensor\CLCFanSpeed.cs" />
<Compile Include="FanCtrl\Hardware\Sensor\CLCLiquidTemp.cs" />
<Compile Include="FanCtrl\Hardware\Sensor\CLCPumpSpeed.cs" />
<Compile Include="FanCtrl\Hardware\Sensor\DimmTemp.cs" />
<Compile Include="FanCtrl\Hardware\Sensor\GigabyteAmdGpuFanSpeed.cs" />
<Compile Include="FanCtrl\Hardware\Sensor\GigabyteAmdGpuTemp.cs" />
<Compile Include="FanCtrl\Hardware\Sensor\GigabyteFanSpeed.cs" />
<Compile Include="FanCtrl\Hardware\Sensor\GigabyteNvidiaGpuFanSpeed.cs" />
<Compile Include="FanCtrl\Hardware\Sensor\GigabyteNvidiaGpuTemp.cs" />
<Compile Include="FanCtrl\Hardware\Sensor\GigabyteTemp.cs" />
<Compile Include="FanCtrl\Hardware\Sensor\NvAPIFanSpeed.cs" />
<Compile Include="FanCtrl\Hardware\Sensor\NvAPITemp.cs" />
<Compile Include="FanCtrl\Data\Option\OptionManager.cs" />
Expand Down Expand Up @@ -315,6 +300,11 @@
<DesignTime>True</DesignTime>
<DependentUpon>StringLib.resx</DependentUpon>
</Compile>
<Compile Include="StringLib.ja.Designer.cs">
<DependentUpon>StringLib.ja.resx</DependentUpon>
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
</Compile>
<Compile Include="StringLib.ko.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
Expand Down Expand Up @@ -360,6 +350,10 @@
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<EmbeddedResource Include="StringLib.ja.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>StringLib.ja.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="StringLib.ko.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>StringLib.ko.Designer.cs</LastGenOutput>
Expand Down
94 changes: 33 additions & 61 deletions FanCtrl/Data/Option/OptionManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System.Reflection;
using System.Threading;

namespace FanCtrl
{
Expand All @@ -26,11 +27,6 @@ private OptionManager()

public int Interval { get; set; }

// Gigabyte
public bool IsGigabyte { get; set; }
public bool IsGigabyteMotherboard { get; set; }
public bool IsGigabyteGpu { get; set; }

// LibreHardwareMonitor
public bool IsLHM { get; set; }
public bool IsLHMCpu { get; set; }
Expand All @@ -40,15 +36,6 @@ private OptionManager()
public bool IsLHMStorage { get; set; }
public bool IsLHMMemory { get; set; }

// OpenHardwareMonitor
public bool IsOHM { get; set; }
public bool IsOHMCpu { get; set; }
public bool IsOHMMotherboard { get; set; }
public bool IsOHMGpu { get; set; }
public bool IsOHMContolled { get; set; }
public bool IsOHMStorage { get; set; }
public bool IsOHMMemory { get; set; }

// NvApiWrapper
public bool IsNvAPIWrapper { get; set; }

Expand All @@ -71,6 +58,8 @@ private OptionManager()
public bool IsLiquidctl { get; set; }

// Other options
public int Language { get; set; }

public bool IsAnimation { get; set; }

public bool IsFahrenheit { get; set; }
Expand Down Expand Up @@ -107,34 +96,23 @@ public void reset()
{
Interval = 1000;

IsGigabyte = false;
IsGigabyteMotherboard = true;
IsGigabyteGpu = true;

IsLHM = true;
IsLHMCpu = true;
IsLHMMotherboard = true;
IsLHMGpu = false;
IsLHMGpu = true;
IsLHMContolled = true;
IsLHMStorage = true;
IsLHMMemory = true;

IsOHM = false;
IsOHMCpu = true;
IsOHMMotherboard = true;
IsOHMGpu = false;
IsOHMContolled = false;
IsOHMStorage = false;
IsOHMMemory = false;

IsNvAPIWrapper = true;
IsDimm = true;
IsKraken = true;
IsCLC = true;
IsRGBnFC = true;
IsNvAPIWrapper = false;
IsDimm = false;
IsKraken = false;
IsCLC = false;
IsRGBnFC = false;
IsHWInfo = false;
IsLiquidctl = false;

Language = getSystemLocale();
IsAnimation = true;
IsFahrenheit = false;
IsMinimized = false;
Expand All @@ -149,34 +127,23 @@ public bool read()

Interval = (rootObject.ContainsKey("Interval") == true) ? rootObject.Value<int>("Interval") : 1000;

IsGigabyte = (rootObject.ContainsKey("IsGigabyte") == true) ? rootObject.Value<bool>("IsGigabyte") : false;
IsGigabyteMotherboard = (rootObject.ContainsKey("IsGigabyteMotherboard") == true) ? rootObject.Value<bool>("IsGigabyteMotherboard") : true;
IsGigabyteGpu = (rootObject.ContainsKey("IsGigabyteGpu") == true) ? rootObject.Value<bool>("IsGigabyteGpu") : true;

IsLHM = (rootObject.ContainsKey("IsLHM") == true) ? rootObject.Value<bool>("IsLHM") : true;
IsLHMCpu = (rootObject.ContainsKey("IsLHMCpu") == true) ? rootObject.Value<bool>("IsLHMCpu") : true;
IsLHMMotherboard = (rootObject.ContainsKey("IsLHMMotherboard") == true) ? rootObject.Value<bool>("IsLHMMotherboard") : true;
IsLHMGpu = (rootObject.ContainsKey("IsLHMGpu") == true) ? rootObject.Value<bool>("IsLHMGpu") : false;
IsLHMGpu = (rootObject.ContainsKey("IsLHMGpu") == true) ? rootObject.Value<bool>("IsLHMGpu") : true;
IsLHMContolled = (rootObject.ContainsKey("IsLHMContolled") == true) ? rootObject.Value<bool>("IsLHMContolled") : true;
IsLHMStorage = (rootObject.ContainsKey("IsLHMStorage") == true) ? rootObject.Value<bool>("IsLHMStorage") : true;
IsLHMMemory = (rootObject.ContainsKey("IsLHMMemory") == true) ? rootObject.Value<bool>("IsLHMMemory") : true;

IsOHM = (rootObject.ContainsKey("IsOHM") == true) ? rootObject.Value<bool>("IsOHM") : false;
IsOHMCpu = (rootObject.ContainsKey("IsOHMCpu") == true) ? rootObject.Value<bool>("IsOHMCpu") : true;
IsOHMMotherboard = (rootObject.ContainsKey("IsOHMMotherboard") == true) ? rootObject.Value<bool>("IsOHMMotherboard") : true;
IsOHMGpu = (rootObject.ContainsKey("IsOHMGpu") == true) ? rootObject.Value<bool>("IsOHMGpu") : false;
IsOHMContolled = (rootObject.ContainsKey("IsOHMContolled") == true) ? rootObject.Value<bool>("IsOHMContolled") : false;
IsOHMStorage = (rootObject.ContainsKey("IsOHMStorage") == true) ? rootObject.Value<bool>("IsOHMStorage") : false;
IsOHMMemory = (rootObject.ContainsKey("IsOHMMemory") == true) ? rootObject.Value<bool>("IsOHMMemory") : false;

IsNvAPIWrapper = (rootObject.ContainsKey("IsNvAPIWrapper") == true) ? rootObject.Value<bool>("IsNvAPIWrapper") : true;
IsNvAPIWrapper = (rootObject.ContainsKey("IsNvAPIWrapper") == true) ? rootObject.Value<bool>("IsNvAPIWrapper") : false;
IsDimm = (rootObject.ContainsKey("IsDimm") == true) ? rootObject.Value<bool>("IsDimm") : false;
IsKraken = (rootObject.ContainsKey("IsKraken") == true) ? rootObject.Value<bool>("IsKraken") : true;
IsCLC = (rootObject.ContainsKey("IsCLC") == true) ? rootObject.Value<bool>("IsCLC") : true;
IsRGBnFC = (rootObject.ContainsKey("IsRGBnFC") == true) ? rootObject.Value<bool>("IsRGBnFC") : true;
IsKraken = (rootObject.ContainsKey("IsKraken") == true) ? rootObject.Value<bool>("IsKraken") : false;
IsCLC = (rootObject.ContainsKey("IsCLC") == true) ? rootObject.Value<bool>("IsCLC") : false;
IsRGBnFC = (rootObject.ContainsKey("IsRGBnFC") == true) ? rootObject.Value<bool>("IsRGBnFC") : false;
IsHWInfo = (rootObject.ContainsKey("IsHWInfo") == true) ? rootObject.Value<bool>("IsHWInfo") : false;
IsLiquidctl = (rootObject.ContainsKey("IsLiquidctl") == true) ? rootObject.Value<bool>("IsLiquidctl") : false;

Language = (rootObject.ContainsKey("Language") == true) ? rootObject.Value<int>("Language") : this.getSystemLocale();
IsAnimation = (rootObject.ContainsKey("IsAnimation") == true) ? rootObject.Value<bool>("IsAnimation") : true;
IsFahrenheit = (rootObject.ContainsKey("IsFahrenheit") == true) ? rootObject.Value<bool>("IsFahrenheit") : false;
IsMinimized = (rootObject.ContainsKey("IsMinimized") == true) ? rootObject.Value<bool>("IsMinimized") : false;
Expand All @@ -197,10 +164,6 @@ public void write()
var rootObject = new JObject();
rootObject["Interval"] = Interval;

rootObject["IsGigabyte"] = IsGigabyte;
rootObject["IsGigabyteMotherboard"] = IsGigabyteMotherboard;
rootObject["IsGigabyteGpu"] = IsGigabyteGpu;

rootObject["IsLHM"] = IsLHM;
rootObject["IsLHMCpu"] = IsLHMCpu;
rootObject["IsLHMMotherboard"] = IsLHMMotherboard;
Expand All @@ -209,14 +172,6 @@ public void write()
rootObject["IsLHMStorage"] = IsLHMStorage;
rootObject["IsLHMMemory"] = IsLHMMemory;

rootObject["IsOHM"] = IsOHM;
rootObject["IsOHMCpu"] = IsOHMCpu;
rootObject["IsOHMMotherboard"] = IsOHMMotherboard;
rootObject["IsOHMGpu"] = IsOHMGpu;
rootObject["IsOHMContolled"] = IsOHMContolled;
rootObject["IsOHMStorage"] = IsOHMStorage;
rootObject["IsOHMMemory"] = IsOHMMemory;

rootObject["IsNvAPIWrapper"] = IsNvAPIWrapper;
rootObject["IsDimm"] = IsDimm;
rootObject["IsKraken"] = IsKraken;
Expand All @@ -225,6 +180,7 @@ public void write()
rootObject["IsHWInfo"] = IsHWInfo;
rootObject["IsLiquidctl"] = IsLiquidctl;

rootObject["Language"] = Language;
rootObject["IsAnimation"] = IsAnimation;
rootObject["IsFahrenheit"] = IsFahrenheit;
rootObject["IsMinimized"] = IsMinimized;
Expand All @@ -236,5 +192,21 @@ public void write()
catch {}
}

public int getSystemLocale()
{
var name = Thread.CurrentThread.CurrentCulture.Name;
if (name.CompareTo("ko-KR") == 0)
{
return 1;
}
else if (name.CompareTo("ja-JP") == 0)
{
return 2;
}
else
{
return 0;
}
}
}
}
79 changes: 0 additions & 79 deletions FanCtrl/Hardware/Control/GigabyteAmdGpuFanControl.cs
View file

This file was deleted.

Loading

0 comments on commit 48366ac

Please sign in to comment.