Delayed internal/external hip selection.

cedric-r · Nov 8, 2022 · 8b9f68d · 8b9f68d
1 parent 2ab6196
commit 8b9f68d
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 7 deletions.
diff --git a/ASCOM.HomeMade.SBIGCamera.iss b/ASCOM.HomeMade.SBIGCamera.iss
@@ -1,13 +1,13 @@
 [Setup]
 AppID={{3a7e63ad-c913-44f0-9489-e1744c9c2991}}
 AppName=ASCOM HomeMade Camera
-AppVerName=ASCOM HomeMade SBig Camera Driver 1.2.3
-AppVersion=1.2.3
+AppVerName=ASCOM HomeMade SBig Camera Driver 1.2.4
+AppVersion=1.2.4
 AppPublisher=Cedric Raguenaud <cedric@raguenaud.earth>
 AppPublisherURL=mailto:cedric@raguenaud.earth
 AppSupportURL=https://github.com/cedric-r/ASCOM.HomeMade.SBIGCamera
 AppUpdatesURL=https://github.com/cedric-r/ASCOM.HomeMade.SBIGCamera
-VersionInfoVersion=1.2.3
+VersionInfoVersion=1.2.4
 MinVersion=0,6.1
 DefaultDirName="{cf}\ASCOM\Camera\HomeMade SBIGCamera\"
 DisableDirPage=yes

diff --git a/ASCOM.HomeMade.SBIGCamera/SBIGCamera.cs b/ASCOM.HomeMade.SBIGCamera/SBIGCamera.cs
@@ -94,6 +94,8 @@ public SBIGCamera()
  debug.LogMessage("Camera", "Completed initialisation");
  }
 
+ protected virtual void AdjustSettings() { }
+
  //
  // PUBLIC COM INTERFACE ICameraV2 IMPLEMENTATION
  //
@@ -186,6 +188,7 @@ public bool Connected
  {
  debug.LogMessage("Connected", "Already connected");
  cameraInfo = GetCameraSpecs();
+ AdjustSettings();
 
  return;
  }
@@ -213,6 +216,7 @@ public bool Connected
  debug.LogMessage("Connected Set", $"Connected to camera");
 
  cameraInfo = GetCameraSpecs();
+ AdjustSettings();
  }
  }
  else

diff --git a/ASCOM.HomeMade.SBIGCommon/Properties/AssemblyInfo.cs b/ASCOM.HomeMade.SBIGCommon/Properties/AssemblyInfo.cs
@@ -54,5 +54,5 @@
 // by using the '*' as shown below:
 //
 // TODO - Set your driver's version here
-[assembly: AssemblyVersion("1.2.3.0")]
-[assembly: AssemblyFileVersion("1.2.3.0")]
+[assembly: AssemblyVersion("1.2.4.0")]
+[assembly: AssemblyFileVersion("1.2.4.0")]
diff --git a/ASCOM.HomeMade.SBIGGuidingCamera/Driver.cs b/ASCOM.HomeMade.SBIGGuidingCamera/Driver.cs
@@ -68,7 +68,7 @@ public class Camera : SBIGCamera.SBIGCamera
  /// Initializes a new instance of the <see cref="HomeMade"/> class.
  /// Must be public for COM registration.
  /// </summary>
- public Camera()
+ public Camera() : base()
  {
  string strPath = System.Environment.GetFolderPath(System.Environment.SpecialFolder.LocalApplicationData);
  strPath = Path.Combine(strPath, driverID);
@@ -88,11 +88,20 @@ public Camera()
  debug.LogMessage("Process ID: " + nProcessID);
 
  CameraType = SBIG.CCD_REQUEST.CCD_TRACKING;
- if (cameraInfo.STXLCamera) CameraType = SBIG.CCD_REQUEST.CCD_EXT_TRACKING;
 
  debug.LogMessage("Camera", "Completed initialisation");
  }
 
+ protected override void AdjustSettings()
+ {
+ // This is a cheat for the STXL that needs to know the type of camera but the information is only available at connection time. This is nasty design!
+ if (cameraInfo.STXLCamera)
+ {
+ debug.LogMessage("Camera", "Camera is STXL, setting to external guiding chip");
+ CameraType = SBIG.CCD_REQUEST.CCD_EXT_TRACKING;
+ }
+ }
+
  public new string Description
  {
  // TODO customise this device description

diff --git a/HomeMade SBIG Camera Setup.exe b/HomeMade SBIG Camera Setup.exe