Merge develop into master ready for Platform 7 release.

Author: Peter-Simpson

Conform/Conform.vbproj

@@ -141,27 +141,15 @@
     <Reference Include="ASCOM.DeviceInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
       <Private>True</Private>
     </Reference>
-    <Reference Include="ASCOM.DriverAccess, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\ASCOM Trunk\ASCOM.DriverAccess\bin\Release\ASCOM.DriverAccess.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ASCOM.Exceptions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\ASCOM Trunk\Interfaces\ASCOMExceptions\bin\Release\ASCOM.Exceptions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
+    <Reference Include="ASCOM.DriverAccess, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL" />
+    <Reference Include="ASCOM.Exceptions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL" />
     <Reference Include="ASCOM.Interfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <EmbedInteropTypes>False</EmbedInteropTypes>
       <HintPath>..\..\..\..\..\..\..\ASCOM Trunk\Interfaces\Master Interfaces\ASCOM.Interfaces.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ASCOM.Utilities, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\ASCOM Trunk\ASCOM.Utilities\ASCOM.Utilities\bin\Release\ASCOM.Utilities.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
+    <Reference Include="ASCOM.Utilities, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>

Conform/Devices/CoverCalibrator Tester.vb

@@ -84,7 +84,7 @@ Friend Class CoverCalibratorTester
 
     Public Overrides Sub CheckAccessibility()
         Dim deviceInterface As ICoverCalibratorV1
-        Dim driverAccessDevice As CoverCalibrator
+        Dim driverAccessDevice As DriverAccess.CoverCalibrator
         Dim deviceObject As Object
 
         MyBase.CheckAccessibility(g_CoverCalibratorProgID, DeviceType.CoverCalibrator)

Conform/Devices/DeviceTesterBaseClass.vb

@@ -10,6 +10,7 @@ Friend Class RotatorTester
     Const ROTATOR_OK_TOLERANCE As Double = 1.0
     Const ROTATOR_INFO_TOLERANCE As Double = 2.0
     Const ROTATOR_POSITION_TOLERANCE As Single = 0.001 ' Degrees
+    Const ROTATOR_POSITION_UNKNOWN As Single = Single.NaN ' Define a constant to represent position unknown. Used when restoring rotator position after testing.
 
     'Rotator variables
     Private m_CanReadIsMoving, canReadPosition, m_CanReadTargetPosition, m_CanReadStepSize As Boolean
@@ -18,6 +19,9 @@ Friend Class RotatorTester
     Private m_Reverse As Boolean
     Private m_LastMoveWasAsync As Boolean
     Private canReadMechanicalPosition As Boolean
+    Private initialPosiiton As Single = ROTATOR_POSITION_UNKNOWN
+    Private initialMechanicalPosiiton As Single = ROTATOR_POSITION_UNKNOWN
+    Private initialSyncOffset As Single = ROTATOR_POSITION_UNKNOWN
 
 #If DEBUG Then
     Private m_Rotator As ASCOM.DeviceInterface.IRotatorV3
@@ -41,7 +45,7 @@ Friend Class RotatorTester
 
 #Region "New and Dispose"
     Sub New()
-        MyBase.New(True, True, True, True, False, True, False) ' Set flags for this device:  HasCanProperties, HasProperties, HasMethods, PreRunCheck, PreConnectCheck, PerformanceCheck, PostRunCheck
+        MyBase.New(True, True, True, True, False, True, True) ' Set flags for this device:  HasCanProperties, HasProperties, HasMethods, PreRunCheck, PreConnectCheck, PerformanceCheck, PostRunCheck
     End Sub
 
     ' IDisposable
@@ -230,30 +234,122 @@ Friend Class RotatorTester
 
     Public Overrides Sub PreRunCheck()
         Dim l_Now As Date
-        'Get the rotator into a standard state
+
+        ' Initialise to the unknown position value
+        initialPosiiton = ROTATOR_POSITION_UNKNOWN
         g_Stop = True
-        LogCallToDriver("PreRunCheck", "About to call Halt method")
+
+        ' Get the rotator into a standard state
+        LogCallToDriver("PreRun Check", "About to call Halt method")
         Try : m_Rotator.Halt() : Catch : End Try 'Stop any movement
+
+        ' Confirm that rotator is not moving or wait for it to stop
         l_Now = Now
-        Try 'Confirm that rotator is not moving or wait for it to stop
+        Try
             Status(StatusType.staAction, "Waiting up to " & ROTATOR_WAIT_LIMIT & " seconds for rotator to stop moving")
