Skip to content

Commit d625bb3

Browse files
committed
Merge develop branch to master ready for release.
2 parents f73ac1c + 584c70c commit d625bb3

7 files changed

Lines changed: 140 additions & 81 deletions

File tree

Conform/ApplicationSettings.vb

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ Friend Class ApplicationSettings
8787
'Camera device variables
8888
Private Const CAMERA_MAX_BIN_X As String = "Camera Max Bin X", CAMERA_MAX_BIN_X_DEFAULT As Integer = 0
8989
Private Const CAMERA_MAX_BIN_Y As String = "Camera Max Bin Y", CAMERA_MAX_BIN_Y_DEFAULT As Integer = 0
90+
Private Const CAMERA_TEST_IMAGEARRAYVARIANT As String = "Camera Test ImageArrayVariant", CAMERA_TEST_IMAGEARRAYVARIANT_DEFAULT As Boolean = True
91+
9092

9193
#End Region
9294

@@ -794,6 +796,14 @@ Friend Class ApplicationSettings
794796
SetName(m_SettingsKey, CAMERA_MAX_BIN_Y, value.ToString)
795797
End Set
796798
End Property
799+
Property CameraTestImageArrayVariant() As Boolean
800+
Get
801+
Return GetBool(CAMERA_TEST_IMAGEARRAYVARIANT, CAMERA_TEST_IMAGEARRAYVARIANT_DEFAULT)
802+
End Get
803+
Set(ByVal value As Boolean)
804+
SetName(m_SettingsKey, CAMERA_TEST_IMAGEARRAYVARIANT, value.ToString)
805+
End Set
806+
End Property
797807

798808

799809
#End Region

Conform/Devices/CameraTester.vb

Lines changed: 106 additions & 75 deletions
Large diffs are not rendered by default.

Conform/Devices/CoverCalibrator Tester.vb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ Friend Class CoverCalibratorTester
295295
LogMsg("OpenCover", MessageLevel.msgOK, $"OpenCover was successful. The synchronous open took {DateTime.Now.Subtract(startTime).TotalSeconds.ToString("0.0")} seconds")
296296
Else ' Unsuccessful outcome
297297
LogMsg("OpenCover", MessageLevel.msgError, $"OpenCover was unsuccessful - the returned CoverState was '{coverCalibratorDevice.CoverState.ToString().Trim()}' instead of 'Open'. The synchronous open took {DateTime.Now.Subtract(startTime).TotalSeconds.ToString("0.0")} seconds")
298+
LogMsgInfo("OpenCover", "PLEASE NOTE: The error above will also appear if your device does not set CoverState to Moving before returning from the OpenCover command.")
298299
End If
299300
Else ' Asynchronous behaviour
300301
canAsynchronousOpen = True
@@ -343,6 +344,7 @@ Friend Class CoverCalibratorTester
343344
LogMsg("CloseCover", MessageLevel.msgOK, $"CloseCover was successful. The synchronous close took {DateTime.Now.Subtract(startTime).TotalSeconds.ToString("0.0")} seconds")
344345
Else ' Unsuccessful outcome
345346
LogMsg("CloseCover", MessageLevel.msgError, $"CloseCover was unsuccessful - the returned CoverState was '{coverCalibratorDevice.CoverState.ToString().Trim()}' instead of 'Closed'. The synchronous close took {DateTime.Now.Subtract(startTime).TotalSeconds.ToString("0.0")} seconds")
347+
LogMsgInfo("CloseCover", "PLEASE NOTE: The error above will also appear if your device does not set CoverState to Moving before returning from the CloseCover command.")
346348
End If
347349
Else ' Asynchronous behaviour
348350
canAsynchronousOpen = True
@@ -544,6 +546,7 @@ Friend Class CoverCalibratorTester
544546
LogMsg("CalibratorOff", MessageLevel.msgOK, $"Brightness is set to zero when the calibrator is turned off")
545547
Else ' Brightness is not set to zero when the calibrator is turned off
546548
LogMsg("CalibratorOff", MessageLevel.msgIssue, $"Brightness is not set to zero when the calibrator is turned off")
549+
LogMsgInfo("CalibratorOff", "PLEASE NOTE: The issue above will also appear if your device does not set CalibratorState to NotReady before returning from the CalibratorOff command.")
547550
End If
548551

549552
Else ' Unsuccessful outcome
@@ -621,6 +624,7 @@ Friend Class CoverCalibratorTester
621624
LogMsg("CalibratorOn", MessageLevel.msgOK, $"The Brightness property does return the value that was set")
622625
Else ' The returned Brightness is different to what was set
623626
LogMsg("CalibratorOn", MessageLevel.msgIssue, $"The Brightness property value: {returnedBrightness} does not match the value that was set: {requestedBrightness}")
627+
LogMsgInfo("CalibratorOn", "PLEASE NOTE: The issue above will also appear if your device does not set CalibratorState to NotReady before returning from the CalibratorOn command.")
624628
End If
625629

