Skip to content

Commit 3ba5352

Browse files
Merge branch 'EorAscom' into oopthescope
2 parents b6e253e + 71eb5bf commit 3ba5352

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

Software/OpenAstroTracker ASCOM/OAT PC Control/frmMain.vb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ Public Class frmMain
119119
Private Sub updateValues()
120120
txtMountDec.Text = DblToDMS(driver.Declination).ToString
121121
txtMountRA.Text = DbltoHMS(driver.RightAscension).ToString
122+
driver.TargetDeclination = driver.Declination
123+
driver.TargetRightAscension = driver.RightAscension
122124
txtTargetDec.Text = DblToDMS(driver.TargetDeclination).ToString
123125
txtTargetRA.Text = DbltoHMS(driver.TargetRightAscension).ToString
124126

Software/OpenAstroTracker ASCOM/OpenAstroTracker ASCOM/Driver.vb

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ Public Class Telescope
107107
astroUtilities = New AstroUtils 'Initialise new astro utiliites object
108108

109109
'TODO: Implement your additional construction here
110-
110+
mutexCommand = New Mutex(False, "CommMutex")
111111
TL.LogMessage("Telescope", "Completed initialisation")
112112
End Sub
113113

@@ -165,8 +165,8 @@ Public Class Telescope
165165

166166
Public Sub CommandBlind(ByVal Command As String, Optional ByVal Raw As Boolean = False) Implements ITelescopeV3.CommandBlind
167167
CheckConnected("CommandBlind")
168-
mutexBlind = New Mutex(False, "CommMutex")
169-
mutexBlind.WaitOne()
168+
mutexCommand.WaitOne()
169+
170170
If Not Raw Then
171171
Command = Command + "#"
172172
End If
@@ -176,7 +176,7 @@ Public Class Telescope
176176
Catch ex As Exception
177177
TL.LogMessage("CommandBlind(" + Command + ")", "Error : " + ex.Message)
178178
Finally
179-
mutexBlind.ReleaseMutex()
179+
mutexCommand.ReleaseMutex()
180180
End Try
181181
End Sub
182182

@@ -193,7 +193,6 @@ Public Class Telescope
193193
Implements ITelescopeV3.CommandString
194194
Dim response As String
195195
CheckConnected("CommandString")
196-
mutexCommand = New Mutex(False, "CommMutex")
197196
mutexCommand.WaitOne()
198197
If Not Raw Then
199198
Command = Command + "#"

0 commit comments

Comments
 (0)