@@ -109,16 +109,17 @@ namespace Meade.net.Focuser.UnitTests
|
||||
Assert.That(exception.Message, Is.EqualTo("Not connected to focuser when trying to execute: CommandBlind"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void CommandBlind_WhenConnected_ThenSendsExpectedMessage()
|
||||
[TestCase(false)]
|
||||
[TestCase(true)]
|
||||
public void CommandBlind_WhenConnected_ThenSendsExpectedMessage(bool raw)
|
||||
{
|
||||
string expectedMessage = "test blind Message";
|
||||
|
||||
ConnectFocuser();
|
||||
|
||||
_focuser.CommandBlind(expectedMessage, true);
|
||||
_focuser.CommandBlind(expectedMessage, raw);
|
||||
|
||||
_sharedResourcesWrapperMock.Verify(x => x.SendBlind(expectedMessage), Times.Once);
|
||||
_sharedResourcesWrapperMock.Verify(x => x.SendBlind(expectedMessage, raw), Times.Once);
|
||||
}
|
||||
|
||||
[Test]
|
||||
@@ -130,16 +131,19 @@ namespace Meade.net.Focuser.UnitTests
|
||||
Assert.That(exception.Message, Is.EqualTo("Not connected to focuser when trying to execute: CommandBool"));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void CommandBool_WhenConnected_ThenSendsExpectedMessage()
|
||||
[TestCase(false)]
|
||||
[TestCase(true)]
|
||||
public void CommandBool_WhenConnected_ThenSendsExpectedMessage(bool raw)
|
||||
{
|
||||
string expectedMessage = "test blind Message";
|
||||
_sharedResourcesWrapperMock.Setup(x => x.SendBool(expectedMessage, raw)).Returns(true);
|
||||
|
||||
ConnectFocuser();
|
||||
|
||||
var exception = Assert.Throws<MethodNotImplementedException>(() => { _focuser.CommandBool(expectedMessage, true); });
|
||||
var result = _focuser.CommandBool(expectedMessage, raw);
|
||||
|
||||
Assert.That(exception.Message, Is.EqualTo("Method CommandBool is not implemented in this driver."));
|
||||
_sharedResourcesWrapperMock.Verify(x => x.SendBool(expectedMessage, raw), Times.Once);
|
||||
Assert.That(result, Is.True);
|
||||
}
|
||||
|
||||
[Test]
|
||||
@@ -319,7 +323,7 @@ namespace Meade.net.Focuser.UnitTests
|
||||
|
||||
_focuser.Halt();
|
||||
|
||||
_sharedResourcesWrapperMock.Verify( x => x.SendBlind(":FQ#"), Times.AtLeastOnce);
|
||||
_sharedResourcesWrapperMock.Verify(x => x.SendBlind("FQ", false), Times.AtLeastOnce);
|
||||
}
|
||||
|
||||
[Test]
|
||||
@@ -409,13 +413,13 @@ namespace Meade.net.Focuser.UnitTests
|
||||
|
||||
if (position < 0)
|
||||
{
|
||||
_sharedResourcesWrapperMock.Verify( x => x.SendBlind(":F-#"), Times.Once);
|
||||
_sharedResourcesWrapperMock.Verify(x => x.SendBlind(":F+#"), Times.Never);
|
||||
_sharedResourcesWrapperMock.Verify(x => x.SendBlind("F-", false), Times.Once);
|
||||
_sharedResourcesWrapperMock.Verify(x => x.SendBlind("F+", false), Times.Never);
|
||||
}
|
||||
else
|
||||
{
|
||||
_sharedResourcesWrapperMock.Verify(x => x.SendBlind(":F-#"), Times.Never);
|
||||
_sharedResourcesWrapperMock.Verify(x => x.SendBlind(":F+#"), Times.Once);
|
||||
_sharedResourcesWrapperMock.Verify(x => x.SendBlind("F-", false), Times.Never);
|
||||
_sharedResourcesWrapperMock.Verify(x => x.SendBlind("F+", false), Times.Once);
|
||||
}
|
||||
|
||||
_sharedResourcesWrapperMock.Verify(x => x.Lock(It.IsAny<Action>()), Times.Once);
|
||||
@@ -437,16 +441,16 @@ namespace Meade.net.Focuser.UnitTests
|
||||
|
||||
if (position < 0)
|
||||
{
|
||||
_sharedResourcesWrapperMock.Verify(x => x.SendBlind(":F-#"), Times.Once);
|
||||
_sharedResourcesWrapperMock.Verify(x => x.SendBlind(":F+#"), Times.Never);
|
||||
_sharedResourcesWrapperMock.Verify(x => x.SendBlind("F-", false), Times.Once);
|
||||
_sharedResourcesWrapperMock.Verify(x => x.SendBlind("F+", false), Times.Never);
|
||||
_utilMock.Verify(x => x.WaitForMilliseconds(Math.Abs(position)), Times.Once);
|
||||
_utilMock.Verify(x => x.WaitForMilliseconds(Math.Abs(_profileProperties.BacklashCompensation)), Times.Never);
|
||||
_utilMock.Verify(x => x.WaitForMilliseconds(100), Times.Exactly(1));
|
||||
}
|
||||
else
|
||||
{
|
||||
_sharedResourcesWrapperMock.Verify(x => x.SendBlind(":F-#"), Times.Once);
|
||||
_sharedResourcesWrapperMock.Verify(x => x.SendBlind(":F+#"), Times.Once);
|
||||
_sharedResourcesWrapperMock.Verify(x => x.SendBlind("F-", false), Times.Once);
|
||||
_sharedResourcesWrapperMock.Verify(x => x.SendBlind("F+", false), Times.Once);
|
||||
_utilMock.Verify(x => x.WaitForMilliseconds(Math.Abs(position) + _profileProperties.BacklashCompensation), Times.Once);
|
||||
_utilMock.Verify(x => x.WaitForMilliseconds(_profileProperties.BacklashCompensation), Times.Once);
|
||||
_utilMock.Verify(x => x.WaitForMilliseconds(100), Times.Exactly(2));
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
+203
-135
@@ -45,12 +45,15 @@ namespace ASCOM.Meade.net
|
||||
/// The DeviceID is used by ASCOM applications to load the driver at runtime.
|
||||
/// </summary>
|
||||
//internal static string driverID = "ASCOM.Meade.net.Telescope";
|
||||
private static readonly string DriverId = Marshal.GenerateProgIdForType(MethodBase.GetCurrentMethod().DeclaringType ?? throw new System.InvalidOperationException());
|
||||
private static readonly string DriverId =
|
||||
Marshal.GenerateProgIdForType(MethodBase.GetCurrentMethod().DeclaringType ??
|
||||
throw new System.InvalidOperationException());
|
||||
|
||||
/// <summary>
|
||||
/// Private variable to hold an ASCOM Utilities object
|
||||
/// </summary>
|
||||
private readonly IUtil _utilities;
|
||||
|
||||
private readonly IUtilExtra _utilitiesExtra;
|
||||
|
||||
/// <summary>
|
||||
@@ -121,7 +124,9 @@ namespace ASCOM.Meade.net
|
||||
sb.AppendLine();
|
||||
}
|
||||
|
||||
public Telescope( IUtil util, IUtilExtra utilExtra, IAstroUtils astroUtilities, ISharedResourcesWrapper sharedResourcesWrapper, IAstroMaths astroMaths, IClock clock) : base(sharedResourcesWrapper)
|
||||
public Telescope(IUtil util, IUtilExtra utilExtra, IAstroUtils astroUtilities,
|
||||
ISharedResourcesWrapper sharedResourcesWrapper, IAstroMaths astroMaths, IClock clock) : base(
|
||||
sharedResourcesWrapper)
|
||||
{
|
||||
_clock = clock;
|
||||
_utilities = util; //Initialise util object
|
||||
@@ -189,68 +194,68 @@ namespace ASCOM.Meade.net
|
||||
{
|
||||
//Read the screen
|
||||
case "readdisplay":
|
||||
var output = SharedResourcesWrapper.SendString(":ED#");
|
||||
var output = SharedResourcesWrapper.SendString("ED");
|
||||
return output;
|
||||
|
||||
//top row of buttons
|
||||
case "enter":
|
||||
SharedResourcesWrapper.SendBlind(":EK13#");
|
||||
SharedResourcesWrapper.SendBlind("EK13");
|
||||
break;
|
||||
case "mode":
|
||||
SharedResourcesWrapper.SendBlind(":EK9#");
|
||||
SharedResourcesWrapper.SendBlind("EK9");
|
||||
break;
|
||||
case "longmode":
|
||||
SharedResourcesWrapper.SendBlind(":EK11#");
|
||||
SharedResourcesWrapper.SendBlind("EK11");
|
||||
break;
|
||||
case "goto":
|
||||
SharedResourcesWrapper.SendBlind(":EK24#");
|
||||
SharedResourcesWrapper.SendBlind("EK24");
|
||||
break;
|
||||
|
||||
case "0": //light and 0
|
||||
SharedResourcesWrapper.SendBlind(":EK48#");
|
||||
SharedResourcesWrapper.SendBlind("EK48");
|
||||
break;
|
||||
case "1":
|
||||
SharedResourcesWrapper.SendBlind(":EK49#");
|
||||
SharedResourcesWrapper.SendBlind("EK49");
|
||||
break;
|
||||
case "2":
|
||||
SharedResourcesWrapper.SendBlind(":EK50#");
|
||||
SharedResourcesWrapper.SendBlind("EK50");
|
||||
break;
|
||||
case "3":
|
||||
SharedResourcesWrapper.SendBlind(":EK51#");
|
||||
SharedResourcesWrapper.SendBlind("EK51");
|
||||
break;
|
||||
case "4":
|
||||
SharedResourcesWrapper.SendBlind(":EK52#");
|
||||
SharedResourcesWrapper.SendBlind("EK52");
|
||||
break;
|
||||
case "5":
|
||||
SharedResourcesWrapper.SendBlind(":EK53#");
|
||||
SharedResourcesWrapper.SendBlind("EK53");
|
||||
break;
|
||||
case "6":
|
||||
SharedResourcesWrapper.SendBlind(":EK54#");
|
||||
SharedResourcesWrapper.SendBlind("EK54");
|
||||
break;
|
||||
case "7":
|
||||
SharedResourcesWrapper.SendBlind(":EK55#");
|
||||
SharedResourcesWrapper.SendBlind("EK55");
|
||||
break;
|
||||
case "8":
|
||||
SharedResourcesWrapper.SendBlind(":EK56#");
|
||||
SharedResourcesWrapper.SendBlind("EK56");
|
||||
break;
|
||||
case "9":
|
||||
SharedResourcesWrapper.SendBlind(":EK57#");
|
||||
SharedResourcesWrapper.SendBlind("EK57");
|
||||
break;
|
||||
|
||||
case "up":
|
||||
SharedResourcesWrapper.SendBlind(":EK94#");
|
||||
SharedResourcesWrapper.SendBlind("EK94");
|
||||
break;
|
||||
case "down":
|
||||
SharedResourcesWrapper.SendBlind(":EK118#");
|
||||
SharedResourcesWrapper.SendBlind("EK118");
|
||||
break;
|
||||
case "back":
|
||||
SharedResourcesWrapper.SendBlind(":EK87#");
|
||||
SharedResourcesWrapper.SendBlind("EK87");
|
||||
break;
|
||||
case "forward":
|
||||
SharedResourcesWrapper.SendBlind(":EK69#");
|
||||
SharedResourcesWrapper.SendBlind("EK69");
|
||||
break;
|
||||
case "?":
|
||||
SharedResourcesWrapper.SendBlind(":EK63#");
|
||||
SharedResourcesWrapper.SendBlind("EK63");
|
||||
break;
|
||||
default:
|
||||
LogMessage("", "Action {0}, parameters {1} not implemented", actionName, actionParameters);
|
||||
@@ -280,6 +285,7 @@ namespace ASCOM.Meade.net
|
||||
$"Site {actionParameters} not allowed, must be between 1 and 4");
|
||||
|
||||
}
|
||||
|
||||
break;
|
||||
case "getname":
|
||||
switch (parames[1])
|
||||
@@ -314,6 +320,7 @@ namespace ASCOM.Meade.net
|
||||
$"Site {actionParameters} not allowed, must be between 1 and 4");
|
||||
|
||||
}
|
||||
|
||||
break;
|
||||
default:
|
||||
throw new InvalidValueException(
|
||||
@@ -335,7 +342,7 @@ namespace ASCOM.Meade.net
|
||||
CheckConnected("CommandBlind");
|
||||
// Call CommandString and return as soon as it finishes
|
||||
//this.CommandString(command, raw);
|
||||
SharedResourcesWrapper.SendBlind(command);
|
||||
SharedResourcesWrapper.SendBlind(command, raw);
|
||||
// or
|
||||
//throw new ASCOM.MethodNotImplementedException("CommandBlind");
|
||||
// DO NOT have both these sections! One or the other
|
||||
@@ -345,9 +352,10 @@ namespace ASCOM.Meade.net
|
||||
{
|
||||
CheckConnected("CommandBool");
|
||||
//string ret = CommandString(command, raw);
|
||||
return SharedResourcesWrapper.SendBool(command, raw);
|
||||
// TODO decode the return string and return true or false
|
||||
// or
|
||||
throw new MethodNotImplementedException("CommandBool");
|
||||
//throw new MethodNotImplementedException("CommandBool");
|
||||
// DO NOT have both these sections! One or the other
|
||||
}
|
||||
|
||||
@@ -395,7 +403,8 @@ namespace ASCOM.Meade.net
|
||||
var connectionInfo = SharedResourcesWrapper.Connect("Serial", DriverId, Tl);
|
||||
try
|
||||
{
|
||||
LogMessage("Connected Set", $"Connected to port {ComPort}. Product: {SharedResourcesWrapper.ProductName} Version:{SharedResourcesWrapper.FirmwareVersion}");
|
||||
LogMessage("Connected Set",
|
||||
$"Connected to port {ComPort}. Product: {SharedResourcesWrapper.ProductName} Version:{SharedResourcesWrapper.FirmwareVersion}");
|
||||
|
||||
_userNewerPulseGuiding = IsNewPulseGuidingSupported();
|
||||
_targetDeclination = InvalidParameter;
|
||||
@@ -407,6 +416,7 @@ namespace ASCOM.Meade.net
|
||||
|
||||
if (connectionInfo.SameDevice == 1)
|
||||
{
|
||||
SharedResourcesWrapper.SetParked(false, null);
|
||||
LogMessage("Connected Set", "Making first connection telescope adjustments");
|
||||
|
||||
LogMessage("Connected Set", $"Site Longitude: {SiteLongitude}");
|
||||
@@ -427,19 +437,23 @@ namespace ASCOM.Meade.net
|
||||
{
|
||||
if (SharedResourcesWrapper.ProductName == TelescopeList.LX200GPS)
|
||||
{
|
||||
LogMessage("Connected Set", $"LX200GPS Detecting if daylight savings message on screen: {SendDateTime}");
|
||||
LogMessage("Connected Set",
|
||||
$"LX200GPS Detecting if daylight savings message on screen: {SendDateTime}");
|
||||
var displayText = Action("Handbox", "readdisplay");
|
||||
LogMessage("Connected Set", $"Current Handset display: {displayText}");
|
||||
if (displayText.Contains("Daylight"))
|
||||
{
|
||||
LogMessage("Connected Set", $"LX200GPS Setting Date time and bypassing settings screens: {SendDateTime}");
|
||||
LogMessage("Connected Set",
|
||||
$"LX200GPS Setting Date time and bypassing settings screens: {SendDateTime}");
|
||||
BypassHandboxEntryForAutostarII();
|
||||
}
|
||||
else
|
||||
{
|
||||
LogMessage("Connected Set", $"LX200GPS Sending current date and time: {SendDateTime}");
|
||||
LogMessage("Connected Set",
|
||||
$"LX200GPS Sending current date and time: {SendDateTime}");
|
||||
SendCurrentDateTime("Connect");
|
||||
LogMessage("Connected Set", $"LX200GPS Attempting manual bypass of prompts: {SendDateTime}");
|
||||
LogMessage("Connected Set",
|
||||
$"LX200GPS Attempting manual bypass of prompts: {SendDateTime}");
|
||||
ApplySkipAutoStarPrompts("Connect");
|
||||
}
|
||||
|
||||
@@ -454,11 +468,14 @@ namespace ASCOM.Meade.net
|
||||
}
|
||||
else
|
||||
{
|
||||
LogMessage("Connected Set", $"Skipping first connection telescope adjustments (current connections: {connectionInfo.SameDevice})");
|
||||
LogMessage("Connected Set",
|
||||
$"Skipping first connection telescope adjustments (current connections: {connectionInfo.SameDevice})");
|
||||
CheckParked();
|
||||
}
|
||||
|
||||
var raAndDec = GetTelescopeRaAndDec();
|
||||
LogMessage("Connected Set", $"Connected OK. Current RA = {_utilitiesExtra.HoursToHMS(raAndDec.RightAscension)} Dec = {_utilitiesExtra.DegreesToDMS(raAndDec.Declination)}");
|
||||
LogMessage("Connected Set",
|
||||
$"Connected OK. Current RA = {_utilitiesExtra.HoursToHMS(raAndDec.RightAscension)} Dec = {_utilitiesExtra.DegreesToDMS(raAndDec.Declination)}");
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
@@ -570,6 +587,7 @@ namespace ASCOM.Meade.net
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -579,6 +597,7 @@ namespace ASCOM.Meade.net
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -675,7 +694,7 @@ namespace ASCOM.Meade.net
|
||||
|
||||
SharedResourcesWrapper.Lock(() =>
|
||||
{
|
||||
var result = SharedResourcesWrapper.SendString(":GZ#");
|
||||
var result = SharedResourcesWrapper.SendString("GZ");
|
||||
LogMessage("SetLongFormat", $"Get - Azimuth {result}");
|
||||
//:GZ# Get telescope azimuth
|
||||
//Returns: DDD*MM.T or DDD*MM’SS#
|
||||
@@ -686,12 +705,12 @@ namespace ASCOM.Meade.net
|
||||
if (IsLongFormat != setLongFormat)
|
||||
{
|
||||
_utilities.WaitForMilliseconds(500);
|
||||
SharedResourcesWrapper.SendBlind(":U#");
|
||||
SharedResourcesWrapper.SendBlind("U");
|
||||
//:U# Toggle between low/hi precision positions
|
||||
//Low - RA displays and messages HH:MM.T sDD*MM
|
||||
//High - Dec / Az / El displays and messages HH:MM: SS sDD*MM:SS
|
||||
// Returns Nothing
|
||||
result = SharedResourcesWrapper.SendString(":GZ#");
|
||||
result = SharedResourcesWrapper.SendString("GZ");
|
||||
IsLongFormat = result.Length > 6;
|
||||
LogMessage("SetLongFormat", $"Get - Azimuth {result}");
|
||||
if (IsLongFormat == setLongFormat)
|
||||
@@ -709,7 +728,7 @@ namespace ASCOM.Meade.net
|
||||
private bool TogglePrecision()
|
||||
{
|
||||
LogMessage("TogglePrecision", "Toggling slewing precision");
|
||||
var result = SharedResourcesWrapper.SendChar(":P#");
|
||||
var result = SharedResourcesWrapper.SendChar("P");
|
||||
//:P# Toggles High Precsion Pointing. When High precision pointing is enabled scope will first allow the operator to center a nearby bright star before moving to the actual target.
|
||||
//Returns: <string>
|
||||
//“HIGH PRECISION” Current setting after this command.
|
||||
@@ -729,9 +748,6 @@ namespace ASCOM.Meade.net
|
||||
|
||||
SharedResourcesWrapper.ReadCharacters(throwAwayCharacters);
|
||||
|
||||
//Make sure that the buffers are cleared out.
|
||||
SharedResourcesWrapper.SendBlind("#");
|
||||
|
||||
return highPrecision;
|
||||
}
|
||||
|
||||
@@ -749,7 +765,7 @@ namespace ASCOM.Meade.net
|
||||
{
|
||||
CheckConnectedAndValidateSite(site, "SelectSite");
|
||||
|
||||
SharedResourcesWrapper.SendBlind($":W{site}#");
|
||||
SharedResourcesWrapper.SendBlind($"W{site}");
|
||||
//:W<n>#
|
||||
//Set current site to<n>, an ASCII digit in the range 1..4
|
||||
//Returns: Nothing
|
||||
@@ -775,7 +791,7 @@ namespace ASCOM.Meade.net
|
||||
switch (site)
|
||||
{
|
||||
case 1:
|
||||
command = $":SM{sitename}#";
|
||||
command = $"SM{sitename}";
|
||||
//:SM<string>#
|
||||
//Set site 1’s name to be<string>.LX200s only accept 3 character strings. Other scopes accept up to 15 characters.
|
||||
// Returns:
|
||||
@@ -783,7 +799,7 @@ namespace ASCOM.Meade.net
|
||||
//1 - Valid
|
||||
break;
|
||||
case 2:
|
||||
command = $":SN{sitename}#";
|
||||
command = $"SN{sitename}";
|
||||
//:SN<string>#
|
||||
//Set site 2’s name to be<string>.LX200s only accept 3 character strings. Other scopes accept up to 15 characters.
|
||||
// Returns:
|
||||
@@ -791,7 +807,7 @@ namespace ASCOM.Meade.net
|
||||
//1 - Valid
|
||||
break;
|
||||
case 3:
|
||||
command = $":SO{sitename}#";
|
||||
command = $"SO{sitename}";
|
||||
//:SO<string>#
|
||||
//Set site 3’s name to be<string>.LX200s only accept 3 character strings. Other scopes accept up to 15 characters.
|
||||
// Returns:
|
||||
@@ -799,7 +815,7 @@ namespace ASCOM.Meade.net
|
||||
//1 - Valid
|
||||
break;
|
||||
case 4:
|
||||
command = $":SP{sitename}#";
|
||||
command = $"SP{sitename}";
|
||||
//:SP<string>#
|
||||
//Set site 4’s name to be<string>.LX200s only accept 3 character strings. Other scopes accept up to 15 characters.
|
||||
// Returns:
|
||||
@@ -807,7 +823,8 @@ namespace ASCOM.Meade.net
|
||||
//1 - Valid
|
||||
break;
|
||||
default:
|
||||
throw new ArgumentOutOfRangeException(nameof(site), site, Resources.Telescope_GetSiteName_Site_out_of_range);
|
||||
throw new ArgumentOutOfRangeException(nameof(site), site,
|
||||
Resources.Telescope_GetSiteName_Site_out_of_range);
|
||||
}
|
||||
|
||||
var result = SharedResourcesWrapper.SendChar(command);
|
||||
@@ -824,27 +841,28 @@ namespace ASCOM.Meade.net
|
||||
switch (site)
|
||||
{
|
||||
case 1:
|
||||
return SharedResourcesWrapper.SendString(":GM#");
|
||||
return SharedResourcesWrapper.SendString("GM");
|
||||
//:GM# Get Site 1 Name
|
||||
//Returns: <string>#
|
||||
//A ‘#’ terminated string with the name of the requested site.
|
||||
case 2:
|
||||
return SharedResourcesWrapper.SendString(":GN#");
|
||||
return SharedResourcesWrapper.SendString("GN");
|
||||
//:GN# Get Site 2 Name
|
||||
//Returns: <string>#
|
||||
//A ‘#’ terminated string with the name of the requested site.
|
||||
case 3:
|
||||
return SharedResourcesWrapper.SendString(":GO#");
|
||||
return SharedResourcesWrapper.SendString("GO");
|
||||
//:GO# Get Site 3 Name
|
||||
//Returns: <string>#
|
||||
//A ‘#’ terminated string with the name of the requested site.
|
||||
case 4:
|
||||
return SharedResourcesWrapper.SendString(":GP#");
|
||||
return SharedResourcesWrapper.SendString("GP");
|
||||
//:GP# Get Site 4 Name
|
||||
//Returns: <string>#
|
||||
//A ‘#’ terminated string with the name of the requested site.
|
||||
default:
|
||||
throw new ArgumentOutOfRangeException(nameof(site), site, Resources.Telescope_GetSiteName_Site_out_of_range);
|
||||
throw new ArgumentOutOfRangeException(nameof(site), site,
|
||||
Resources.Telescope_GetSiteName_Site_out_of_range);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -864,11 +882,11 @@ namespace ASCOM.Meade.net
|
||||
{
|
||||
//string name = "Short driver name - please customise";
|
||||
|
||||
//var telescopeProduceName = _sharedResourcesWrapper.SendString(":GVP#");
|
||||
//var telescopeProduceName = _sharedResourcesWrapper.SendString("GVP");
|
||||
////:GVP# Get Telescope Product Name
|
||||
////Returns: <string>#
|
||||
|
||||
//var firmwareVersion = _sharedResourcesWrapper.SendString(":GVN#");
|
||||
//var firmwareVersion = _sharedResourcesWrapper.SendString("GVN");
|
||||
////:GVN# Get Telescope Firmware Number
|
||||
////Returns: dd.d#
|
||||
|
||||
@@ -889,7 +907,7 @@ namespace ASCOM.Meade.net
|
||||
CheckParked();
|
||||
|
||||
LogMessage("AbortSlew", "Aborting slew");
|
||||
SharedResourcesWrapper.SendBlind(":Q#");
|
||||
SharedResourcesWrapper.SendBlind("Q");
|
||||
//:Q# Halt all current slewing
|
||||
//Returns:Nothing
|
||||
|
||||
@@ -914,7 +932,7 @@ namespace ASCOM.Meade.net
|
||||
|
||||
const char ack = (char) 6;
|
||||
|
||||
var alignmentString = SharedResourcesWrapper.SendChar(ack.ToString());
|
||||
var alignmentString = SharedResourcesWrapper.SendChar(ack.ToString(), true);
|
||||
//ACK <0x06> Query of alignment mounting mode.
|
||||
//Returns:
|
||||
//A If scope in AltAz Mode
|
||||
@@ -965,13 +983,13 @@ namespace ASCOM.Meade.net
|
||||
switch (value)
|
||||
{
|
||||
case AlignmentModes.algAltAz:
|
||||
SharedResourcesWrapper.SendBlind(":AA#");
|
||||
SharedResourcesWrapper.SendBlind("AA");
|
||||
//:AA# Sets telescope the AltAz alignment mode
|
||||
//Returns: nothing
|
||||
break;
|
||||
case AlignmentModes.algPolar:
|
||||
case AlignmentModes.algGermanPolar:
|
||||
SharedResourcesWrapper.SendBlind(":AP#");
|
||||
SharedResourcesWrapper.SendBlind("AP");
|
||||
//:AP# Sets telescope to Polar alignment mode
|
||||
//Returns: nothing
|
||||
break;
|
||||
@@ -990,22 +1008,35 @@ namespace ASCOM.Meade.net
|
||||
{
|
||||
CheckConnected("Altitude Get");
|
||||
|
||||
if (SharedResourcesWrapper.ProductName == TelescopeList.LX200GPS)
|
||||
{
|
||||
try
|
||||
{
|
||||
CheckParked();
|
||||
|
||||
//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)
|
||||
{
|
||||
var parkedPosition = SharedResourcesWrapper.ParkedPosition;
|
||||
if (parkedPosition != null)
|
||||
return parkedPosition.Altitude;
|
||||
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1019,9 +1050,11 @@ namespace ASCOM.Meade.net
|
||||
EquatorialCoordinates = GetTelescopeRaAndDec()
|
||||
});
|
||||
|
||||
double hourAngle = _astroMaths.RightAscensionToHourAngle(altitudeData.UtcDateTime, altitudeData.SiteLongitude,
|
||||
double hourAngle = _astroMaths.RightAscensionToHourAngle(altitudeData.UtcDateTime,
|
||||
altitudeData.SiteLongitude,
|
||||
altitudeData.EquatorialCoordinates.RightAscension);
|
||||
var altAz = _astroMaths.ConvertEqToHoz(hourAngle, altitudeData.SiteLatitude, altitudeData.EquatorialCoordinates);
|
||||
var altAz = _astroMaths.ConvertEqToHoz(hourAngle, altitudeData.SiteLatitude,
|
||||
altitudeData.EquatorialCoordinates);
|
||||
return altAz;
|
||||
}
|
||||
|
||||
@@ -1061,16 +1094,14 @@ namespace ASCOM.Meade.net
|
||||
}
|
||||
}
|
||||
|
||||
private bool _atPark;
|
||||
|
||||
public bool AtPark
|
||||
{
|
||||
get
|
||||
{
|
||||
LogMessage("AtPark", "Get - " + _atPark);
|
||||
return _atPark;
|
||||
var atPark = SharedResourcesWrapper.IsParked;
|
||||
LogMessage("AtPark", "Get - " + atPark);
|
||||
return atPark;
|
||||
}
|
||||
private set => _atPark = value;
|
||||
}
|
||||
|
||||
public IAxisRates AxisRates(TelescopeAxes axis)
|
||||
@@ -1085,15 +1116,31 @@ namespace ASCOM.Meade.net
|
||||
{
|
||||
CheckConnected("Azimuth Get");
|
||||
|
||||
//var result = _sharedResourcesWrapper.SendString(":GZ#");
|
||||
if (SharedResourcesWrapper.ProductName == TelescopeList.LX200GPS)
|
||||
{
|
||||
try
|
||||
{
|
||||
CheckParked();
|
||||
|
||||
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)
|
||||
{
|
||||
var parkedPosition = SharedResourcesWrapper.ParkedPosition;
|
||||
if (parkedPosition != null)
|
||||
return parkedPosition.Azimuth;
|
||||
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
var altAz = CalcAltAzFromTelescopeEqData();
|
||||
LogMessage("Azimuth Get", $"{altAz.Azimuth}");
|
||||
@@ -1275,7 +1322,7 @@ namespace ASCOM.Meade.net
|
||||
{
|
||||
CheckParked();
|
||||
|
||||
var result = SharedResourcesWrapper.SendString(":GD#");
|
||||
var result = SharedResourcesWrapper.SendString("GD");
|
||||
//:GD# Get Telescope Declination.
|
||||
//Returns: sDD*MM# or sDD*MM’SS#
|
||||
//Depending upon the current precision setting for the telescope.
|
||||
@@ -1288,19 +1335,14 @@ namespace ASCOM.Meade.net
|
||||
}
|
||||
catch (ParkedException)
|
||||
{
|
||||
switch (ParkedBehaviour)
|
||||
{
|
||||
case ParkedBehaviour.LastGoodPosition:
|
||||
return _lastGoodDeclination;
|
||||
case ParkedBehaviour.ReportCoordinates:
|
||||
var raDec = _astroMaths.ConvertHozToEq(UTCDate, SiteLatitude, SiteLongitude, ParkedAltAz);
|
||||
return raDec.Declination;
|
||||
default:
|
||||
var parkedPosition = SharedResourcesWrapper.ParkedPosition;
|
||||
if (parkedPosition != null)
|
||||
return parkedPosition.Declination;
|
||||
|
||||
throw;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public double DeclinationRate
|
||||
{
|
||||
@@ -1378,7 +1420,7 @@ namespace ASCOM.Meade.net
|
||||
}
|
||||
|
||||
LogMessage($"{propertyName} Set", $"Setting new guiderate {value.ToString(CultureInfo.CurrentCulture)} arc seconds/second ({value.ToString(CultureInfo.CurrentCulture)} degrees/second)");
|
||||
SharedResourcesWrapper.SendBlind($":Rg{value:00.0}#");
|
||||
SharedResourcesWrapper.SendBlind($"Rg{value:00.0}");
|
||||
//:RgSS.S#
|
||||
//Set guide rate to +/ -SS.S to arc seconds per second.This rate is added to or subtracted from the current tracking
|
||||
//Rates when the CCD guider or handbox guider buttons are pressed when the guide rate is selected.Rate shall not exceed
|
||||
@@ -1460,22 +1502,22 @@ namespace ASCOM.Meade.net
|
||||
//do nothing, it's ok this time as we're halting the slew.
|
||||
break;
|
||||
case 1:
|
||||
SharedResourcesWrapper.SendBlind(":RG#");
|
||||
SharedResourcesWrapper.SendBlind("RG");
|
||||
//:RG# Set Slew rate to Guiding Rate (slowest)
|
||||
//Returns: Nothing
|
||||
break;
|
||||
case 2:
|
||||
SharedResourcesWrapper.SendBlind(":RC#");
|
||||
SharedResourcesWrapper.SendBlind("RC");
|
||||
//:RC# Set Slew rate to Centering rate (2nd slowest)
|
||||
//Returns: Nothing
|
||||
break;
|
||||
case 3:
|
||||
SharedResourcesWrapper.SendBlind(":RM#");
|
||||
SharedResourcesWrapper.SendBlind("RM");
|
||||
//:RM# Set Slew rate to Find Rate (2nd Fastest)
|
||||
//Returns: Nothing
|
||||
break;
|
||||
case 4:
|
||||
SharedResourcesWrapper.SendBlind(":RS#");
|
||||
SharedResourcesWrapper.SendBlind("RS");
|
||||
//:RS# Set Slew rate to max (fastest)
|
||||
//Returns: Nothing
|
||||
break;
|
||||
@@ -1495,21 +1537,21 @@ namespace ASCOM.Meade.net
|
||||
}
|
||||
|
||||
_movingPrimary = false;
|
||||
SharedResourcesWrapper.SendBlind(":Qe#");
|
||||
SharedResourcesWrapper.SendBlind("Qe");
|
||||
//:Qe# Halt eastward Slews
|
||||
//Returns: Nothing
|
||||
SharedResourcesWrapper.SendBlind(":Qw#");
|
||||
SharedResourcesWrapper.SendBlind("Qw");
|
||||
//:Qw# Halt westward Slews
|
||||
//Returns: Nothing
|
||||
break;
|
||||
case ComparisonResult.Greater:
|
||||
SharedResourcesWrapper.SendBlind(":Me#");
|
||||
SharedResourcesWrapper.SendBlind("Me");
|
||||
//:Me# Move Telescope East at current slew rate
|
||||
//Returns: Nothing
|
||||
_movingPrimary = true;
|
||||
break;
|
||||
case ComparisonResult.Lower:
|
||||
SharedResourcesWrapper.SendBlind(":Mw#");
|
||||
SharedResourcesWrapper.SendBlind("Mw");
|
||||
//:Mw# Move Telescope West at current slew rate
|
||||
//Returns: Nothing
|
||||
_movingPrimary = true;
|
||||
@@ -1525,21 +1567,21 @@ namespace ASCOM.Meade.net
|
||||
SetSlewingMinEndTime();
|
||||
}
|
||||
_movingSecondary = false;
|
||||
SharedResourcesWrapper.SendBlind(":Qn#");
|
||||
SharedResourcesWrapper.SendBlind("Qn");
|
||||
//:Qn# Halt northward Slews
|
||||
//Returns: Nothing
|
||||
SharedResourcesWrapper.SendBlind(":Qs#");
|
||||
SharedResourcesWrapper.SendBlind("Qs");
|
||||
//:Qs# Halt southward Slews
|
||||
//Returns: Nothing
|
||||
break;
|
||||
case ComparisonResult.Greater:
|
||||
SharedResourcesWrapper.SendBlind(":Mn#");
|
||||
SharedResourcesWrapper.SendBlind("Mn");
|
||||
//:Mn# Move Telescope North at current slew rate
|
||||
//Returns: Nothing
|
||||
_movingSecondary = true;
|
||||
break;
|
||||
case ComparisonResult.Lower:
|
||||
SharedResourcesWrapper.SendBlind(":Ms#");
|
||||
SharedResourcesWrapper.SendBlind("Ms");
|
||||
//:Ms# Move Telescope South at current slew rate
|
||||
//Returns: Nothing
|
||||
_movingSecondary = true;
|
||||
@@ -1559,9 +1601,40 @@ namespace ASCOM.Meade.net
|
||||
if (AtPark)
|
||||
return;
|
||||
|
||||
ParkedPosition parkedPosition;
|
||||
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;
|
||||
default:
|
||||
parkedPosition = null;
|
||||
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#");
|
||||
SharedResourcesWrapper.SetParked(true, parkedPosition);
|
||||
SharedResourcesWrapper.SendBlind("hP");
|
||||
//:hP# Autostar, Autostar II and LX 16”Slew to Park Position
|
||||
//Returns: Nothing
|
||||
}
|
||||
@@ -1611,7 +1684,7 @@ namespace ASCOM.Meade.net
|
||||
}
|
||||
|
||||
LogMessage("PulseGuide", "Using new pulse guiding technique");
|
||||
SharedResourcesWrapper.SendBlind($":Mg{d}{duration:0000}#");
|
||||
SharedResourcesWrapper.SendBlind($"Mg{d}{duration:0000}");
|
||||
//:MgnDDDD#
|
||||
//:MgsDDDD#
|
||||
//:MgeDDDD#
|
||||
@@ -1696,7 +1769,7 @@ namespace ASCOM.Meade.net
|
||||
{
|
||||
CheckParked();
|
||||
|
||||
var result = SharedResourcesWrapper.SendString(":GR#");
|
||||
var result = SharedResourcesWrapper.SendString("GR");
|
||||
//:GR# Get Telescope RA
|
||||
//Returns: HH:MM.T# or HH:MM:SS#
|
||||
//Depending which precision is set for the telescope
|
||||
@@ -1709,17 +1782,12 @@ namespace ASCOM.Meade.net
|
||||
}
|
||||
catch (ParkedException)
|
||||
{
|
||||
switch (ParkedBehaviour)
|
||||
{
|
||||
case ParkedBehaviour.LastGoodPosition:
|
||||
return _lastGoodRightAsension;
|
||||
case ParkedBehaviour.ReportCoordinates:
|
||||
var raDec = _astroMaths.ConvertHozToEq(UTCDate, SiteLatitude, SiteLongitude, ParkedAltAz);
|
||||
return raDec.RightAscension;
|
||||
default:
|
||||
var parkedPosition = SharedResourcesWrapper.ParkedPosition;
|
||||
if (parkedPosition != null)
|
||||
return parkedPosition.RightAscension;
|
||||
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1824,7 +1892,7 @@ namespace ASCOM.Meade.net
|
||||
{
|
||||
CheckParked();
|
||||
|
||||
var latitude = SharedResourcesWrapper.SendString(":Gt#");
|
||||
var latitude = SharedResourcesWrapper.SendString("Gt");
|
||||
//:Gt# Get Current Site Latitude
|
||||
//Returns: sDD* MM#
|
||||
//The latitude of the current site. Positive inplies North latitude.
|
||||
@@ -1865,7 +1933,7 @@ namespace ASCOM.Meade.net
|
||||
var absValue = Math.Abs(value);
|
||||
int d = Convert.ToInt32(Math.Floor(absValue));
|
||||
int m = Convert.ToInt32(60 * (absValue - d));
|
||||
var commandString = $":St{sign}{d:00}*{m:00}#";
|
||||
var commandString = $"St{sign}{d:00}*{m:00}";
|
||||
|
||||
var result = SharedResourcesWrapper.SendChar(commandString);
|
||||
//:StsDD*MM#
|
||||
@@ -1891,7 +1959,7 @@ namespace ASCOM.Meade.net
|
||||
{
|
||||
CheckParked();
|
||||
|
||||
var longitude = SharedResourcesWrapper.SendString(":Gg#");
|
||||
var longitude = SharedResourcesWrapper.SendString("Gg");
|
||||
//:Gg# Get Current Site Longitude
|
||||
//Returns: sDDD*MM#
|
||||
//The current site Longitude. East Longitudes are expressed as negative
|
||||
@@ -1934,7 +2002,7 @@ namespace ASCOM.Meade.net
|
||||
int d = Convert.ToInt32(Math.Floor(newLongitude));
|
||||
int m = Convert.ToInt32(60 * (newLongitude - d));
|
||||
|
||||
var commandstring = $":Sg{d:000}*{m:00}#";
|
||||
var commandstring = $"Sg{d:000}*{m:00}";
|
||||
|
||||
var result = SharedResourcesWrapper.SendChar(commandstring);
|
||||
//:SgDDD*MM#
|
||||
@@ -2030,7 +2098,7 @@ namespace ASCOM.Meade.net
|
||||
switch (polar)
|
||||
{
|
||||
case true:
|
||||
var response = SharedResourcesWrapper.SendChar(":MS#");
|
||||
var response = SharedResourcesWrapper.SendChar("MS");
|
||||
//:MS# Slew to Target Object
|
||||
//Returns:
|
||||
//0 Slew is Possible
|
||||
@@ -2067,7 +2135,7 @@ namespace ASCOM.Meade.net
|
||||
|
||||
break;
|
||||
case false:
|
||||
var maResponse = SharedResourcesWrapper.SendChar(":MA#");
|
||||
var maResponse = SharedResourcesWrapper.SendChar("MA");
|
||||
//:MA# Autostar, LX 16”, Autostar II – Slew to target Alt and Az
|
||||
//Returns:
|
||||
//0 - No fault
|
||||
@@ -2204,7 +2272,7 @@ namespace ASCOM.Meade.net
|
||||
string result;
|
||||
try
|
||||
{
|
||||
result = SharedResourcesWrapper.SendString(":D#");
|
||||
result = SharedResourcesWrapper.SendString("D");
|
||||
}
|
||||
catch (TimeoutException)
|
||||
{
|
||||
@@ -2289,7 +2357,7 @@ namespace ASCOM.Meade.net
|
||||
CheckConnected("SyncToTarget");
|
||||
CheckParked();
|
||||
|
||||
var result = SharedResourcesWrapper.SendString(":CM#");
|
||||
var result = SharedResourcesWrapper.SendString("CM");
|
||||
//:CM# Synchronizes the telescope's position with the currently selected database object's coordinates.
|
||||
//Returns:
|
||||
//LX200's - a "#" terminated string with the name of the object that was synced.
|
||||
@@ -2355,7 +2423,7 @@ namespace ASCOM.Meade.net
|
||||
|
||||
var s = value < 0 ? string.Empty : "+";
|
||||
|
||||
var command = $":Sd{s}{dms}#";
|
||||
var command = $"Sd{s}{dms}";
|
||||
|
||||
LogMessage("TargetDeclination Set", $"{command}");
|
||||
var result = SharedResourcesWrapper.SendChar(command);
|
||||
@@ -2409,7 +2477,7 @@ namespace ASCOM.Meade.net
|
||||
_utilities.HoursToHMS(value, ":", ":", ":", _digitsRa) :
|
||||
_utilities.HoursToHM(value, ":", "", _digitsRa).Replace(',','.');
|
||||
|
||||
var command = $":Sr{hms}#";
|
||||
var command = $"Sr{hms}";
|
||||
LogMessage("TargetRightAscension Set", $"{command}");
|
||||
var response = SharedResourcesWrapper.SendChar(command);
|
||||
//:SrHH:MM.T#
|
||||
@@ -2471,12 +2539,12 @@ namespace ASCOM.Meade.net
|
||||
switch (value)
|
||||
{
|
||||
case DriveRates.driveSidereal:
|
||||
SharedResourcesWrapper.SendBlind(":TQ#");
|
||||
SharedResourcesWrapper.SendBlind("TQ");
|
||||
//:TQ# Selects sidereal tracking rate
|
||||
//Returns: Nothing
|
||||
break;
|
||||
case DriveRates.driveLunar:
|
||||
SharedResourcesWrapper.SendBlind(":TL#");
|
||||
SharedResourcesWrapper.SendBlind("TL");
|
||||
//:TL# Set Lunar Tracking Rage
|
||||
//Returns: Nothing
|
||||
break;
|
||||
@@ -2513,7 +2581,7 @@ namespace ASCOM.Meade.net
|
||||
|
||||
private TimeSpan GetUtcCorrection()
|
||||
{
|
||||
string utcOffSet = SharedResourcesWrapper.SendString(":GG#");
|
||||
string utcOffSet = SharedResourcesWrapper.SendString("GG");
|
||||
//:GG# Get UTC offset time
|
||||
//Returns: sHH# or sHH.H#
|
||||
//The number of decimal hours to add to local time to convert it to UTC. If the number is a whole number the
|
||||
@@ -2544,11 +2612,11 @@ namespace ASCOM.Meade.net
|
||||
{
|
||||
var tdd = new TelescopeDateDetails
|
||||
{
|
||||
TelescopeDate = SharedResourcesWrapper.SendString(":GC#"),
|
||||
TelescopeDate = SharedResourcesWrapper.SendString("GC"),
|
||||
//:GC# Get current date.
|
||||
//Returns: MM/DD/YY#
|
||||
//The current local calendar date for the telescope.
|
||||
TelescopeTime = SharedResourcesWrapper.SendString(":GL#"),
|
||||
TelescopeTime = SharedResourcesWrapper.SendString("GL"),
|
||||
//:GL# Get Local Time in 24 hour format
|
||||
//Returns: HH:MM:SS#
|
||||
//The Local Time in 24 - hour Format
|
||||
@@ -2597,7 +2665,7 @@ namespace ASCOM.Meade.net
|
||||
var utcCorrection = GetUtcCorrection();
|
||||
var localDateTime = value - utcCorrection;
|
||||
|
||||
string localStingCommand = $":SL{localDateTime:HH:mm:ss}#";
|
||||
string localStingCommand = $"SL{localDateTime:HH:mm:ss}";
|
||||
var timeResult = SharedResourcesWrapper.SendChar(localStingCommand);
|
||||
//:SLHH:MM:SS#
|
||||
//Set the local Time
|
||||
@@ -2609,7 +2677,7 @@ namespace ASCOM.Meade.net
|
||||
throw new InvalidOperationException("Failed to set local time");
|
||||
}
|
||||
|
||||
string localDateCommand = $":SC{localDateTime:MM/dd/yy}#";
|
||||
string localDateCommand = $"SC{localDateTime:MM/dd/yy}";
|
||||
var dateResult = SharedResourcesWrapper.SendChar(localDateCommand);
|
||||
//:SCMM/DD/YY#
|
||||
//Change Handbox Date to MM/DD/YY
|
||||
@@ -2640,13 +2708,13 @@ namespace ASCOM.Meade.net
|
||||
if (!AtPark)
|
||||
return;
|
||||
|
||||
SharedResourcesWrapper.SendChar(":I#");
|
||||
SharedResourcesWrapper.SendChar("I");
|
||||
//:I# LX200 GPS Only - Causes the telescope to cease current operations and restart at its power on initialization.
|
||||
//Returns: X once the handset restart has completed
|
||||
|
||||
BypassHandboxEntryForAutostarII();
|
||||
|
||||
AtPark = false;
|
||||
SharedResourcesWrapper.SetParked(false, null);
|
||||
}
|
||||
|
||||
private bool BypassHandboxEntryForAutostarII()
|
||||
@@ -2655,7 +2723,7 @@ namespace ASCOM.Meade.net
|
||||
var localDateTime = _clock.UtcNow - utcCorrection;
|
||||
|
||||
//localDateTime: HH: mm: ss
|
||||
var result = SharedResourcesWrapper.SendChar($":hI{localDateTime:yyMMddHHmmss}#");
|
||||
var result = SharedResourcesWrapper.SendChar($"hI{localDateTime:yyMMddHHmmss}");
|
||||
//:hIYYMMDDHHMMSS#
|
||||
//Bypass handbox entry of daylight savings, date and time.Use the values supplied in this command.This feature is
|
||||
//intended to allow use of the Autostar II from permanent installations where GPS reception is not possible, such as within
|
||||
|
||||
@@ -32,35 +32,36 @@ namespace Meade.net.UnitTests
|
||||
Assert.That(SharedResources.SharedSerial,Is.EqualTo(_serialMock.Object));
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void SendBlind_WhenCalled_Then_ClearsBuffersAndSendsMessage()
|
||||
[TestCase(true, "Test")]
|
||||
[TestCase(false, "#:Test#")]
|
||||
public void SendBlind_WhenCalled_Then_ClearsBuffersAndSendsMessage(bool raw, string expectedMessage)
|
||||
{
|
||||
var expectedMessage = "Test";
|
||||
|
||||
SharedResources.SendBlind(expectedMessage);
|
||||
var sendMessage = "Test";
|
||||
SharedResources.SendBlind(sendMessage, raw);
|
||||
|
||||
_serialMock.Verify(x=> x.ClearBuffers(), Times.Once);
|
||||
_serialMock.Verify(x=>x.Transmit(expectedMessage), Times.Once);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void SendChar_WhenCalled_ThenSendsMessageAndReadsExpectedNumberOfCharacters()
|
||||
[TestCase(false, "#:Test#")]
|
||||
[TestCase(true, "Test")]
|
||||
public void SendChar_WhenCalled_ThenSendsMessageAndReadsExpectedNumberOfCharacters(bool raw, string expectedCommand)
|
||||
{
|
||||
var expectedMessage = "Test";
|
||||
var command = "Test";
|
||||
var expectedResult = "A";
|
||||
|
||||
_serialMock.Setup(x => x.ReceiveCounted(1)).Returns(expectedResult);
|
||||
|
||||
var result = SharedResources.SendChar(expectedMessage);
|
||||
var result = SharedResources.SendChar(command, raw);
|
||||
|
||||
_serialMock.Verify(x => x.ClearBuffers(), Times.Once);
|
||||
_serialMock.Verify(x => x.Transmit(expectedMessage), Times.Once);
|
||||
_serialMock.Verify(x => x.Transmit(expectedCommand), Times.Once);
|
||||
_serialMock.Verify(x => x.ReceiveCounted(1), Times.Once);
|
||||
Assert.That(result, Is.EqualTo(expectedResult));
|
||||
}
|
||||
|
||||
[TestCase(false, "Test")]
|
||||
[TestCase(true, "#Test")]
|
||||
[TestCase(true, "Test")]
|
||||
[TestCase(false, "#:Test#")]
|
||||
public void SendString_WhenCalled_ThenSendsMessageAndReadsResultUntilTerminatorFound(bool includePrefix, string expectedMessage)
|
||||
{
|
||||
var transmitMessage = "Test";
|
||||
|
||||
@@ -104,7 +104,7 @@ namespace ASCOM.Meade.net
|
||||
CheckConnected("CommandBlind");
|
||||
// Call CommandString and return as soon as it finishes
|
||||
//this.CommandString(command, raw);
|
||||
SharedResourcesWrapper.SendBlind(command);
|
||||
SharedResourcesWrapper.SendBlind(command, raw);
|
||||
// or
|
||||
//throw new ASCOM.MethodNotImplementedException("CommandBlind");
|
||||
// DO NOT have both these sections! One or the other
|
||||
@@ -114,9 +114,10 @@ namespace ASCOM.Meade.net
|
||||
{
|
||||
CheckConnected("CommandBool");
|
||||
//string ret = CommandString(command, raw);
|
||||
return SharedResourcesWrapper.SendBool(command, raw);
|
||||
// decode the return string and return true or false
|
||||
// or
|
||||
throw new MethodNotImplementedException("CommandBool");
|
||||
//throw new MethodNotImplementedException("CommandBool");
|
||||
// DO NOT have both these sections! One or the other
|
||||
}
|
||||
|
||||
@@ -126,7 +127,7 @@ namespace ASCOM.Meade.net
|
||||
// it's a good idea to put all the low level communication with the device here,
|
||||
// then all communication calls this function
|
||||
// you need something to ensure that only one command is in progress at a time
|
||||
return SharedResourcesWrapper.SendString(command);
|
||||
return SharedResourcesWrapper.SendString(command, raw);
|
||||
//throw new ASCOM.MethodNotImplementedException("CommandString");
|
||||
}
|
||||
|
||||
@@ -225,7 +226,7 @@ namespace ASCOM.Meade.net
|
||||
|
||||
//todo fix this issue: A single halt command is sometimes missed by the #909 apm, so let's do it a few times to be safe.
|
||||
|
||||
SharedResourcesWrapper.SendBlind(":FQ#");
|
||||
SharedResourcesWrapper.SendBlind("FQ");
|
||||
//:FQ# Halt Focuser Motion
|
||||
//Returns: Nothing
|
||||
}
|
||||
@@ -329,7 +330,7 @@ namespace ASCOM.Meade.net
|
||||
|
||||
private void MoveFocuser(bool directionOut, int steps)
|
||||
{
|
||||
//_sharedResourcesWrapper.SendBlind(":FF#");
|
||||
//_sharedResourcesWrapper.SendBlind("FF");
|
||||
//:FF# Set Focus speed to fastest setting
|
||||
//Returns: Nothing
|
||||
|
||||
@@ -350,7 +351,7 @@ namespace ASCOM.Meade.net
|
||||
|
||||
private void PerformFocuserMove(bool directionOut)
|
||||
{
|
||||
SharedResourcesWrapper.SendBlind(directionOut ? ":F+#" : ":F-#");
|
||||
SharedResourcesWrapper.SendBlind(directionOut ? "F+" : "F-");
|
||||
//:F+# Start Focuser moving inward (toward objective)
|
||||
//Returns: None
|
||||
|
||||
|
||||
@@ -141,6 +141,7 @@
|
||||
<Compile Include="LocalServer.cs" />
|
||||
<Compile Include="MeadeTelescopeBase.cs" />
|
||||
<Compile Include="ParkedBehaviour.cs" />
|
||||
<Compile Include="ParkedPosition.cs" />
|
||||
<Compile Include="ProfileFactory.cs" />
|
||||
<Compile Include="ProfileProperties.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
|
||||
@@ -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; }
|
||||
}
|
||||
}
|
||||
@@ -18,6 +18,7 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Security.AccessControl;
|
||||
using System.Windows.Forms;
|
||||
using ASCOM.Meade.net.Wrapper;
|
||||
using ASCOM.Utilities;
|
||||
@@ -77,12 +78,13 @@ namespace ASCOM.Meade.net
|
||||
}
|
||||
|
||||
//todo add code to ensure that there is a minimum gap between commands. 5ms as default.
|
||||
public static void SendBlind(string message)
|
||||
public static void SendBlind(string message, bool raw = false)
|
||||
{
|
||||
lock (LockObject)
|
||||
{
|
||||
SharedSerial.ClearBuffers();
|
||||
SharedSerial.Transmit(message);
|
||||
var encodedMessage = raw ? message : $"#:{message}#";
|
||||
SharedSerial.Transmit(encodedMessage);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -93,14 +95,16 @@ namespace ASCOM.Meade.net
|
||||
/// and that the reply will always be terminated by a "#" character.
|
||||
/// </summary>
|
||||
/// <param name="message"></param>
|
||||
/// <param name="raw"></param>
|
||||
/// <returns></returns>
|
||||
public static string SendString(string message, bool includePrefix = true)
|
||||
public static string SendString(string message, bool raw = false)
|
||||
{
|
||||
lock (LockObject)
|
||||
{
|
||||
SharedSerial.ClearBuffers();
|
||||
|
||||
SharedSerial.Transmit(includePrefix ? $"#{message}" : message);
|
||||
var encodedMessage = raw ? message : $"#:{message}#";
|
||||
SharedSerial.Transmit(encodedMessage);
|
||||
|
||||
try
|
||||
{
|
||||
@@ -116,12 +120,22 @@ namespace ASCOM.Meade.net
|
||||
}
|
||||
}
|
||||
|
||||
public static string SendChar(string message)
|
||||
public static bool SendBool(string command, bool raw = false)
|
||||
{
|
||||
|
||||
var result = SendChar(command, raw);
|
||||
|
||||
return result == "1";
|
||||
}
|
||||
|
||||
public static string SendChar(string command, bool raw = false)
|
||||
{
|
||||
lock (LockObject)
|
||||
{
|
||||
SharedSerial.ClearBuffers();
|
||||
SharedSerial.Transmit(message);
|
||||
|
||||
var encodedMessage = raw ? command : $"#:{command}#";
|
||||
SharedSerial.Transmit(encodedMessage);
|
||||
|
||||
try
|
||||
{
|
||||
@@ -357,8 +371,8 @@ namespace ASCOM.Meade.net
|
||||
|
||||
try
|
||||
{
|
||||
ProductName = SendString(":GVP#");
|
||||
FirmwareVersion = SendString(":GVN#");
|
||||
ProductName = SendString("GVP");
|
||||
FirmwareVersion = SendString("GVN");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -378,7 +392,7 @@ namespace ASCOM.Meade.net
|
||||
|
||||
try
|
||||
{
|
||||
string utcOffSet = SendString(":GG#");
|
||||
string utcOffSet = SendString("GG");
|
||||
//:GG# Get UTC offset time
|
||||
//Returns: sHH# or sHH.H#
|
||||
//The number of decimal hours to add to local time to convert it to UTC. If the number is a whole number the
|
||||
@@ -479,5 +493,15 @@ namespace ASCOM.Meade.net
|
||||
Count = 0;
|
||||
}
|
||||
}
|
||||
|
||||
public static void SetParked(bool atPark, ParkedPosition parkedPosition)
|
||||
{
|
||||
IsParked = atPark;
|
||||
ParkedPosition = parkedPosition;
|
||||
}
|
||||
|
||||
public static bool IsParked { get; private set; }
|
||||
|
||||
public static ParkedPosition ParkedPosition { get; private set; }
|
||||
}
|
||||
}
|
||||
@@ -15,9 +15,10 @@ namespace ASCOM.Meade.net.Wrapper
|
||||
void Lock(Action action);
|
||||
T Lock<T>(Func<T> func);
|
||||
|
||||
string SendString(string message, bool includePrefix = true);
|
||||
void SendBlind(string message);
|
||||
string SendChar(string message);
|
||||
string SendString(string message, bool raw = false);
|
||||
void SendBlind(string message, bool raw = false);
|
||||
bool SendBool(string command, bool raw = false);
|
||||
string SendChar(string message, bool raw = false);
|
||||
|
||||
string ReadTerminated();
|
||||
|
||||
@@ -26,6 +27,10 @@ namespace ASCOM.Meade.net.Wrapper
|
||||
void SetupDialog();
|
||||
void WriteProfile(ProfileProperties profileProperties);
|
||||
void ReadCharacters(int throwAwayCharacters);
|
||||
|
||||
void SetParked(bool atPark, ParkedPosition parkedPosition);
|
||||
bool IsParked { get; }
|
||||
ParkedPosition ParkedPosition { get; }
|
||||
}
|
||||
|
||||
public class SharedResourcesWrapper : ISharedResourcesWrapper
|
||||
@@ -54,19 +59,24 @@ namespace ASCOM.Meade.net.Wrapper
|
||||
return SharedResources.Lock(func);
|
||||
}
|
||||
|
||||
public string SendString(string message, bool includePrefix = true)
|
||||
public string SendString(string message, bool raw = false)
|
||||
{
|
||||
return SharedResources.SendString(message, includePrefix);
|
||||
return SharedResources.SendString(message, raw);
|
||||
}
|
||||
|
||||
public void SendBlind(string message)
|
||||
public void SendBlind(string message, bool raw = false)
|
||||
{
|
||||
SharedResources.SendBlind(message);
|
||||
SharedResources.SendBlind(message, raw);
|
||||
}
|
||||
|
||||
public string SendChar(string message)
|
||||
public bool SendBool(string command, bool raw = false)
|
||||
{
|
||||
return SharedResources.SendChar(message);
|
||||
return SharedResources.SendBool(command, raw);
|
||||
}
|
||||
|
||||
public string SendChar(string message,bool raw = false)
|
||||
{
|
||||
return SharedResources.SendChar(message, raw);
|
||||
}
|
||||
|
||||
public string ReadTerminated()
|
||||
@@ -93,5 +103,14 @@ namespace ASCOM.Meade.net.Wrapper
|
||||
{
|
||||
SharedResources.WriteProfile(profileProperties);
|
||||
}
|
||||
|
||||
public void SetParked(bool atPark, ParkedPosition parkedPosition)
|
||||
{
|
||||
SharedResources.SetParked(atPark, parkedPosition);
|
||||
}
|
||||
|
||||
public bool IsParked => SharedResources.IsParked;
|
||||
|
||||
public ParkedPosition ParkedPosition => SharedResources.ParkedPosition;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user