Skip to content

Commit 71eb5bf

Browse files
Merge branch 'ASCOM_FW1' of https://github.com/EorEquis/OpenAstroTracker into EorAscom
# Conflicts: # .gitignore
2 parents 7ec16ad + da9d65b commit 71eb5bf

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
@@ -102,7 +102,7 @@ Public Class Telescope
102102
astroUtilities = New AstroUtils 'Initialise new astro utiliites object
103103

104104
'TODO: Implement your additional construction here
105-
105+
mutexCommand = New Mutex(False, "CommMutex")
106106
TL.LogMessage("Telescope", "Completed initialisation")
107107
End Sub
108108

@@ -160,8 +160,8 @@ Public Class Telescope
160160

161161
Public Sub CommandBlind(ByVal Command As String, Optional ByVal Raw As Boolean = False) Implements ITelescopeV3.CommandBlind
162162
CheckConnected("CommandBlind")
163-
mutexBlind = New Mutex(False, "CommMutex")
164-
mutexBlind.WaitOne()
163+
mutexCommand.WaitOne()
164+
165165
If Not Raw Then
166166
Command = Command + "#"
167167
End If
@@ -171,7 +171,7 @@ Public Class Telescope
171171
Catch ex As Exception
172172
TL.LogMessage("CommandBlind(" + Command + ")", "Error : " + ex.Message)
173173
Finally
174-
mutexBlind.ReleaseMutex()
174+
mutexCommand.ReleaseMutex()
175175
End Try
176176
End Sub
177177

@@ -188,7 +188,6 @@ Public Class Telescope
188188
Implements ITelescopeV3.CommandString
189189
Dim response As String
190190
CheckConnected("CommandString")
191-
mutexCommand = New Mutex(False, "CommMutex")
192191
mutexCommand.WaitOne()
193192
If Not Raw Then
194193
Command = Command + "#"

0 commit comments

Comments
 (0)