diff --git a/Hardware/ATI/ATIGroup.cs b/Hardware/ATI/ATIGroup.cs index 2bc653d..47125fe 100644 --- a/Hardware/ATI/ATIGroup.cs +++ b/Hardware/ATI/ATIGroup.cs @@ -116,7 +116,7 @@ namespace OpenHardwareMonitor.Hardware.ATI { } if (!found) hardware.Add(new ATIGPU( - adapterInfo[i].AdapterName, + adapterInfo[i].AdapterName.Trim(), adapterInfo[i].AdapterIndex, adapterInfo[i].BusNumber, adapterInfo[i].DeviceNumber)); diff --git a/Hardware/CPU/CPUGroup.cs b/Hardware/CPU/CPUGroup.cs index 80488b3..08fd780 100644 --- a/Hardware/CPU/CPUGroup.cs +++ b/Hardware/CPU/CPUGroup.cs @@ -111,7 +111,7 @@ namespace OpenHardwareMonitor.Hardware.CPU { AppendRegister(nameBuilder, edx); } } - cpuBrandString = nameBuilder.ToString(); + cpuBrandString = nameBuilder.ToString().Trim('\0'); nameBuilder.Replace("(R)", " "); nameBuilder.Replace("(TM)", " "); nameBuilder.Replace("(tm)", " "); @@ -177,8 +177,6 @@ namespace OpenHardwareMonitor.Hardware.CPU { } public string GetReport() { - if (hardware.Count == 0) - return null; StringBuilder r = new StringBuilder(); @@ -199,10 +197,12 @@ namespace OpenHardwareMonitor.Hardware.CPU { r.AppendLine("CPUID Return Values"); r.AppendLine(); - r.AppendLine(" Function EAX EBX ECX EDX"); - AppendCpuidData(r, cpuidData, CPUID); - AppendCpuidData(r, cpuidExtData, CPUID_EXT); - r.AppendLine(); + if (cpuidData != null) { + r.AppendLine(" Function EAX EBX ECX EDX"); + AppendCpuidData(r, cpuidData, CPUID); + AppendCpuidData(r, cpuidExtData, CPUID_EXT); + r.AppendLine(); + } return r.ToString(); } diff --git a/Hardware/LPC/F718XX.cs b/Hardware/LPC/F718XX.cs index beef072..1d93204 100644 --- a/Hardware/LPC/F718XX.cs +++ b/Hardware/LPC/F718XX.cs @@ -107,7 +107,7 @@ namespace OpenHardwareMonitor.Hardware.LPC { } public string Identifier { - get { return "/lpc/f71882fg"; } + get { return "/lpc/" + chip.ToString().ToLower(); } } public Image Icon { diff --git a/Hardware/LPC/IT87XX.cs b/Hardware/LPC/IT87XX.cs index 4a02a89..fd8f2d4 100644 --- a/Hardware/LPC/IT87XX.cs +++ b/Hardware/LPC/IT87XX.cs @@ -131,7 +131,7 @@ namespace OpenHardwareMonitor.Hardware.LPC { } public string Identifier { - get { return "/lpc/it87"; } + get { return "/lpc/" + chip.ToString().ToLower(); } } public Image Icon { diff --git a/Hardware/ReportWriter.cs b/Hardware/ReportWriter.cs index 339c7d1..cadeba5 100644 --- a/Hardware/ReportWriter.cs +++ b/Hardware/ReportWriter.cs @@ -21,10 +21,26 @@ namespace OpenHardwareMonitor.Hardware { w.WriteLine(); w.WriteLine("Open Hardware Monitor Report"); w.WriteLine(); + NewSection(w); w.Write("Version: "); w.WriteLine(version.ToString()); w.WriteLine(); + NewSection(w); + foreach (IGroup group in groupList) { + foreach (IHardware hardware in group.Hardware) { + w.WriteLine("|"); + w.WriteLine("+-+ {0} ({1})", + new object[] { hardware.Name, hardware.Identifier }); + foreach (ISensor sensor in hardware.Sensors) { + w.WriteLine("| +- {0} : {1} : {2} : {3}", + new object[] { sensor.SensorType, sensor.Index, sensor.Name, + sensor.Value }); + } + } + } + w.WriteLine(); + foreach (IGroup group in groupList) { string report = group.GetReport(); if (report != null) { diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index d56e095..9303358 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -69,5 +69,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.1.6.0")] -[assembly: AssemblyFileVersion("0.1.6.0")] +[assembly: AssemblyVersion("0.1.7.0")] +[assembly: AssemblyFileVersion("0.1.7.0")]