Merge develop branch in preparation for the next release.

Author: Peter-Simpson

Conform/Devices/CameraTester.vb

@@ -999,7 +999,7 @@ Friend Class CameraTester
                     LogMsg("ReadoutModes Read", MessageLevel.msgOK, ReadoutMode.ToString)
                 Next
             Catch ex As Exception
-                HandleException("Gain Read", MemberType.Property, Required.Mandatory, ex, "")
+                HandleException("ReadoutModes Read", MemberType.Property, Required.Mandatory, ex, "")
             End Try
 
             ' ReadoutMode Read - Mandatory

Conform/Devices/FocuserTester.vb

@@ -8,6 +8,8 @@
     Private m_StepSize, m_Temperature As Double
     Private m_TempCompTrueOK, m_TempCompFalseOK As Boolean ' Variable to confirm that TempComp can be successfully set to True
     Private m_AbsolutePositionOK As Boolean = False ' Variable to confirm that absolute position can be read OK
+    Private m_CanReadIsMoving As Boolean = False ' Variable to confirm that IsMoving can be read OK
+    Private m_CanReadTemperature As Boolean = False ' Variable to confirm that Temperature can be read OK
 
     Private Const GOOD_MOVE_TOLERANCE As Integer = 2 ' ± Position tolerance within which a move will be considered to be OK
     Private Const OUT_OF_RANGE_INCREMENT As Integer = 10 ' For absolute focusers, the position delta, below 0 or above maximum steps, to test that the focuser will not move to the specified position
@@ -239,9 +241,11 @@
         'IsMoving - Required
         Try
             LogCallToDriver("IsMoving", "About to get IsMoving property")
+            m_CanReadIsMoving = False
             m_IsMoving = m_Focuser.IsMoving
             If Not m_IsMoving Then
                 LogMsg("IsMoving", MessageLevel.msgOK, m_IsMoving.ToString)
+                m_CanReadIsMoving = True
             Else
                 LogMsg("IsMoving", MessageLevel.msgError, "IsMoving is True at start of tests and it should be false")
             End If
@@ -373,6 +377,7 @@
 
         'Temperature - Optional
         Try
+            m_CanReadTemperature = False
             LogCallToDriver("Temperature", "About to get Temperature property")
             m_Temperature = m_Focuser.Temperature
             Select Case m_Temperature
@@ -382,6 +387,7 @@
                     LogMsg("Temperature", MessageLevel.msgWarning, "Temperature > 50.0, - possibly an issue, actual value: " & m_Temperature.ToString)
                 Case Else
                     LogMsg("Temperature", MessageLevel.msgOK, m_Temperature.ToString)
+                    m_CanReadTemperature = True
             End Select
         Catch ex As Exception
             HandleException("Temperature", MemberType.Property, Required.Optional, ex, "")
@@ -637,21 +643,21 @@
 
     Overrides Sub CheckPerformance()
         'Position
-        If True Then
+        If m_AbsolutePositionOK Then
             FocuserPerformanceTest(FocuserPropertyMethod.Position, "Position")
         Else
             LogMsg("Position", MessageLevel.msgInfo, "Skipping test as property is not supported")
         End If
 
         'IsMoving
-        If True Then
+        If m_CanReadIsMoving Then
             FocuserPerformanceTest(FocuserPropertyMethod.IsMoving, "IsMoving")
         Else
             LogMsg("IsMoving", MessageLevel.msgInfo, "Skipping test as property is not supported")
         End If
 
-        'IsMoving
-        If True Then
+        'Temperature
+        If m_CanReadTemperature Then
             FocuserPerformanceTest(FocuserPropertyMethod.Temperature, "Temperature")
         Else
             LogMsg("Temperature", MessageLevel.msgInfo, "Skipping test as property is not supported")

Conform/Devices/RotatorTester.vb

@@ -134,6 +134,30 @@ Friend Class RotatorTester
             GC.Collect()
         End Try
 
+        Try
+            l_DeviceObject = CreateObject(g_RotatorProgID)
+            l_IRotator = CType(l_DeviceObject, ASCOM.DeviceInterface.IRotatorV3)
+            LogMsg("AccessChecks", MessageLevel.msgDebug, "Successfully created driver with interface IRotatorV3")
+            Try
+                LogCallToDriver("AccessChecks", "About to set Connected property")
+                l_IRotator.Connected = True
+                LogMsg("AccessChecks", MessageLevel.msgInfo, "Driver exposes interface IRotatorV3")
+                LogCallToDriver("AccessChecks", "About to set Connected property")
+                l_IRotator.Connected = False
+            Catch ex As Exception
+                LogMsg("AccessChecks", MessageLevel.msgInfo, "Driver does not expose interface IRotatorV3")
+            End Try
+        Catch ex As Exception
+            LogMsg("AccessChecks", MessageLevel.msgInfo, "Driver does not expose interface IRotatorV3")
+        Finally
+            'Clean up
+            Try : Marshal.ReleaseComObject(l_IRotator) : Catch : End Try
+            Try : Marshal.ReleaseComObject(l_DeviceObject) : Catch : End Try
+            l_DeviceObject = Nothing
+            l_IRotator = Nothing
+            GC.Collect()
+        End Try
+
         'Try client access toolkit
         l_DriverAccessRotator = Nothing
         Try

Conform/Devices/SwitchTester.vb

@@ -1066,7 +1066,7 @@
                     Case SwitchMethod.MinSwitchValue
                         DoubleValue = m_Switch.MinSwitchValue(LOW_TEST_VALUE)
                     Case SwitchMethod.SetSwitch
-                        m_Switch.SetSwitchValue(LOW_TEST_VALUE, False)
+                        m_Switch.SetSwitch(LOW_TEST_VALUE, False)
                     Case SwitchMethod.SetSwitchName
                         ' Ignoring this because it is an optional parameter
                     Case SwitchMethod.SetSwitchValue