From 932d71c8e5ea7fc6ead8bf0f33cc8e4463a735cb Mon Sep 17 00:00:00 2001 From: Rick Burke Date: Sat, 23 Jul 2022 07:26:08 -0700 Subject: [PATCH] Reset dome slaving when a slaving slew is aborted. --- DeviceHub/DeviceManagers/DomeManager.cs | 1 + DeviceHub/Dome Driver/DomeDriver.cs | 2 +- Inno Setup/ASCOM Device Hub Setup.iss | 2 +- ProductAssemblyInfo.cs | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/DeviceHub/DeviceManagers/DomeManager.cs b/DeviceHub/DeviceManagers/DomeManager.cs index a40105c..8260c02 100644 --- a/DeviceHub/DeviceManagers/DomeManager.cs +++ b/DeviceHub/DeviceManagers/DomeManager.cs @@ -401,6 +401,7 @@ public void StopDomeMotion() if ( Connected ) { AbortSlew(); + SetSlavedState( false ); Status = new DevHubDomeStatus( this ); } } diff --git a/DeviceHub/Dome Driver/DomeDriver.cs b/DeviceHub/Dome Driver/DomeDriver.cs index 8e5c041..1ba157f 100644 --- a/DeviceHub/Dome Driver/DomeDriver.cs +++ b/DeviceHub/Dome Driver/DomeDriver.cs @@ -433,7 +433,7 @@ public void AbortSlew() try { - DomeManager.AbortSlew(); + DomeManager.StopDomeMotion(); msg = _done; } diff --git a/Inno Setup/ASCOM Device Hub Setup.iss b/Inno Setup/ASCOM Device Hub Setup.iss index 531a72e..043bfa6 100644 --- a/Inno Setup/ASCOM Device Hub Setup.iss +++ b/Inno Setup/ASCOM Device Hub Setup.iss @@ -4,7 +4,7 @@ ; #define MyAppName "ASCOM.DeviceHub" -#define MyAppVersion "6.6.0.15" +#define MyAppVersion "6.6.0.16" #define MyDestSubdirName "DeviceHub" ; #define MyPlatformRoot "D:\Github Repos\ASCOMPlatform\" #define MyPlatformRoot "D:\My Projects\Visual Studio 2022\Ascom\" diff --git a/ProductAssemblyInfo.cs b/ProductAssemblyInfo.cs index 2b303fc..dcbc561 100644 --- a/ProductAssemblyInfo.cs +++ b/ProductAssemblyInfo.cs @@ -20,4 +20,4 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion( "6.6.0.15" )] \ No newline at end of file +[assembly: AssemblyVersion( "6.6.0.16" )] \ No newline at end of file