Add support for AMD Ryzen 5000 Series

lich426 · Nov 15, 2020 · 4d078f6 · 4d078f6
1 parent 196b550
commit 4d078f6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/FanCtrl.csproj b/FanCtrl.csproj
@@ -28,7 +28,7 @@
     <PublisherName>Lich</PublisherName>
     <SuiteName>FanCtrl</SuiteName>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.2.4.0</ApplicationVersion>
+    <ApplicationVersion>1.2.6.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>

diff --git a/FanCtrl/Data/Option/OptionManager.cs b/FanCtrl/Data/Option/OptionManager.cs
@@ -28,12 +28,13 @@ public class OptionManager
         private OptionManager()
         {
             Interval = 1000;
-            IsGigabyte = true;
+            IsGigabyte = false;
             LibraryType = LibraryType.LibreHardwareMonitor;
-            IsNvAPIWrapper = false;
+            IsNvAPIWrapper = true;
             IsDimm = true;
             IsKraken = true;
-            IsCLC = false;
+            IsCLC = true;
+            IsRGBnFC = true;
             IsAnimation = true;
             IsFahrenheit = false;
             IsMinimized = false;
@@ -97,23 +98,23 @@ public bool read()
 
                 Interval = (rootObject.ContainsKey("interval") == true) ? rootObject.Value<int>("interval") : 1000;
 
-                IsGigabyte = (rootObject.ContainsKey("gigabyte") == true) ? rootObject.Value<bool>("gigabyte") : true;
+                IsGigabyte = (rootObject.ContainsKey("gigabyte") == true) ? rootObject.Value<bool>("gigabyte") : false;
 
                 if (rootObject.ContainsKey("library") == false)
                     LibraryType = LibraryType.LibreHardwareMonitor;
                 else
                     LibraryType = (rootObject.Value<int>("library") == 0) ? LibraryType.LibreHardwareMonitor : LibraryType.OpenHardwareMonitor;
 
-                IsNvAPIWrapper = (rootObject.ContainsKey("nvapi") == true) ? rootObject.Value<bool>("nvapi") : false;
+                IsNvAPIWrapper = (rootObject.ContainsKey("nvapi") == true) ? rootObject.Value<bool>("nvapi") : true;
                 IsDimm = (rootObject.ContainsKey("dimm") == true) ? rootObject.Value<bool>("dimm") : true;
                 IsKraken = (rootObject.ContainsKey("kraken") == true) ? rootObject.Value<bool>("kraken") : true;
-                IsCLC= (rootObject.ContainsKey("clc") == true) ? rootObject.Value<bool>("clc") : false;
-                IsRGBnFC = (rootObject.ContainsKey("rgbnfc") == true) ? rootObject.Value<bool>("rgbnfc") : false;
+                IsCLC = (rootObject.ContainsKey("clc") == true) ? rootObject.Value<bool>("clc") : true;
+                IsRGBnFC = (rootObject.ContainsKey("rgbnfc") == true) ? rootObject.Value<bool>("rgbnfc") : true;
                 IsAnimation = (rootObject.ContainsKey("animation") == true) ? rootObject.Value<bool>("animation") : true;
                 IsFahrenheit = (rootObject.ContainsKey("fahrenheit") == true) ? rootObject.Value<bool>("fahrenheit") : false;
                 IsMinimized = (rootObject.ContainsKey("minimized") == true) ? rootObject.Value<bool>("minimized") : false;
-                DelayTime = (rootObject.ContainsKey("delay") == true) ? rootObject.Value<int>("delay") : 0;
                 IsStartUp = (rootObject.ContainsKey("startup") == true) ? rootObject.Value<bool>("startup") : false;
+                DelayTime = (rootObject.ContainsKey("delay") == true) ? rootObject.Value<int>("delay") : 0;
             }
             catch
             {
@@ -138,8 +139,8 @@ public void write()
                 rootObject["animation"] = IsAnimation;
                 rootObject["fahrenheit"] = IsFahrenheit;
                 rootObject["minimized"] = IsMinimized;
-                rootObject["delay"] = DelayTime;
                 rootObject["startup"] = IsStartUp;
+                rootObject["delay"] = DelayTime;
                 File.WriteAllText(mOptionFileName, rootObject.ToString());
             }
             catch {}

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -31,6 +31,6 @@
 //
 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를
 // 기본값으로 할 수 있습니다.
-[assembly: AssemblyVersion("1.2.5")]
-[assembly: AssemblyFileVersion("1.2.5")]
-[assembly: AssemblyInformationalVersion("1.2.5")]
+[assembly: AssemblyVersion("1.2.6")]
+[assembly: AssemblyFileVersion("1.2.6")]
+[assembly: AssemblyInformationalVersion("1.2.6")]
diff --git a/dll/LibreHardwareMonitorLib.dll b/dll/LibreHardwareMonitorLib.dll