From 8da41cad6fa66153dce9384174363b626f5931d9 Mon Sep 17 00:00:00 2001
From: Colin <me@cjdawson.com>
Date: Fri, 24 May 2019 00:07:29 +0100
Subject: [PATCH] Sorted out the registry settings needed to get the driver
 working properly on install.

---
 Meade.net.Setup/AscomFocuserDriver.wxs   | 9 +++++----
 Meade.net.Setup/AscomTelescopeDriver.wxs | 9 +++++----
 Meade.net.Setup/Config.wxi               | 2 +-
 Meade.net.Setup/FeatureTree.wxs          | 1 +
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Meade.net.Setup/AscomFocuserDriver.wxs b/Meade.net.Setup/AscomFocuserDriver.wxs
index a3db5e1..67ae64a 100644
--- a/Meade.net.Setup/AscomFocuserDriver.wxs
+++ b/Meade.net.Setup/AscomFocuserDriver.wxs
@@ -7,11 +7,7 @@
   -->
   <Fragment>
     <DirectoryRef Id="INSTALLFOLDER" />
-<!--    <CustomActionRef Id="caPrepareAscomDeviceProfiles"/>
-    <CustomActionRef Id="caUnregisterDrivers"/>
-    <CustomActionRef Id="caRegisterDrivers"/>-->
     <ComponentGroup Id="cgAscomFocuserDriver">
-      <ComponentGroupRef Id="cgAscomLocalServer" />
       <Component Id="cmpAscomFocuserDriver"
                  Directory="INSTALLFOLDER"
                  Guid="*"
@@ -52,6 +48,11 @@
             <RegistryValue Value="$(var.FocuserDriverClassId)" Type="string" />
           </RegistryKey>
         </RegistryKey>
+
+        <!--Register the driver with the ASCOM Profile-->
+        <RegistryKey Root="HKLM" Key="SOFTWARE\ASCOM\Focuser Drivers\$(var.FocuserDriverProgId)">
+          <RegistryValue Value="$(var.FocuserDriverDescription)" Type="string"/>
+        </RegistryKey>
       </Component>
     </ComponentGroup>
   </Fragment>
diff --git a/Meade.net.Setup/AscomTelescopeDriver.wxs b/Meade.net.Setup/AscomTelescopeDriver.wxs
index f2d561e..86379d8 100644
--- a/Meade.net.Setup/AscomTelescopeDriver.wxs
+++ b/Meade.net.Setup/AscomTelescopeDriver.wxs
@@ -7,11 +7,7 @@
   -->
   <Fragment>
     <DirectoryRef Id="INSTALLFOLDER" />
-<!--    <CustomActionRef Id="caPrepareAscomDeviceProfiles"/>
-    <CustomActionRef Id="caUnregisterDrivers"/>
-    <CustomActionRef Id="caRegisterDrivers"/>-->
     <ComponentGroup Id="cgAscomTelescopeDriver">
-      <ComponentGroupRef Id="cgAscomLocalServer" />
       <Component Id="cmpAscomTelescopeDriver"
                  Directory="INSTALLFOLDER"
                  Guid="*"
@@ -52,6 +48,11 @@
             <RegistryValue Value="$(var.TelescopeDriverClassId)" Type="string" />
           </RegistryKey>
         </RegistryKey>
+
+        <!--Register the driver with the ASCOM Profile-->
+        <RegistryKey Root="HKLM" Key="SOFTWARE\ASCOM\Telescope Drivers\$(var.TelescopeDriverProgId)">
+          <RegistryValue Value="$(var.TelescopeDriverDescription)" Type="string"/>
+        </RegistryKey>
       </Component>
     </ComponentGroup>
   </Fragment>
diff --git a/Meade.net.Setup/Config.wxi b/Meade.net.Setup/Config.wxi
index 5111470..782ac1a 100644
--- a/Meade.net.Setup/Config.wxi
+++ b/Meade.net.Setup/Config.wxi
@@ -19,7 +19,7 @@
   <?define LocalServerAppId = "{4e68ec46-5ffc-49e7-b298-38a548df0bfd}" ?>
   <?define CopyrightNotice="Copyright © 2019 cjdawson.com, all rights reserved" ?>
 
-  <?define TelescopeDriverClassId="{8b9fccb9-87ae-42f7-90af-079e13de6efb}" ?>
+  <?define TelescopeDriverClassId="{d9fd4b3e-c4f1-48ac-a16f-d02eef30d86f}" ?>
   <?define TelescopeDriverProgId="ASCOM.MeadeGeneric.Telescope" ?>
   <?define TelescopeDriverDescription="Meade Generic"?>
 
diff --git a/Meade.net.Setup/FeatureTree.wxs b/Meade.net.Setup/FeatureTree.wxs
index 602f994..245385e 100644
--- a/Meade.net.Setup/FeatureTree.wxs
+++ b/Meade.net.Setup/FeatureTree.wxs
@@ -6,6 +6,7 @@
     <FeatureGroup Id="fgRoot" >
       <Feature Id="featAscomDrivers" Title="ASCOM drivers" Level="1" Absent="disallow"
                Display="expand" >
+        <ComponentGroupRef Id="cgAscomLocalServer" />
         <ComponentGroupRef Id="cgAscomTelescopeDriver"/>
         <ComponentGroupRef Id="cgAscomFocuserDriver"/>
       </Feature>