Skip to content

Commit 8a26cd4

Browse files
ClutchplateDudeClutchplateDude
committed
Merge branch 'ASCOM_FW1' of https://github.com/EorEquis/OpenAstroTracker into EorAscom
2 parents 2cad009 + 79f67c8 commit 8a26cd4

File tree

11 files changed

+511
-133
lines changed

11 files changed

+511
-133
lines changed

‎.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,13 @@
1717
mono_crash.*
1818

1919
# Build results
20-
[Dd]ebug/
2120
[Dd]ebugPublic/
22-
[Rr]elease/
2321
[Rr]eleases/
2422
x64/
2523
x86/
2624
[Aa][Rr][Mm]/
2725
[Aa][Rr][Mm]64/
2826
bld/
29-
[Bb]in/
3027
[Oo]bj/
3128
[Ll]og/
3229
[Ll]ogs/

‎Software/OpenAstroTracker ASCOM/OAT PC Control/OAT PC Control.vbproj renamed to ‎Software/OpenAstroTracker ASCOM/OAT PC Control/OpenAstroTracker PC Control.vbproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<ProductVersion>
77
</ProductVersion>
88
<SchemaVersion>2.0</SchemaVersion>
9-
<ProjectGuid>{D1747C8D-F0CC-4B20-A0E4-517EBA497FA4}</ProjectGuid>
9+
<ProjectGuid>{B4C4A536-AC59-45B5-A27B-C54CA866F665}</ProjectGuid>
1010
<OutputType>WinExe</OutputType>
1111
<StartupObject>ASCOM.OpenAstroTracker.My.MyApplication</StartupObject>
1212
<RootNamespace>ASCOM.OpenAstroTracker</RootNamespace>
13-
<AssemblyName>ASCOM.OpenAstroTracker.Test</AssemblyName>
13+
<AssemblyName>OpenAstroTracker_PCControl</AssemblyName>
1414
<FileAlignment>512</FileAlignment>
1515
<MyType>WindowsForms</MyType>
1616
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
@@ -23,7 +23,7 @@
2323
<DefineDebug>true</DefineDebug>
2424
<DefineTrace>true</DefineTrace>
2525
<OutputPath>bin\Debug\</OutputPath>
26-
<DocumentationFile>ASCOM.OpenAstroTracker.Test.xml</DocumentationFile>
26+
<DocumentationFile>OpenAstroTracker_PCControl.xml</DocumentationFile>
2727
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
2828
</PropertyGroup>
2929
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
@@ -33,7 +33,7 @@
3333
<DefineTrace>true</DefineTrace>
3434
<Optimize>true</Optimize>
3535
<OutputPath>bin\Release\</OutputPath>
36-
<DocumentationFile>ASCOM.OpenAstroTracker.Test.xml</DocumentationFile>
36+
<DocumentationFile>OpenAstroTracker_PCControl.xml</DocumentationFile>
3737
<NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
3838
</PropertyGroup>
3939
<PropertyGroup>

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

Lines changed: 202 additions & 39 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: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,9 @@ return to the application until the mount returns a response.
147147
This will likely change in near future to block until
148148
slew is finished.</value>
149149
</data>
150+
<metadata name="ToolTipSlewAxis.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
151+
<value>602, 17</value>
152+
</metadata>
150153
<metadata name="Timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
151154
<value>17, 17</value>
152155
</metadata>

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

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,14 @@ Public Class frmMain
2525
If (IsConnected) Then
2626
driver.Connected = False
2727
Timer1.Enabled = False
28+
txtLat.Text = ""
29+
txtLong.Text = ""
30+
lblVersion.Text = ""
31+
txtMountDec.Text = ""
32+
txtMountRA.Text = ""
33+
txtTargetDec.Text = ""
34+
txtTargetRA.Text = ""
35+
2836
Else
2937
driver = New ASCOM.DriverAccess.Telescope(My.Settings.DriverId)
3038
driver.Connected = True
@@ -40,7 +48,10 @@ Public Class frmMain
4048

4149
lblVersion.Text = driver.Action("Telescope:getFirmwareVer","")
4250

43-
'Timer1.Enabled = True
51+
txtLat.Text = driver.SiteLatitude.ToString
52+
txtLong.Text = driver.SiteLongitude.ToString
53+
54+
Timer1.Enabled = True
4455
End If
4556
SetUIState()
4657

