# HG changeset patch
# User moel.mich
# Date 1282687870 0
# Node ID e4ee19d583bdfe84212e90ffcf35c7a02309d8cf
# Parent  51d62ed28ff51594c84e76313122f0a34fd0f375
Search all possible registry locations for the Heatmaster serial port.

diff -r 51d62ed28ff5 -r e4ee19d583bd Hardware/Heatmaster/HeatmasterGroup.cs
--- a/Hardware/Heatmaster/HeatmasterGroup.cs	Tue Aug 24 20:14:54 2010 +0000
+++ b/Hardware/Heatmaster/HeatmasterGroup.cs	Tue Aug 24 22:11:10 2010 +0000
@@ -69,20 +69,20 @@
 
     private static string[] GetRegistryPortNames() {
       List<string> result = new List<string>();
+      string[] paths = { "", "&MI_00" };
       try {
-        RegistryKey key = Registry.LocalMachine.OpenSubKey(
-          @"SYSTEM\CurrentControlSet\Enum\USB\VID_10C4&PID_EA60");
-        if (key == null)
-          key = Registry.LocalMachine.OpenSubKey(
-            @"SYSTEM\CurrentControlSet\Enum\USB\VID_10C4&PID_EA60&MI_00");           
-        if (key != null) {
-          foreach (string subKeyName in key.GetSubKeyNames()) {
-            RegistryKey subKey =
-              key.OpenSubKey(subKeyName + "\\" + "Device Parameters");
-            if (subKey != null) {
-              string name = subKey.GetValue("PortName") as string;
-              if (name != null)
-                result.Add((string)name);
+        foreach (string path in paths) {
+          RegistryKey key = Registry.LocalMachine.OpenSubKey(
+            @"SYSTEM\CurrentControlSet\Enum\USB\VID_10C4&PID_EA60" + path);
+          if (key != null) {
+            foreach (string subKeyName in key.GetSubKeyNames()) {
+              RegistryKey subKey =
+                key.OpenSubKey(subKeyName + "\\" + "Device Parameters");
+              if (subKey != null) {
+                string name = subKey.GetValue("PortName") as string;
+                if (name != null && !result.Contains(name))
+                  result.Add((string)name);
+              }
             }
           }
         }
diff -r 51d62ed28ff5 -r e4ee19d583bd Properties/AssemblyVersion.cs
--- a/Properties/AssemblyVersion.cs	Tue Aug 24 20:14:54 2010 +0000
+++ b/Properties/AssemblyVersion.cs	Tue Aug 24 22:11:10 2010 +0000
@@ -38,5 +38,5 @@
 using System;
 using System.Reflection;
 
-[assembly: AssemblyVersion("0.1.37.8")]
-[assembly: AssemblyFileVersion("0.1.37.8")]
+[assembly: AssemblyVersion("0.1.37.9")]
+[assembly: AssemblyFileVersion("0.1.37.9")]