-            LogCallToDriver("CanReverse", "About to get IsMoving property repeatedly")
+            LogCallToDriver("PreRun Check", "About to get IsMoving property repeatedly")
             Do
                 WaitFor(500)
                 Status(StatusType.staStatus, Now.Subtract(l_Now).TotalSeconds & "/" & ROTATOR_WAIT_LIMIT)
             Loop Until (Not m_Rotator.IsMoving) Or (Now.Subtract(l_Now).TotalSeconds > ROTATOR_WAIT_LIMIT)
 
             If Not m_Rotator.IsMoving Then 'Rotator is stopped so OK
                 g_Stop = False 'Clear stop flag to allow other tests to run
+                LogMsg("Pre-run Check", MessageLevel.msgOK, "Rotator is stationary")
+
+                ' Try to record the current position of the rotator so that it can be restored after testing. If this fails the initial position will be set to unknown value.
+                Try
+                    LogCallToDriver("PreRun Check", "About to get Position property")
+                    initialPosiiton = m_Rotator.Position
+                    LogMsg("Pre-run Check", MessageLevel.msgOK, $"Rotator initial position: {initialPosiiton}")
+
+                    ' Attempt to get the rotator's current mechanical position. If this fails the initial mechanical position will be set to unknown value.
+                    Try
+                        LogCallToDriver("PreRun Check", "About to get MechanicalPosition property")
+                        initialMechanicalPosiiton = m_Rotator.MechanicalPosition
+                        initialSyncOffset = Range(initialPosiiton - initialMechanicalPosiiton, -180.0, True, 180.0, True)
+                        LogMsg("Pre-run Check", MessageLevel.msgOK, $"Rotator initial mechanical position: {initialMechanicalPosiiton}, Initial sync offset: {initialSyncOffset}")
+                    Catch ex As Exception
+                        'Don't report errors at this point
+                        LogMsg("Pre-run Check", MessageLevel.msgInfo, $"Rotator initial mechanical position could not be read: {ex.Message}")
+                    End Try
+                Catch ex As Exception
+                    'Don't report errors at this point
+                    LogMsg("Pre-run Check", MessageLevel.msgInfo, $"Rotator initial position could not be read: {ex.Message}")
+                End Try
+
             Else 'Report error message and don't do other tests
-                LogMsg("Pre-run Check", MessageLevel.msgError, "Rotator still moving after " & ROTATOR_WAIT_LIMIT & "seconds, IsMoving stuck on?")
+                LogMsg("Pre-run Check", MessageLevel.msgError, "Rotator still moving after " & ROTATOR_WAIT_LIMIT & "seconds, could IsMoving be stuck on?")
             End If
-            LogMsg("Pre-run Check", MessageLevel.msgOK, "Rotator is stationary")
         Catch ex As Exception
             'Don't report errors at this point
         End Try
 
     End Sub
+
+    Public Overrides Sub PostRunCheck()
+        Dim currentPosition, currentMechanicalPosition, relativeMovement, syncPosition As Single
+        Dim l_Now As Date
+
+        ' Restore the initial position of the rotator if possible
+        If initialPosiiton = ROTATOR_POSITION_UNKNOWN Then
+            ' The initial position could not be determined so log a message to this effect.
+            LogMsg("Post-run Check", MessageLevel.msgNone, "The rotator's initial position could not be determined so it is not possible to restore it's initial position.")
+        Else
+            ' We have a valid initial position so attempt to reset the rotator to this position.
+            Try
+                ' Get the current position
+                LogCallToDriver("Post-run Check", $"About to get Position property")
+                currentPosition = m_Rotator.Position
+                LogMsg("Post-run Check", MessageLevel.msgOK, $"Current position: {currentPosition}")
+
+                ' Restore the original sync offset, if possible 
+                If Not (initialMechanicalPosiiton = ROTATOR_POSITION_UNKNOWN) Then ' We have a valid starting mechanic al position
+                    ' Get the current mechanical position
+                    LogCallToDriver("Post-run Check", $"About to get MechanicalPosition property")
+                    currentMechanicalPosition = m_Rotator.MechanicalPosition
+                    LogMsg("Post-run Check", MessageLevel.msgOK, $"Current mechanical position: {currentMechanicalPosition}")
+
+                    syncPosition = Range(currentMechanicalPosition + initialSyncOffset, 0.0, True, 360.0, False)
+                    LogMsg("Post-run Check", MessageLevel.msgOK, $"New sync position: {syncPosition}")
+
+                    LogCallToDriver("Post-run Check", $"About to call Sync method. Position: {syncPosition}")
+                    m_Rotator.Sync(syncPosition)
+                    LogMsg("Post-run Check", MessageLevel.msgOK, $"Completed Sync ({initialSyncOffset} degrees) from position: {currentPosition} to {syncPosition}")
+                End If
+
+                ' Re-get the current position because the sync will have changed it
+                LogCallToDriver("Post-run Check", $"About to get Position property")
+                currentPosition = m_Rotator.Position
+                LogMsg("Post-run Check", MessageLevel.msgOK, $"New current position: {currentPosition}")
+
+                ' Calculate the smallest relative movement required to get to the initial position
+                relativeMovement = Range(initialPosiiton - currentPosition, -180.0, True, 180.0, True)
+
+                ' Move to the starting position
+                LogCallToDriver("Post-run Check", $"About to move by {relativeMovement} to {initialPosiiton}")
+                m_Rotator.Move(relativeMovement)
+
+                ' Wait for the move to complete
+                LogCallToDriver("Post-run Check", "About to get IsMoving property repeatedly")
+                l_Now = Now
+                Do
+                    WaitFor(500)
+                    Status(StatusType.staStatus, Now.Subtract(l_Now).TotalSeconds & "/" & ROTATOR_WAIT_LIMIT)
+                Loop Until (Not m_Rotator.IsMoving) Or (Now.Subtract(l_Now).TotalSeconds > ROTATOR_WAIT_LIMIT)
+
+                If Not m_Rotator.IsMoving Then 'Rotator is stopped so OK
+                    LogMsg("Post-run Check", MessageLevel.msgOK, $"Rotator starting position successfully restored to {initialPosiiton}")
+                Else 'Report error message 
+                    LogMsg("Post-run Check", MessageLevel.msgError, "Unable to restore rotator starting position, the rotator is still moving after " & ROTATOR_WAIT_LIMIT & "seconds. Could IsMoving be stuck on?")
+                End If
+            Catch ex As Exception
+                LogMsg("Post-run Check", MessageLevel.msgError, $"Exception: {ex}")
+
+            End Try
+        End If
+    End Sub
+
     Overrides Sub CheckProperties()
         'IsMoving - Optional (V1,V2), Mandatory (V3)
         Try

