1.1 --- a/Hardware/Heatmaster/Heatmaster.cs	Mon Aug 23 20:00:06 2010 +0000
     1.2 +++ b/Hardware/Heatmaster/Heatmaster.cs	Tue Aug 24 19:06:49 2010 +0000
     1.3 @@ -143,10 +143,10 @@
     1.4          firmwareRevision = ReadInteger(0, 'V');
     1.5          firmwareCRC = ReadInteger(0, 'C');
     1.6  
     1.7 -        int fanCount = ReadInteger(32, '?');
     1.8 -        int temperatureCount = ReadInteger(48, '?');
     1.9 -        int flowCount = ReadInteger(64, '?');
    1.10 -        int relayCount =  ReadInteger(80, '?');
    1.11 +        int fanCount = Math.Min(ReadInteger(32, '?'), 4);
    1.12 +        int temperatureCount = Math.Min(ReadInteger(48, '?'), 6);
    1.13 +        int flowCount = Math.Min(ReadInteger(64, '?'), 1);
    1.14 +        int relayCount =  Math.Min(ReadInteger(80, '?'), 1);
    1.15  
    1.16          fans = new Sensor[fanCount];
    1.17          controls = new Sensor[fanCount];

     2.1 --- a/Hardware/Heatmaster/HeatmasterGroup.cs	Mon Aug 23 20:00:06 2010 +0000
     2.2 +++ b/Hardware/Heatmaster/HeatmasterGroup.cs	Tue Aug 24 19:06:49 2010 +0000
     2.3 @@ -71,7 +71,10 @@
     2.4        List<string> result = new List<string>();
     2.5        try {
     2.6          RegistryKey key = Registry.LocalMachine.OpenSubKey(
     2.7 -          @"SYSTEM\CurrentControlSet\Enum\USB\Vid_10c4&Pid_ea60&Mi_00");
     2.8 +          @"SYSTEM\CurrentControlSet\Enum\USB\VID_10C4&PID_EA60");
     2.9 +        if (key == null)
    2.10 +          key = Registry.LocalMachine.OpenSubKey(
    2.11 +            @"SYSTEM\CurrentControlSet\Enum\USB\VID_10C4&PID_EA60&MI_00");           
    2.12          if (key != null) {
    2.13            foreach (string subKeyName in key.GetSubKeyNames()) {
    2.14              RegistryKey subKey =

     3.1 --- a/Properties/AssemblyVersion.cs	Mon Aug 23 20:00:06 2010 +0000
     3.2 +++ b/Properties/AssemblyVersion.cs	Tue Aug 24 19:06:49 2010 +0000
     3.3 @@ -38,5 +38,5 @@
     3.4  using System;
     3.5  using System.Reflection;
     3.6  
     3.7 -[assembly: AssemblyVersion("0.1.37.7")]
     3.8 -[assembly: AssemblyFileVersion("0.1.37.7")]
     3.9 +[assembly: AssemblyVersion("0.1.37.8")]
    3.10 +[assembly: AssemblyFileVersion("0.1.37.8")]