Skip to content

Commit a621a1b

Browse files
Merge pull request #3 from EorEquis/ASCOM
:GV should terminate with #
2 parents fb2f672 + a7e6df5 commit a621a1b

File tree

7 files changed

+200
-51
lines changed

7 files changed

+200
-51
lines changed

Software/Arduino code/OpenAstroTracker/b_setup.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ DayTime HACorrection;
1111
void setup() {
1212

1313
//Serial.begin(38400);
14-
Serial.begin(9600);
14+
Serial.begin(57600);
1515
//BT.begin(9600);
1616

1717
#ifdef DEBUG_MODE

Software/Arduino code/OpenAstroTracker/f_serial.ino

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@ void handleMeadeGetInfo(String inCmd) {
3030
case 'V' : {
3131
if (cmdTwo == 'N') {
3232
Serial.print(version);
33+
Serial.print("#");
3334
}
3435
else if (cmdTwo == 'P') {
35-
Serial.print("OpenAstroTracker");
36+
Serial.print("OpenAstroTracker#");
3637
}
3738
}
3839
break;

Software/OpenAstroTracker ASCOM/OAT PC Control/My Project/AssemblyInfo.vb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices
3030
' You can specify all the values or you can default the Build and Revision Numbers
3131
' by using the '*' as shown below:
3232

33-
<Assembly: AssemblyVersion("6.4.0.0")>
34-
<Assembly: AssemblyFileVersion("6.4.0.0")>
33+
<Assembly: AssemblyVersion("0.1.0.0")>
34+
<Assembly: AssemblyFileVersion("0.1.0.0")>

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

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

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,36 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120+
<metadata name="ToolTipPark.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
121+
<value>106, 17</value>
122+
</metadata>
123+
<metadata name="ToolTipHalt.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
124+
<value>488, 17</value>
125+
</metadata>
126+
<metadata name="ToolTipSlewAsync.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
127+
<value>339, 17</value>
128+
</metadata>
129+
<data name="btnSlewAsync.ToolTip" xml:space="preserve">
130+
<value>Slews the mount to the selected coordinates.
131+
132+
This is an asynchronous call, meaning control returns to the application
133+
immediately, without waiting for a response from the mount.
134+
135+
This functionality is not yet implemented.
136+
</value>
137+
</data>
138+
<metadata name="ToolTipSlew.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
139+
<value>222, 17</value>
140+
</metadata>
141+
<data name="btnSlewSync.ToolTip" xml:space="preserve">
142+
<value>Slews the mount to the selected coordinates.
143+
144+
This is a synchronous call, meaning control does not
145+
return to the application until the mount returns a response.
146+
147+
This will likely change in near future to block until
148+
slew is finished.</value>
149+
</data>
120150
<metadata name="Timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
121151
<value>17, 17</value>
122152
</metadata>

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

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,17 @@ Public Class frmMain
3030
driver.Connected = True
3131
updateValues()
3232

33-
'nud_Decd.Value = CInt(txtMountDec.Text.Substring(0, 2))
34-
'nud_Decm.Value = CInt(txtMountDec.Text.Substring(4, 2))
35-
'nud_Decs.Value = CInt(txtMountDec.Text.Substring(8, 2))
33+
nud_Decd.Value = CInt(txtMountDec.Text.Substring(0, 2))
34+
nud_Decm.Value = CInt(txtMountDec.Text.Substring(4, 2))
35+
nud_Decs.Value = CInt(txtMountDec.Text.Substring(8, 2))
3636

37-
'nud_RAh.Value = CInt(txtMountRA.Text.Substring(0, 2))
38-
'nud_RAm.Value = CInt(txtMountRA.Text.Substring(4, 2))
39-
'nud_RAs.Value = CInt(txtMountRA.Text.Substring(8, 2))
37+
nud_RAh.Value = CInt(txtMountRA.Text.Substring(0, 2))
38+
nud_RAm.Value = CInt(txtMountRA.Text.Substring(4, 2))
39+
nud_RAs.Value = CInt(txtMountRA.Text.Substring(8, 2))
4040

41+
lblVersion.Text = driver.Action("Telescope:getFirmwareVer","")
4142

42-
' Timer1.Enabled = True
43+
'Timer1.Enabled = True
4344
End If
4445
SetUIState()
4546

@@ -146,4 +147,18 @@ Public Class frmMain
146147
Private Sub Timer1_Tick(sender As Object, e As EventArgs) Handles Timer1.Tick
147148
updateValues()
148149
End Sub
150+
151+
Private Sub btnPark_Click(sender As Object, e As EventArgs) Handles btnPark.Click
152+
If btnPark.Text = "Park" Then
153+
driver.Park()
154+
btnPark.Text = "Unpark"
155+
btnSlewSync.Enabled = False
156+
btnHalt.Enabled = False
157+
Else
158+
driver.Unpark()
159+
btnPark.Text = "Park"
160+
btnSlewSync.Enabled = True
161+
btnHalt.Enabled = True
162+
End If
163+
End Sub
149164
End Class

0 commit comments

Comments
 (0)