From d7316f81bbd627f26a20e5148275fcfd05aa7e12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=B6ller?= Date: Thu, 26 May 2016 15:14:29 +0200 Subject: [PATCH] Added Intel CPU models 0x4F and 0x56. --- GUI/AboutBox.Designer.cs | 4 ++-- Hardware/CPU/IntelCPU.cs | 6 ++++-- Properties/AssemblyInfo.cs | 4 ++-- Properties/AssemblyVersion.cs | 6 +++--- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/GUI/AboutBox.Designer.cs b/GUI/AboutBox.Designer.cs index d380e40..d5fdae6 100644 --- a/GUI/AboutBox.Designer.cs +++ b/GUI/AboutBox.Designer.cs @@ -4,7 +4,7 @@ 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/. - Copyright (C) 2009-2013 Michael Möller + Copyright (C) 2009-2016 Michael Möller */ @@ -84,7 +84,7 @@ namespace OpenHardwareMonitor.GUI { this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(273, 13); 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 // diff --git a/Hardware/CPU/IntelCPU.cs b/Hardware/CPU/IntelCPU.cs index 58fc0db..5d18fa1 100644 --- a/Hardware/CPU/IntelCPU.cs +++ b/Hardware/CPU/IntelCPU.cs @@ -4,7 +4,7 @@ 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/. - Copyright (C) 2009-2014 Michael Möller + Copyright (C) 2009-2016 Michael Möller */ @@ -148,7 +148,9 @@ namespace OpenHardwareMonitor.Hardware.CPU { tjMax = GetTjMaxFromMSR(); break; 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; tjMax = GetTjMaxFromMSR(); break; diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 6ce9581..beb6167 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -4,7 +4,7 @@ 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/. - Copyright (C) 2009-2013 Michael Möller + Copyright (C) 2009-2016 Michael Möller */ @@ -18,7 +18,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("Open Hardware Monitor")] -[assembly: AssemblyCopyright("Copyright © 2009-2014 Michael Möller")] +[assembly: AssemblyCopyright("Copyright © 2009-2016 Michael Möller")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Properties/AssemblyVersion.cs b/Properties/AssemblyVersion.cs index 15f20a1..af6b346 100644 --- a/Properties/AssemblyVersion.cs +++ b/Properties/AssemblyVersion.cs @@ -4,11 +4,11 @@ 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/. - Copyright (C) 2009-2015 Michael Möller + Copyright (C) 2009-2016 Michael Möller */ using System.Reflection; -[assembly: AssemblyVersion("0.7.1.4")] -[assembly: AssemblyInformationalVersion("0.7.1.4 Alpha")] \ No newline at end of file +[assembly: AssemblyVersion("0.7.1.5")] +[assembly: AssemblyInformationalVersion("0.7.1.5 Alpha")] \ No newline at end of file