Conform/Devices/RotatorTester.vb

@@ -395,31 +395,43 @@ Friend Class TelescopeTester
     Public Overrides Sub PreRunCheck()
         'Get into a consistent state
         If g_InterfaceVersion > 1 Then
-            If g_Settings.DisplayMethodCalls Then LogMsg("Mount Safety", MessageLevel.msgComment, "About to get AtPark property")
-            If telescopeDevice.AtPark Then
-                If canUnpark Then
-                    If g_Settings.DisplayMethodCalls Then LogMsg("Mount Safety", MessageLevel.msgComment, "About to call Unpark method")
-                    telescopeDevice.Unpark()
-                    LogMsg("Mount Safety", MessageLevel.msgInfo, "Scope is parked, so it has been unparked for testing")
+            Try
+                If g_Settings.DisplayMethodCalls Then LogMsg("Mount Safety", MessageLevel.msgComment, "About to get AtPark property")
+                If telescopeDevice.AtPark Then
+                    If canUnpark Then
+                        Try
+                            If g_Settings.DisplayMethodCalls Then LogMsg("Mount Safety", MessageLevel.msgComment, "About to call Unpark method")
+                            telescopeDevice.Unpark()
+                            LogMsg("Mount Safety", MessageLevel.msgInfo, "Scope is parked, so it has been unparked for testing")
+                        Catch ex As Exception
+                            HandleException("Mount Safety - Unpark", MemberType.Method, Required.MustBeImplemented, ex, "CanUnpark is true")
+                        End Try
+                    Else
+                        LogMsg("Mount Safety", MessageLevel.msgError, "Scope reports that it is parked but CanUnPark is false - please manually unpark the scope")
+                        g_Stop = True
+                    End If
                 Else
-                    LogMsg("Mount Safety", MessageLevel.msgError, "Scope reports that it is parked but CanUnPark is false - please manually unpark the scope")
-                    g_Stop = True
+                    LogMsg("Mount Safety", MessageLevel.msgInfo, "Scope is not parked, continuing testing")
                 End If
-            Else
-                LogMsg("Mount Safety", MessageLevel.msgInfo, "Scope is not parked, continuing testing")
-            End If
+            Catch ex As Exception
+                LogMsgError("Mount Safety", $"Exception when trying to access mandatory member Telescope.AtPark: {ex.Message}")
+            End Try
         Else
             LogMsg("Mount Safety", MessageLevel.msgInfo, "Skipping AtPark test as this method is not supported in interface V" & g_InterfaceVersion)
             Try
                 If canUnpark Then