@@ -60,6 +71,8 @@ Public Class frmMain
6071
buttonConnect.Enabled = Not String.IsNullOrEmpty(My.Settings.DriverId)
6172
buttonChoose.Enabled = Not IsConnected
6273
buttonConnect.Text = IIf(IsConnected, "Disconnect", "Connect")
74+
btnPark.Enabled = IsConnected
75+
btnSlewSync.Enabled = IsConnected
6376
End Sub
6477

6578
''' <summary>
@@ -161,4 +174,10 @@ Public Class frmMain
161174
btnHalt.Enabled = True
162175
End If
163176
End Sub
177+
178+
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
179+
180+
MsgBox(driver.TrackingRates.Count)
181+
182+
End Sub
164183
End Class

‎Software/OpenAstroTracker ASCOM/OpenAstroTracker ASCOM.sln

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ VisualStudioVersion = 12.0.40629.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "OpenAstroTracker ASCOM", "OpenAstroTracker ASCOM\OpenAstroTracker ASCOM.vbproj", "{71BB4DA7-4092-416D-89FE-97CD15207371}"
77
EndProject
8-
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "OAT PC Control", "OAT PC Control\OAT PC Control.vbproj", "{D1747C8D-F0CC-4B20-A0E4-517EBA497FA4}"
8+
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "OpenAstroTracker PC Control", "OAT PC Control\OpenAstroTracker PC Control.vbproj", "{B4C4A536-AC59-45B5-A27B-C54CA866F665}"
99
EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -27,16 +27,16 @@ Global
2727
{71BB4DA7-4092-416D-89FE-97CD15207371}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
2828
{71BB4DA7-4092-416D-89FE-97CD15207371}.Release|Mixed Platforms.Build.0 = Release|Any CPU
2929
{71BB4DA7-4092-416D-89FE-97CD15207371}.Release|x86.ActiveCfg = Release|Any CPU
30-
{D1747C8D-F0CC-4B20-A0E4-517EBA497FA4}.Debug|Any CPU.ActiveCfg = Debug|x86
31-
{D1747C8D-F0CC-4B20-A0E4-517EBA497FA4}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
32-
{D1747C8D-F0CC-4B20-A0E4-517EBA497FA4}.Debug|Mixed Platforms.Build.0 = Debug|x86
33-
{D1747C8D-F0CC-4B20-A0E4-517EBA497FA4}.Debug|x86.ActiveCfg = Debug|x86
34-
{D1747C8D-F0CC-4B20-A0E4-517EBA497FA4}.Debug|x86.Build.0 = Debug|x86
35-
{D1747C8D-F0CC-4B20-A0E4-517EBA497FA4}.Release|Any CPU.ActiveCfg = Release|x86
36-
{D1747C8D-F0CC-4B20-A0E4-517EBA497FA4}.Release|Mixed Platforms.ActiveCfg = Release|x86
37-
{D1747C8D-F0CC-4B20-A0E4-517EBA497FA4}.Release|Mixed Platforms.Build.0 = Release|x86
38-
{D1747C8D-F0CC-4B20-A0E4-517EBA497FA4}.Release|x86.ActiveCfg = Release|x86
39-
{D1747C8D-F0CC-4B20-A0E4-517EBA497FA4}.Release|x86.Build.0 = Release|x86
30+
{B4C4A536-AC59-45B5-A27B-C54CA866F665}.Debug|Any CPU.ActiveCfg = Debug|x86
31+
{B4C4A536-AC59-45B5-A27B-C54CA866F665}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
32+
{B4C4A536-AC59-45B5-A27B-C54CA866F665}.Debug|Mixed Platforms.Build.0 = Debug|x86
33+
{B4C4A536-AC59-45B5-A27B-C54CA866F665}.Debug|x86.ActiveCfg = Debug|x86
34+
{B4C4A536-AC59-45B5-A27B-C54CA866F665}.Debug|x86.Build.0 = Debug|x86
35+
{B4C4A536-AC59-45B5-A27B-C54CA866F665}.Release|Any CPU.ActiveCfg = Release|x86
36+
{B4C4A536-AC59-45B5-A27B-C54CA866F665}.Release|Mixed Platforms.ActiveCfg = Release|x86
37+
{B4C4A536-AC59-45B5-A27B-C54CA866F665}.Release|Mixed Platforms.Build.0 = Release|x86
38+
{B4C4A536-AC59-45B5-A27B-C54CA866F665}.Release|x86.ActiveCfg = Release|x86
39+
{B4C4A536-AC59-45B5-A27B-C54CA866F665}.Release|x86.Build.0 = Release|x86
4040
EndGlobalSection
4141
GlobalSection(SolutionProperties) = preSolution
4242
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)