626630
Else ' Unsuccessful outcome
@@ -669,7 +673,6 @@ Friend Class CoverCalibratorTester
669673
End If
670674
End Sub
671675

672-
673676
Public Overrides Sub CheckPerformance()
674677
Status(StatusType.staTest, "Performance")
675678

Conform/FrmSetup.designer.vb

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Conform/FrmSetup.vb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ Public Class frmSetup
3232
chkDisplayMethodCalls.Checked = g_Settings.DisplayMethodCalls
3333
numMaxBinX.Value = Convert.ToInt32(g_Settings.CameraMaxBinX)
3434
numMaxBinY.Value = Convert.ToInt32(g_Settings.CameraMaxBinY)
35+
ChkTestImageArrayVariant.Checked = g_Settings.CameraTestImageArrayVariant
3536
txtSwitchExtendedTestRange.Text = g_Settings.ExtendedSwitchNumberTestRange
3637

3738
If chkSetupTestSideOfPierWrite.Checked Then ' Test SideOfpier Write is enabled
@@ -165,6 +166,7 @@ Public Class frmSetup
165166
'Camera
166167
g_Settings.CameraMaxBinX = CInt(numMaxBinX.Value)
167168
g_Settings.CameraMaxBinY = CInt(numMaxBinY.Value)
169+
g_Settings.CameraTestImageArrayVariant = ChkTestImageArrayVariant.Checked
168170

169171
'Special - DestinationSideOfPier
170172
g_Settings.FlipTestHAStart(GlobalVarsAndCode.SpecialTests.TelescopeDestinationSideOfPier, PierSide.pierWest) = CDbl(txtStartHAW.Text)

Conform/My Project/AssemblyInfo.vb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Imports System.Runtime.InteropServices
1414
<Assembly: AssemblyDescription("ASCOM Conformance Checker." & vbcrlf & vbcrlf & "This tool confirms conformance of an ASCOM driver to the relevant ASCOM specification." & vbcrlf & vbcrlf & "Please report issues on ASCOM's Groups.io Help forum, thanks - Peter.")>
1515
<Assembly: AssemblyCompany("Peter Simpson")>
1616
<Assembly: AssemblyProduct("Conform")>
17-
<Assembly: AssemblyCopyright("Copyright © Peter Simpson 2021")>
17+
<Assembly: AssemblyCopyright("Copyright © Peter Simpson 2022")>
1818
<Assembly: AssemblyTrademark("")>
1919

2020
<Assembly: ComVisible(False)>

Setup/Conform6.iss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@ Name: "..\BuildConform.cmd"; Flags: CmdPrompt
9898

9999
[Code]
100100
const
101-
REQUIRED_PLATFORM_VERSION = 6.5; // Set this to the minimum required ASCOM Platform version for this application
101+
REQUIRED_PLATFORM_VERSION = 6.5; // Set this to the minimum required ASCOM Platform version for this application
102102
103103
//
104104
// Function to return the ASCOM Platform's version number as a double.
105105
//
106-
function PlatformVersion(): Double;
106+
function PlatformVersion(): Extended;
107107
var
108108
PlatVerString : String;
109109
begin
@@ -133,8 +133,8 @@ var
133133
else
134134
if PlatformVersionNumber = 0.0 then
135135
MsgBox('No ASCOM Platform is installed. Please install Platform ' + Format('%3.1f', [REQUIRED_PLATFORM_VERSION]) + ' or later from http://www.ascom-standards.org', mbCriticalError, MB_OK)
136-
else
137-
MsgBox('ASCOM Platform ' + Format('%3.1f', [REQUIRED_PLATFORM_VERSION]) + ' or later is required, but Platform '+ Format('%3.1f', [PlatformVersionNumber]) + ' is installed. Please install the latest Platform before continuing; you will find it at http://www.ascom-standards.org', mbCriticalError, MB_OK);
136+
else
137+
MsgBox('This version of Conform requires ASCOM Platform ' + Format('%3.1f', [REQUIRED_PLATFORM_VERSION]) + ' or later, but Platform '+ Format('%3.1f', [PlatformVersionNumber]) + ' is installed.' #13#13 'Please install the latest Platform before continuing; you will find it at https://www.ascom-standards.org', mbCriticalError, MB_OK);
138138
end;
139139
140140
// Code to enable the installer to uninstall previous versions of itself when a new version is installed

0 commit comments

Comments
 (0)