Skip to content

Commit 3d74917

Browse files
committed
Hackily pulling in OATComms, also hacking Async.
1 parent d478f14 commit 3d74917

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

Software/OpenAstroTracker ASCOM/OATControl/OATControl.csproj

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,6 @@
7474
<Reference Include="MahApps.Metro, Version=1.6.5.1, Culture=neutral, processorArchitecture=MSIL">
7575
<HintPath>packages\MahApps.Metro.1.6.5\lib\net47\MahApps.Metro.dll</HintPath>
7676
</Reference>
77-
<Reference Include="OATCommunications">
78-
<HintPath>..\..\OATMobile\OATCommunications\bin\Debug\netstandard2.0\OATCommunications.dll</HintPath>
79-
</Reference>
8077
<Reference Include="System" />
8178
<Reference Include="System.Data" />
8279
<Reference Include="System.Drawing" />
@@ -197,5 +194,11 @@
197194
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
198195
</Content>
199196
</ItemGroup>
197+
<ItemGroup>
198+
<ProjectReference Include="..\..\OATMobile\OATCommunications\OATCommunications.csproj">
199+
<Project>{83ca4f93-43ce-4da1-839a-f65f51fc34ed}</Project>
200+
<Name>OATCommunications</Name>
201+
</ProjectReference>
202+
</ItemGroup>
200203
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
201204
</Project>

Software/OpenAstroTracker ASCOM/OATControl/OATControl.sln

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
44
VisualStudioVersion = 16.0.29814.53
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OATControl", "OATControl.csproj", "{99D141F1-4E6D-4BD0-B160-5E67A3BE33D0}"
7+
ProjectSection(ProjectDependencies) = postProject
8+
{83CA4F93-43CE-4DA1-839A-F65F51FC34ED} = {83CA4F93-43CE-4DA1-839A-F65F51FC34ED}
9+
EndProjectSection
10+
EndProject
11+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OATCommunications", "..\..\OATMobile\OATCommunications\OATCommunications.csproj", "{83CA4F93-43CE-4DA1-839A-F65F51FC34ED}"
712
EndProject
813
Global
914
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,6 +20,10 @@ Global
1520
{99D141F1-4E6D-4BD0-B160-5E67A3BE33D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
1621
{99D141F1-4E6D-4BD0-B160-5E67A3BE33D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
1722
{99D141F1-4E6D-4BD0-B160-5E67A3BE33D0}.Release|Any CPU.Build.0 = Release|Any CPU
23+
{83CA4F93-43CE-4DA1-839A-F65F51FC34ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
24+
{83CA4F93-43CE-4DA1-839A-F65F51FC34ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
25+
{83CA4F93-43CE-4DA1-839A-F65F51FC34ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
26+
{83CA4F93-43CE-4DA1-839A-F65F51FC34ED}.Release|Any CPU.Build.0 = Release|Any CPU
1827
EndGlobalSection
1928
GlobalSection(SolutionProperties) = preSolution
2029
HideSolutionNode = FALSE

Software/OpenAstroTracker ASCOM/OATControl/ViewModels/MountVM.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ private void OnConnectToTelescope()
359359
{
360360
try
361361
{
362-
ScopeName = _oatMount.SendCommand("GVP").Result.Data;
362+
ScopeName = _oatMount.SendCommand("GVP").GetAwaiter().GetResult().Data;
363363

364364
_transform.SiteElevation = 100;// _oatMount.SiteElevation;
365365
_transform.SiteLatitude = 47; //_oatMount.SiteLatitude;
@@ -459,7 +459,7 @@ private void OnChooseTelescope()
459459
//{
460460
// ScopeName = name;
461461
_oatMount = new OatmealTelescopeCommandHandlers(
462-
new TcpCommunicationHandler(new IPAddress(new byte[] { 192, 168, 86, 21 }), 4030));
462+
new TcpCommunicationHandler(new IPAddress(new byte[] { 192, 168, 86, 40 }), 4030));
463463

464464
try
465465
{

0 commit comments

Comments
 (0)