Release version 0.1.7. Improved report writer.
authormoel.mich
Mon, 01 Feb 2010 21:04:14 +0000
changeset 1849220085218d
parent 17 7ec0cbef0350
child 19 890e8fca7f33
Release version 0.1.7. Improved report writer.
Hardware/ATI/ATIGroup.cs
Hardware/CPU/CPUGroup.cs
Hardware/LPC/F718XX.cs
Hardware/LPC/IT87XX.cs
Hardware/ReportWriter.cs
Properties/AssemblyInfo.cs
     1.1 --- a/Hardware/ATI/ATIGroup.cs	Mon Feb 01 20:17:02 2010 +0000
     1.2 +++ b/Hardware/ATI/ATIGroup.cs	Mon Feb 01 21:04:14 2010 +0000
     1.3 @@ -116,7 +116,7 @@
     1.4                        }
     1.5                      if (!found)
     1.6                        hardware.Add(new ATIGPU(
     1.7 -                        adapterInfo[i].AdapterName,
     1.8 +                        adapterInfo[i].AdapterName.Trim(),
     1.9                          adapterInfo[i].AdapterIndex,
    1.10                          adapterInfo[i].BusNumber, 
    1.11                          adapterInfo[i].DeviceNumber));
     2.1 --- a/Hardware/CPU/CPUGroup.cs	Mon Feb 01 20:17:02 2010 +0000
     2.2 +++ b/Hardware/CPU/CPUGroup.cs	Mon Feb 01 21:04:14 2010 +0000
     2.3 @@ -111,7 +111,7 @@
     2.4              AppendRegister(nameBuilder, edx);
     2.5            }
     2.6          }
     2.7 -        cpuBrandString = nameBuilder.ToString();
     2.8 +        cpuBrandString = nameBuilder.ToString().Trim('\0');
     2.9          nameBuilder.Replace("(R)", " ");
    2.10          nameBuilder.Replace("(TM)", " ");
    2.11          nameBuilder.Replace("(tm)", " ");
    2.12 @@ -177,8 +177,6 @@
    2.13      }
    2.14  
    2.15      public string GetReport() {
    2.16 -      if (hardware.Count == 0)
    2.17 -        return null;
    2.18  
    2.19        StringBuilder r = new StringBuilder();
    2.20  
    2.21 @@ -199,10 +197,12 @@
    2.22        r.AppendLine("CPUID Return Values");
    2.23        r.AppendLine();
    2.24  
    2.25 -      r.AppendLine(" Function  EAX       EBX       ECX       EDX");
    2.26 -      AppendCpuidData(r, cpuidData, CPUID);
    2.27 -      AppendCpuidData(r, cpuidExtData, CPUID_EXT);
    2.28 -      r.AppendLine();
    2.29 +      if (cpuidData != null) {
    2.30 +        r.AppendLine(" Function  EAX       EBX       ECX       EDX");
    2.31 +        AppendCpuidData(r, cpuidData, CPUID);
    2.32 +        AppendCpuidData(r, cpuidExtData, CPUID_EXT);
    2.33 +        r.AppendLine();
    2.34 +      }
    2.35  
    2.36        return r.ToString();
    2.37      }
     3.1 --- a/Hardware/LPC/F718XX.cs	Mon Feb 01 20:17:02 2010 +0000
     3.2 +++ b/Hardware/LPC/F718XX.cs	Mon Feb 01 21:04:14 2010 +0000
     3.3 @@ -107,7 +107,7 @@
     3.4      }
     3.5  
     3.6      public string Identifier {
     3.7 -      get { return "/lpc/f71882fg"; }
     3.8 +      get { return "/lpc/" + chip.ToString().ToLower(); }
     3.9      }
    3.10  
    3.11      public Image Icon {
     4.1 --- a/Hardware/LPC/IT87XX.cs	Mon Feb 01 20:17:02 2010 +0000
     4.2 +++ b/Hardware/LPC/IT87XX.cs	Mon Feb 01 21:04:14 2010 +0000
     4.3 @@ -131,7 +131,7 @@
     4.4      }
     4.5  
     4.6      public string Identifier {
     4.7 -      get { return "/lpc/it87"; }
     4.8 +      get { return "/lpc/" + chip.ToString().ToLower(); }
     4.9      }
    4.10  
    4.11      public Image Icon {
     5.1 --- a/Hardware/ReportWriter.cs	Mon Feb 01 20:17:02 2010 +0000
     5.2 +++ b/Hardware/ReportWriter.cs	Mon Feb 01 21:04:14 2010 +0000
     5.3 @@ -21,10 +21,26 @@
     5.4          w.WriteLine();
     5.5          w.WriteLine("Open Hardware Monitor Report");
     5.6          w.WriteLine();
     5.7 +
     5.8          NewSection(w);
     5.9          w.Write("Version: "); w.WriteLine(version.ToString());
    5.10          w.WriteLine();
    5.11  
    5.12 +        NewSection(w);
    5.13 +        foreach (IGroup group in groupList) {          
    5.14 +          foreach (IHardware hardware in group.Hardware) {
    5.15 +            w.WriteLine("|");
    5.16 +            w.WriteLine("+-+ {0} ({1})",
    5.17 +              new object[] { hardware.Name, hardware.Identifier });
    5.18 +            foreach (ISensor sensor in hardware.Sensors) {
    5.19 +              w.WriteLine("|   +- {0} : {1} : {2} : {3}",
    5.20 +                new object[] { sensor.SensorType, sensor.Index, sensor.Name, 
    5.21 +                  sensor.Value });
    5.22 +            }
    5.23 +          }
    5.24 +        }
    5.25 +        w.WriteLine();
    5.26 +
    5.27          foreach (IGroup group in groupList) {
    5.28            string report = group.GetReport();
    5.29            if (report != null) {
     6.1 --- a/Properties/AssemblyInfo.cs	Mon Feb 01 20:17:02 2010 +0000
     6.2 +++ b/Properties/AssemblyInfo.cs	Mon Feb 01 21:04:14 2010 +0000
     6.3 @@ -69,5 +69,5 @@
     6.4  // You can specify all the values or you can default the Build and Revision Numbers 
     6.5  // by using the '*' as shown below:
     6.6  // [assembly: AssemblyVersion("1.0.*")]
     6.7 -[assembly: AssemblyVersion("0.1.6.0")]
     6.8 -[assembly: AssemblyFileVersion("0.1.6.0")]
     6.9 +[assembly: AssemblyVersion("0.1.7.0")]
    6.10 +[assembly: AssemblyFileVersion("0.1.7.0")]