-                    If g_Settings.DisplayMethodCalls Then LogMsg("Mount Safety", MessageLevel.msgComment, "About to call Unpark method")
-                    telescopeDevice.Unpark()
-                    LogMsg("Mount Safety", MessageLevel.msgOK, "Scope has been unparked for testing")
+                    Try
+                        If g_Settings.DisplayMethodCalls Then LogMsg("Mount Safety", MessageLevel.msgComment, "About to call Unpark method")
+                        telescopeDevice.Unpark()
+                        LogMsg("Mount Safety", MessageLevel.msgOK, "Scope has been unparked for testing")
+                    Catch ex As Exception
+                        LogMsgError("Mount Safety", $"Exception when trying to unpark the scope: {ex.Message}")
+                    End Try
                 Else
                     LogMsg("Mount Safety", MessageLevel.msgOK, "Scope reports that it cannot unpark, unparking skipped")
                 End If
             Catch ex As Exception
-                LogMsg("Mount Safety", MessageLevel.msgError, "Driver threw an exception while unparking: " & ex.Message)
+                HandleException("Mount Safety - AtPark", MemberType.Property, Required.Mandatory, ex, "")
             End Try
         End If
 

Conform/Devices/TelescopeTester.vb

@@ -433,6 +433,8 @@ Imports System.Reflection
 Imports System.Runtime.InteropServices
 Imports System.Globalization
 Imports Microsoft.Win32
+Imports System.Security.Principal
+
 #End Region
 
 Public Class FrmConformMain
@@ -894,9 +896,9 @@ Public Class FrmConformMain
                 Case DeviceType.Telescope
                     l_NewProgID = l_Chooser.Choose(g_TelescopeProgID)
                     If l_NewProgID <> "" Then
-                        g_Settings.DeviceTelescope = l_NewProgID 'Only update settings if OK pressed
-                        g_TelescopeProgID = l_NewProgID
-                    End If
+                            g_Settings.DeviceTelescope = l_NewProgID 'Only update settings if OK pressed
+                            g_TelescopeProgID = l_NewProgID
+                        End If
                 Case DeviceType.Switch
                     l_NewProgID = l_Chooser.Choose(g_SwitchProgID)
                     If l_NewProgID <> "" Then
@@ -1259,6 +1261,25 @@ Public Class FrmConformMain
             My.Computer.FileSystem.DeleteFile("C:\Documents and Settings\All Users\Start Menu\Programs\ASCOM Platform\Tools\Uninstall Conform.lnk")
         Catch ex As Exception
         End Try
+
+        Using identity As WindowsIdentity = WindowsIdentity.GetCurrent()
+            Dim principal As WindowsPrincipal = New WindowsPrincipal(identity)
+
+            If principal.IsInRole(WindowsBuiltInRole.Administrator) Then
+                LogMsg("", MessageLevel.msgAlways, " ")
+                LogMsg("", MessageLevel.msgAlways, "***** CONFORM IS RUNNING WITH ADMIN PRIVILEGE!")
+                LogMsg("", MessageLevel.msgAlways, " ")
+                LogMsg("", MessageLevel.msgAlways, "***** This increases the risk that malicious individuals will target you and cause havoc in your life.")
+                LogMsg("", MessageLevel.msgAlways, "***** There is no need to run Conform with Admin privilege, the application is fully functional in normal user mode.")
+                LogMsg("", MessageLevel.msgAlways, "***** Please close the Remote Server and re-open it in normal user mode.")
+                LogMsg("", MessageLevel.msgAlways, " ")
+                Dim choice As DialogResult = MessageBox.Show("Close Conform because it is running as administrator.", "Threat Management", MessageBoxButtons.YesNo, MessageBoxIcon.[Stop], MessageBoxDefaultButton.Button1)
+
+                If choice = DialogResult.Yes Then
+                    Close()
+                End If
+            End If
+        End Using
     End Sub
     Private Sub ConformMainForm_Resize(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Resize
         Const l_ButtonIndent As Integer = 115
@@ -1614,7 +1635,7 @@ Public Class FrmConformMain
     End Sub
     Private Function FindDriverExecutable() As String
         FindDriverExecutable = FindDriverInRegistry(Registry.ClassesRoot)
-        If ASCOM.Utilities.ApplicationBits = Utilities.Bitness.Bits64 Then ' Check the 32bit registry on a 64bit system if we haven't found an executable yet
+        If Utilities.Global.ApplicationBits() = Utilities.Global.Bitness.Bits64 Then ' Check the 32bit registry on a 64bit system if we haven't found an executable yet
             If String.IsNullOrEmpty(FindDriverExecutable) Then ' We are on a 64bit OS and haven't yet found an executable
                 LogMsg("FindDriverExecutable", MessageLevel.msgDebug, "We are a 64bit application and an executable has not yet been found, looking in 32bit registry")
                 'Using Reg As ASCOM.Utilities.RegistryAccess = New ASCOM.Utilities.RegistryAccess