# HG changeset patch
# User moel.mich
# Date 1265058254 0
# Node ID 49220085218d10841b5ac87749f0fbe5f0f97e09
# Parent  7ec0cbef0350b7c27c63702a90f66d6edef37bb2
Release version 0.1.7. Improved report writer.

diff -r 7ec0cbef0350 -r 49220085218d Hardware/ATI/ATIGroup.cs
--- a/Hardware/ATI/ATIGroup.cs	Mon Feb 01 20:17:02 2010 +0000
+++ b/Hardware/ATI/ATIGroup.cs	Mon Feb 01 21:04:14 2010 +0000
@@ -116,7 +116,7 @@
                       }
                     if (!found)
                       hardware.Add(new ATIGPU(
-                        adapterInfo[i].AdapterName,
+                        adapterInfo[i].AdapterName.Trim(),
                         adapterInfo[i].AdapterIndex,
                         adapterInfo[i].BusNumber, 
                         adapterInfo[i].DeviceNumber));
diff -r 7ec0cbef0350 -r 49220085218d Hardware/CPU/CPUGroup.cs
--- a/Hardware/CPU/CPUGroup.cs	Mon Feb 01 20:17:02 2010 +0000
+++ b/Hardware/CPU/CPUGroup.cs	Mon Feb 01 21:04:14 2010 +0000
@@ -111,7 +111,7 @@
             AppendRegister(nameBuilder, edx);
           }
         }
-        cpuBrandString = nameBuilder.ToString();
+        cpuBrandString = nameBuilder.ToString().Trim('\0');
         nameBuilder.Replace("(R)", " ");
         nameBuilder.Replace("(TM)", " ");
         nameBuilder.Replace("(tm)", " ");
@@ -177,8 +177,6 @@
     }
 
     public string GetReport() {
-      if (hardware.Count == 0)
-        return null;
 
       StringBuilder r = new StringBuilder();
 
@@ -199,10 +197,12 @@
       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 -r 7ec0cbef0350 -r 49220085218d Hardware/LPC/F718XX.cs
--- a/Hardware/LPC/F718XX.cs	Mon Feb 01 20:17:02 2010 +0000
+++ b/Hardware/LPC/F718XX.cs	Mon Feb 01 21:04:14 2010 +0000
@@ -107,7 +107,7 @@
     }
 
     public string Identifier {
-      get { return "/lpc/f71882fg"; }
+      get { return "/lpc/" + chip.ToString().ToLower(); }
     }
 
     public Image Icon {
diff -r 7ec0cbef0350 -r 49220085218d Hardware/LPC/IT87XX.cs
--- a/Hardware/LPC/IT87XX.cs	Mon Feb 01 20:17:02 2010 +0000
+++ b/Hardware/LPC/IT87XX.cs	Mon Feb 01 21:04:14 2010 +0000
@@ -131,7 +131,7 @@
     }
 
     public string Identifier {
-      get { return "/lpc/it87"; }
+      get { return "/lpc/" + chip.ToString().ToLower(); }
     }
 
     public Image Icon {
diff -r 7ec0cbef0350 -r 49220085218d Hardware/ReportWriter.cs
--- a/Hardware/ReportWriter.cs	Mon Feb 01 20:17:02 2010 +0000
+++ b/Hardware/ReportWriter.cs	Mon Feb 01 21:04:14 2010 +0000
@@ -21,10 +21,26 @@
         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 -r 7ec0cbef0350 -r 49220085218d Properties/AssemblyInfo.cs
--- a/Properties/AssemblyInfo.cs	Mon Feb 01 20:17:02 2010 +0000
+++ b/Properties/AssemblyInfo.cs	Mon Feb 01 21:04:14 2010 +0000
@@ -69,5 +69,5 @@
 // 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")]