Astronomy/MeadeGeneric
1
0
Fork 0
Code Pull Requests Wiki Activity

Reinstated the Real Alt Az methods for the LX200GPS. Changes how the parked behaviour is implemented, so that it doesn't need to make as many calls.

Browse Source
This commit is contained in:
Colin Dawson
2021-04-27 20:14:57 +01:00
parent 70e615bb4e
commit 2c2c59290e
4 changed files with 246 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
+144 -156
View File
File diff suppressed because it is too large Load Diff
Meade.net.Telescope/Meade.net.Telescope.csproj
+1
View File
@@ -127,6 +127,7 @@
<Compile Include="ComparisonResult.cs" />
<Compile Include="DoubleExtensions.cs" />
<Compile Include="IClock.cs" />
<Compile Include="ParkedPosition.cs" />
<Compile Include="StringExtensions.cs" />
<Compile Include="Telescope.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
Meade.net.Telescope/ParkedPosition.cs
+10
View File
@@ -0,0 +1,10 @@
namespace ASCOM.Meade.net
{
public class ParkedPosition
{
public double Altitude { get; set; }
public double Azimuth { get; set; }
public double RightAscension { get; set; }
public double Declination { get; set; }
}
}
Meade.net.Telescope/Telescope.cs
+86 -32
View File
@@ -74,6 +74,8 @@ namespace ASCOM.Meade.net
private short _settleTime;
private ParkedPosition _parkedPosition;
/// <summary>
/// Initializes a new instance of the <see cref="Meade.net"/> class.
/// Must be public for COM registration.
@@ -988,22 +990,35 @@ namespace ASCOM.Meade.net
{
CheckConnected("Altitude Get");
if (SharedResourcesWrapper.ProductName == TelescopeList.LX200GPS)
{
try
{
//firmware bug in 44Eg, :GA# is returning the dec, not the altitude!
var result = SharedResourcesWrapper.SendString("GA");
//:GA# Get Telescope Altitude
//Returns: sDD* MM# or sDD*MM’SS#
//The current scope altitude. The returned format depending on the current precision setting.
var alt = _utilities.DMSToDegrees(result);
LogMessage("Altitude", $"{alt}");
return alt;
}
catch (ParkedException)
{
switch (ParkedBehaviour)
{
case ParkedBehaviour.NoCoordinates:
throw;
default:
return _parkedPosition.Altitude;
}
}
}
var altAz = CalcAltAzFromTelescopeEqData();
LogMessage("Altitude", $"{altAz.Altitude}");
return altAz.Altitude;
//firmware bug in 44Eg, :GA# is returning the dec, not the altitude!
//var result = _sharedResourcesWrapper.SendString("GA");
////:GA# Get Telescope Altitude
////Returns: sDD* MM# or sDD*MM’SS#
////The current scope altitude. The returned format depending on the current precision setting.
//var alt = utilities.DMSToDegrees(result);
//LogMessage("Altitude", $"{alt}");
//return alt;
//LogMessage("Altitude Get", "Not implemented");
//throw new ASCOM.PropertyNotImplementedException("Altitude", false);
}
}
@@ -1083,15 +1098,31 @@ namespace ASCOM.Meade.net
{
CheckConnected("Azimuth Get");
//var result = _sharedResourcesWrapper.SendString("GZ");
//:GZ# Get telescope azimuth
//Returns: DDD*MM#T or DDD*MM’SS#
//The current telescope Azimuth depending on the selected precision.
if (SharedResourcesWrapper.ProductName == TelescopeList.LX200GPS)
{
try
{
var result = SharedResourcesWrapper.SendString("GZ");
//:GZ# Get telescope azimuth
//Returns: DDD*MM#T or DDD*MM’SS#
//The current telescope Azimuth depending on the selected precision.
//double az = utilities.DMSToDegrees(result);
double az = _utilities.DMSToDegrees(result);
//LogMessage("Azimuth Get", $"{az}");
//return az;
LogMessage("Azimuth Get", $"{az}");
return az;
}
catch (ParkedException)
{
switch (ParkedBehaviour)
{
case ParkedBehaviour.NoCoordinates:
throw;
default:
return _parkedPosition.Azimuth;
}
}
}
var altAz = CalcAltAzFromTelescopeEqData();
LogMessage("Azimuth Get", $"{altAz.Azimuth}");
@@ -1288,13 +1319,10 @@ namespace ASCOM.Meade.net
{
switch (ParkedBehaviour)
{
case ParkedBehaviour.LastGoodPosition:
return _lastGoodDeclination;
case ParkedBehaviour.ReportCoordinates:
var raDec = _astroMaths.ConvertHozToEq(UTCDate, SiteLatitude, SiteLongitude, ParkedAltAz);
return raDec.Declination;
default:
case ParkedBehaviour.NoCoordinates:
throw;
default:
return _parkedPosition.Declination;
}
}
}
@@ -1557,8 +1585,37 @@ namespace ASCOM.Meade.net
if (AtPark)
return;
switch (ParkedBehaviour)
{
case ParkedBehaviour.LastGoodPosition:
_parkedPosition = new ParkedPosition
{
Altitude = Altitude,
Azimuth = Azimuth,
RightAscension = RightAscension,
Declination = Declination
};
break;
case ParkedBehaviour.ReportCoordinates:
var utcDateTime = UTCDate;
var latitude = SiteLatitude;
var longitude = SiteLongitude;
var raDec = _astroMaths.ConvertHozToEq(utcDateTime, latitude, longitude, ParkedAltAz);
_parkedPosition = new ParkedPosition
{
Altitude = ParkedAltAz.Altitude,
Azimuth = ParkedAltAz.Azimuth,
RightAscension = raDec.RightAscension,
Declination = raDec.Declination
};
break;
}
//Setting park to true before sending the park command as the Autostar and Audiostar stop serial communications once the park command has been issued.
AtPark = true;
SharedResourcesWrapper.SendBlind("hP");
//:hP# Autostar, Autostar II and LX 16”Slew to Park Position
//Returns: Nothing
@@ -1709,13 +1766,10 @@ namespace ASCOM.Meade.net
{
switch (ParkedBehaviour)
{
case ParkedBehaviour.LastGoodPosition:
return _lastGoodRightAsension;
case ParkedBehaviour.ReportCoordinates:
var raDec = _astroMaths.ConvertHozToEq(UTCDate, SiteLatitude, SiteLongitude, ParkedAltAz);
return raDec.RightAscension;
default:
case ParkedBehaviour.NoCoordinates:
throw;
default:
return _parkedPosition.RightAscension;
}
}