mir/openhardwaremonitor
2
0
Fork 0
mirror of https://github.com/openhardwaremonitor/openhardwaremonitor synced 2025-09-02 07:15:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added Intel CPU models 0x4F and 0x56.

Browse Source
This commit is contained in:
Michael Möller
2016-05-26 15:14:29 +02:00
parent bdbe56e8df
commit d7316f81bb
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
GUI/AboutBox.Designer.cs generated
View File

@@ -4,7 +4,7 @@
License, v. 2.0. If a copy of the MPL was not distributed with this License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at http://mozilla.org/MPL/2.0/. file, You can obtain one at http://mozilla.org/MPL/2.0/.
Copyright (C) 2009-2013 Michael Möller <mmoeller@openhardwaremonitor.org> Copyright (C) 2009-2016 Michael Möller <mmoeller@openhardwaremonitor.org>
*/ */
@@ -84,7 +84,7 @@ namespace OpenHardwareMonitor.GUI {
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(273, 13); this.label2.Size = new System.Drawing.Size(273, 13);
this.label2.TabIndex = 3; this.label2.TabIndex = 3;
this.label2.Text = "Copyright © 2009-2015 Michael Möller and contributers. "; this.label2.Text = "Copyright © 2009-2016 Michael Möller and contributers. ";
// //
// label3 // label3
// //

6
Hardware/CPU/IntelCPU.cs
View File

@@ -4,7 +4,7 @@
License, v. 2.0. If a copy of the MPL was not distributed with this License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at http://mozilla.org/MPL/2.0/. file, You can obtain one at http://mozilla.org/MPL/2.0/.
Copyright (C) 2009-2014 Michael Möller <mmoeller@openhardwaremonitor.org> Copyright (C) 2009-2016 Michael Möller <mmoeller@openhardwaremonitor.org>
*/ */
@@ -148,7 +148,9 @@ namespace OpenHardwareMonitor.Hardware.CPU {
tjMax = GetTjMaxFromMSR(); tjMax = GetTjMaxFromMSR();
break; break;
case 0x3D: // Intel Core M-5xxx (14nm) case 0x3D: // Intel Core M-5xxx (14nm)
case 0x47: // Intel i5, i7 5xxC (14nm) case 0x47: // Intel i5, i7 5xxx, Xeon E3-1200 v4 (14nm)
case 0x4F: // Intel Xeon E5-26xx v4
case 0x56: // Intel Xeon D-15xx
microarchitecture = Microarchitecture.Broadwell; microarchitecture = Microarchitecture.Broadwell;
tjMax = GetTjMaxFromMSR(); tjMax = GetTjMaxFromMSR();
break; break;

4
Properties/AssemblyInfo.cs
View File

@@ -4,7 +4,7 @@
License, v. 2.0. If a copy of the MPL was not distributed with this License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at http://mozilla.org/MPL/2.0/. file, You can obtain one at http://mozilla.org/MPL/2.0/.
Copyright (C) 2009-2013 Michael Möller <mmoeller@openhardwaremonitor.org> Copyright (C) 2009-2016 Michael Möller <mmoeller@openhardwaremonitor.org>
*/ */
@@ -18,7 +18,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Open Hardware Monitor")] [assembly: AssemblyProduct("Open Hardware Monitor")]
[assembly: AssemblyCopyright("Copyright © 2009-2014 Michael Möller")] [assembly: AssemblyCopyright("Copyright © 2009-2016 Michael Möller")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]

6
Properties/AssemblyVersion.cs
View File

@@ -4,11 +4,11 @@
License, v. 2.0. If a copy of the MPL was not distributed with this License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at http://mozilla.org/MPL/2.0/. file, You can obtain one at http://mozilla.org/MPL/2.0/.
Copyright (C) 2009-2015 Michael Möller <mmoeller@openhardwaremonitor.org> Copyright (C) 2009-2016 Michael Möller <mmoeller@openhardwaremonitor.org>
*/ */
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("0.7.1.4")] [assembly: AssemblyVersion("0.7.1.5")]
[assembly: AssemblyInformationalVersion("0.7.1.4 Alpha")] [assembly: AssemblyInformationalVersion("0.7.1.5 Alpha")]