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

Modified so that the driver supports either +60.1 or 60.1 for tracking rate

Browse Source
This commit is contained in:
Colin Dawson
2021-09-26 16:50:46 +01:00
parent 3b056ef7f8
commit ad9169a48d
2 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
+19 -11
View File
@@ -56,12 +56,14 @@ namespace Meade.net.Telescope.UnitTests
private bool _isParked; private bool _isParked;
private ParkedPosition _parkedPosition; private ParkedPosition _parkedPosition;
private string _siderealTrackingRate;
[SetUp] [SetUp]
public void Setup() public void Setup()
{ {
_isParked = false; _isParked = false;
_parkedPosition = null; _parkedPosition = null;
_siderealTrackingRate = "+60.1";
_testProperties = new TestProperties(); _testProperties = new TestProperties();
@@ -142,11 +144,10 @@ namespace Meade.net.Telescope.UnitTests
_sharedResourcesWrapperMock.Setup(x => x.SendString("GL", false)).Returns(() => _testProperties.telescopeTime); _sharedResourcesWrapperMock.Setup(x => x.SendString("GL", false)).Returns(() => _testProperties.telescopeTime);
_sharedResourcesWrapperMock.Setup(x => x.SendString("GG", false)).Returns(() => _testProperties.telescopeUtcCorrection); _sharedResourcesWrapperMock.Setup(x => x.SendString("GG", false)).Returns(() => _testProperties.telescopeUtcCorrection);
const string siderealTrackingRate = "+60.1"; _testProperties.TrackingRate = _siderealTrackingRate;
_testProperties.TrackingRate = siderealTrackingRate;
_sharedResourcesWrapperMock.Setup(x => x.SendString("GT", false)).Returns(() => _testProperties.TrackingRate); _sharedResourcesWrapperMock.Setup(x => x.SendString("GT", false)).Returns(() => _testProperties.TrackingRate);
_sharedResourcesWrapperMock.Setup(x => x.SendBlind("TL", false)).Callback(() => _testProperties.TrackingRate = "lunar"); _sharedResourcesWrapperMock.Setup(x => x.SendBlind("TL", false)).Callback(() => _testProperties.TrackingRate = "lunar");
_sharedResourcesWrapperMock.Setup(x => x.SendBlind("TQ", false)).Callback(() => _testProperties.TrackingRate = siderealTrackingRate); _sharedResourcesWrapperMock.Setup(x => x.SendBlind("TQ", false)).Callback(() => _testProperties.TrackingRate = _siderealTrackingRate);
_sharedResourcesWrapperMock.Setup(x => x.ProductName).Returns(() => productName); _sharedResourcesWrapperMock.Setup(x => x.ProductName).Returns(() => productName);
_sharedResourcesWrapperMock.Setup(x => x.FirmwareVersion).Returns(() => firmwareVersion); _sharedResourcesWrapperMock.Setup(x => x.FirmwareVersion).Returns(() => firmwareVersion);
@@ -2732,8 +2733,9 @@ namespace Meade.net.Telescope.UnitTests
Assert.That(exception.Message, Is.EqualTo("Exception of type 'System.ArgumentOutOfRangeException' was thrown.\r\nParameter name: value\r\nActual value was driveKing.")); Assert.That(exception.Message, Is.EqualTo("Exception of type 'System.ArgumentOutOfRangeException' was thrown.\r\nParameter name: value\r\nActual value was driveKing."));
} }
[Test] [TestCase("60.1")]
public void TrackingRage_Get_WhenReadongDefaultValue_ThenAssumesSidereal() [TestCase("+60.1")]
public void TrackingRage_Get_WhenReadingDefaultValue_ThenAssumesSidereal(string trackingRate)
{ {
ConnectTelescope(); ConnectTelescope();
@@ -2742,10 +2744,14 @@ namespace Meade.net.Telescope.UnitTests
Assert.That(result, Is.EqualTo(DriveRates.driveSidereal)); Assert.That(result, Is.EqualTo(DriveRates.driveSidereal));
} }
[TestCase(DriveRates.driveSidereal)] [TestCase(DriveRates.driveSidereal, "60.1")]
[TestCase(DriveRates.driveLunar)] [TestCase(DriveRates.driveLunar, "60.1")]
public void TrackingRate_Get_WhenConnected_ThenSendsCommandToTelescope(DriveRates rate) [TestCase(DriveRates.driveSidereal, "+60.1")]
[TestCase(DriveRates.driveLunar, "+60.1")]
public void TrackingRate_Get_WhenConnected_ThenSendsCommandToTelescope(DriveRates rate, string trackingRate)
{ {
_siderealTrackingRate = trackingRate;
string productName = TelescopeList.Autostar497; string productName = TelescopeList.Autostar497;
string firmwareVersion = TelescopeList.Autostar497_43Eg; string firmwareVersion = TelescopeList.Autostar497_43Eg;
@@ -2758,9 +2764,11 @@ namespace Meade.net.Telescope.UnitTests
Assert.That(result, Is.EqualTo(rate)); Assert.That(result, Is.EqualTo(rate));
} }
[TestCase(DriveRates.driveSidereal)] [TestCase(DriveRates.driveSidereal, "60.1")]
[TestCase(DriveRates.driveLunar)] [TestCase(DriveRates.driveLunar, "60.1")]
public void TrackingRate_Set_WhenConnectedToLX200_ThenThrowsException(DriveRates rate) [TestCase(DriveRates.driveSidereal, "+60.1")]
[TestCase(DriveRates.driveLunar, "+60.1")]
public void TrackingRate_Set_WhenConnectedToLX200_ThenThrowsException(DriveRates rate, string trackingRate)
{ {
string productName = TelescopeList.LX200CLASSIC; string productName = TelescopeList.LX200CLASSIC;
string firmwareVersion = string.Empty; string firmwareVersion = string.Empty;
Meade.net.Telescope/Telescope.cs
+4 -2
View File
@@ -2639,13 +2639,15 @@ namespace ASCOM.Meade.net
{ {
get get
{ {
var rate = CommandString("GT", false); var rate = CommandString("GT", false);
//:GT# Get tracking rate //:GT# Get tracking rate
//Returns: TT.T# //Returns: TT.T#
//Current Track Frequency expressed in hertz assuming a synchonous motor design where a 60.0 Hz motor clock //Current Track Frequency expressed in hertz assuming a synchonous motor design where a 60.0 Hz motor clock
// would produce 1 revolution of the telescope in 24 hours. // would produce 1 revolution of the telescope in 24 hours.
DriveRates result = rate == "+60.1" ? DriveRates.driveSidereal : DriveRates.driveLunar; rate = rate.Replace("+", string.Empty);
DriveRates result = rate == "60.1" ? DriveRates.driveSidereal : DriveRates.driveLunar;
LogMessage("TrackingRate Get", $"{rate} {result}"); LogMessage("TrackingRate Get", $"{rate} {result}");