diff --git a/ASCOM.Lumix.Camera Setup.exe b/ASCOM.Lumix.Camera Setup.exe index da31869..c67a041 100644 Binary files a/ASCOM.Lumix.Camera Setup.exe and b/ASCOM.Lumix.Camera Setup.exe differ diff --git a/ASCOM.Lumix.Camera Setup32.exe b/ASCOM.Lumix.Camera Setup32.exe index 5997c8f..40cdcdb 100644 Binary files a/ASCOM.Lumix.Camera Setup32.exe and b/ASCOM.Lumix.Camera Setup32.exe differ diff --git a/LumixCamera/ASCOM.Lumix.Camera Setup.iss b/LumixCamera/ASCOM.Lumix.Camera Setup.iss index 19ae66b..55ec192 100644 --- a/LumixCamera/ASCOM.Lumix.Camera Setup.iss +++ b/LumixCamera/ASCOM.Lumix.Camera Setup.iss @@ -5,13 +5,13 @@ [Setup] AppID={{77b4d898-3116-40a5-91d4-4c41ff123d93} AppName=ASCOM ASCOM.Lumix.Camera Camera Driver -AppVerName=ASCOM ASCOM.Lumix.Camera Camera Driver 7.0.6 -AppVersion=7.0.6 +AppVerName=ASCOM ASCOM.Lumix.Camera Camera Driver 7.1 +AppVersion=7.1 AppPublisher=robert hasson AppPublisherURL=mailto:robert_hasson@yahoo.com AppSupportURL=http://tech.groups.yahoo.com/group/ASCOM-Talk/ AppUpdatesURL=http://ascom-standards.org/ -VersionInfoVersion=7.0.6 +VersionInfoVersion=7.1 MinVersion=0,6.0 DefaultDirName="{cf}\ASCOM\Camera" DisableDirPage=yes diff --git a/LumixCamera/ASCOM.Lumix.Camera Setup32.iss b/LumixCamera/ASCOM.Lumix.Camera Setup32.iss index 7010944..bf0e374 100644 --- a/LumixCamera/ASCOM.Lumix.Camera Setup32.iss +++ b/LumixCamera/ASCOM.Lumix.Camera Setup32.iss @@ -5,13 +5,13 @@ [Setup] AppID={{77b4d898-3116-40a5-91d4-4c41ff123d93} AppName=ASCOM ASCOM.Lumix.Camera Camera Driver -AppVerName=ASCOM ASCOM.Lumix.Camera Camera Driver 7.0.6 -AppVersion=7.0.6 +AppVerName=ASCOM ASCOM.Lumix.Camera Camera Driver 7.1 +AppVersion=7.1 AppPublisher=robert hasson AppPublisherURL=mailto:robert_hasson@yahoo.com AppSupportURL=http://tech.groups.yahoo.com/group/ASCOM-Talk/ AppUpdatesURL=http://ascom-standards.org/ -VersionInfoVersion=7.0.6 +VersionInfoVersion=7.1 MinVersion=0,6.0 DefaultDirName="{cf}\ASCOM\Camera" DisableDirPage=yes diff --git a/LumixCamera/Driver.vb b/LumixCamera/Driver.vb index bf30795..9c2a3d6 100644 --- a/LumixCamera/Driver.vb +++ b/LumixCamera/Driver.vb @@ -1117,6 +1117,7 @@ Public Class Camera TL.LogMessage("ImageArray Get", "Throwing InvalidOperationException because of a call to ImageArray before the first image has been taken!") Throw New ASCOM.InvalidOperationException("Call to ImageArray before the first image has been taken!") End If + CurrentState = CameraStates.cameraDownload Dim Tiffimagefile As IO.FileStream Tiffimagefile = New FileStream(TiffFileName, IO.FileMode.Open) ReDim cameraImageArray(cameraNumX - 1, cameraNumY - 1) ' there are 3 channels: RVB. @@ -1170,6 +1171,8 @@ Public Class Camera TL.LogMessage("ImageArray Get", "getting the Array") cameraImageReady = False + CurrentState = CameraStates.cameraIdle + Return cameraImageArray End Get End Property @@ -1180,7 +1183,7 @@ Public Class Camera TL.LogMessage("ImageArrayVariant Get", "Throwing InvalidOperationException because of a call to ImageArrayVariant before the first image has been taken!") Throw New ASCOM.InvalidOperationException("Call to ImageArrayVariant before the first image has been taken!") End If - + CurrentState = CameraStates.cameraDownload ReDim cameraImageArrayVariant(cameraNumX - 1, cameraNumY - 1) For i As Integer = 0 To cameraNumY - 1 For j As Integer = 0 To cameraNumX - 1 @@ -1188,6 +1191,7 @@ Public Class Camera Next Next TL.LogMessage("ImageArray Variant Get", "getting the Array Variant") + CurrentState = CameraStates.cameraIdle Return cameraImageArrayVariant End Get End Property @@ -1478,6 +1482,7 @@ Public Class Camera If (cameraStartX > ccdWidth) Then Throw New InvalidValueException("StartExposure", cameraStartX.ToString(), ccdWidth.ToString()) If (cameraStartY > ccdHeight) Then Throw New InvalidValueException("StartExposure", cameraStartY.ToString(), ccdHeight.ToString()) + cameraImageReady = False cameraLastExposureDuration = Duration exposureStart = DateTime.Now SendLumixMessage(RECMODE) 'makes sure it is not in playmode... @@ -1628,7 +1633,7 @@ Public Class Camera End If SendLumixMessage(PLAYMODE) 'making sure the camera is in Playmode - CurrentState = CameraStates.cameraDownload + CurrentState = CameraStates.cameraReading CurrentPercentCompleted = 0 nRead = 0 diff --git a/LumixCamera/My Project/AssemblyInfo.vb b/LumixCamera/My Project/AssemblyInfo.vb index 96a572c..6976125 100644 --- a/LumixCamera/My Project/AssemblyInfo.vb +++ b/LumixCamera/My Project/AssemblyInfo.vb @@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices ' You can specify all the values or you can default the Build and Revision Numbers ' by using the '*' as shown below: - - + +