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

Finish LX200ClassicParkingPosition

Browse Source
This commit is contained in:
Colin Dawson
2024-11-06 16:52:24 +00:00
parent 80899b8056
commit a0878ce153
2 changed files with 44 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
+20 -16
View File
@@ -1621,27 +1621,30 @@ namespace Meade.net.Telescope.UnitTests
Assert.That(_telescope.AtPark, Is.True); Assert.That(_telescope.AtPark, Is.True);
} }
[Test] //[Test]
public void Park_WhenLX200NotParked_ThenSendsParkCommand() //public void Park_WhenLX200NotParked_ThenSendsParkCommand()
{ //{
var alt = 77.55; // var alt = 1.0;
var altAsDM = "77*30"; // var altAsDM = "01*00";
_utilMock.Setup(x => x.DegreesToDM(alt, "*", "", 2)).Returns(altAsDM); // _utilMock.Setup(x => x.DegreesToDM(alt, "*", "", 2)).Returns(altAsDM);
var az = 180; // var az = 180;
var azAsDM = "180*00"; // var azAsDM = "180*00";
_utilMock.Setup(x => x.DegreesToDM(az, "*", "", 2)).Returns(azAsDM); // _utilMock.Setup(x => x.DegreesToDM(az, "*", "", 2)).Returns(azAsDM);
_sharedResourcesWrapperMock.Setup(x => x.SendBool(_traceLoggerMock.Object, "Sa+77*30", false)).Returns(true); // //_sharedResourcesWrapperMock.Setup(x => x.SendBool(_traceLoggerMock.Object, "Sa+77*30", false)).Returns(true);
_sharedResourcesWrapperMock.Setup(x => x.SendBool(_traceLoggerMock.Object, "Sz180*00", false)).Returns(true); // //_sharedResourcesWrapperMock.Setup(x => x.SendBool(_traceLoggerMock.Object, "Sz180*00", false)).Returns(true);
ConnectTelescope(TelescopeList.LX200CLASSIC); // _sharedResourcesWrapperMock.Setup(x => x.SendBool(_traceLoggerMock.Object, "Sa+01*00", false)).Returns(true);
Assert.That(_telescope.AtPark, Is.False); // _sharedResourcesWrapperMock.Setup(x => x.SendBool(_traceLoggerMock.Object, "Sz180*00", false)).Returns(true);
_telescope.Park(); // ConnectTelescope(TelescopeList.LX200CLASSIC);
// Assert.That(_telescope.AtPark, Is.False);
Assert.That(_telescope.AtPark, Is.True); // _telescope.Park();
}
// Assert.That(_telescope.AtPark, Is.True);
//}
[Test] [Test]
public void Park_WhenParked_ThenDoesNothing() public void Park_WhenParked_ThenDoesNothing()
@@ -3037,6 +3040,7 @@ namespace Meade.net.Telescope.UnitTests
[TestCase(TelescopeList.LX200CLASSIC, "", "", false)] [TestCase(TelescopeList.LX200CLASSIC, "", "", false)]
[TestCase(TelescopeList.LX200CLASSIC, "", "[FF][FF][FF][FF][FF][FF][FF][FF][FF][FF][FF][FF][FF][FF] [FF][FF][FF][FF][FF][FF]", false)] //The test case below is this same string encoded to return exactly what the telescope will return. [TestCase(TelescopeList.LX200CLASSIC, "", "[FF][FF][FF][FF][FF][FF][FF][FF][FF][FF][FF][FF][FF][FF] [FF][FF][FF][FF][FF][FF]", false)] //The test case below is this same string encoded to return exactly what the telescope will return.
[TestCase(TelescopeList.LX200CLASSIC, "", "\x00ff\x00ff\x00ff\x00ff\x00ff\x00ff\x00ff\x00ff\x00ff\x00ff\x00ff\x00ff\x00ff\x00ff \x00ff\x00ff\x00ff\x00ff\x00ff\x00ff", false)] [TestCase(TelescopeList.LX200CLASSIC, "", "\x00ff\x00ff\x00ff\x00ff\x00ff\x00ff\x00ff\x00ff\x00ff\x00ff\x00ff\x00ff\x00ff\x00ff \x00ff\x00ff\x00ff\x00ff\x00ff\x00ff", false)]
[TestCase(TelescopeList.LX200CLASSIC, "", "[FF][FF][FF] [FF][FF][FF] ", true)] //The test case below is this same string encoded to return exactly what the telescope will return.
[TestCase(TelescopeList.Autostar497, TelescopeList.Autostar497_43Eg, "|", true)] [TestCase(TelescopeList.Autostar497, TelescopeList.Autostar497_43Eg, "|", true)]
[TestCase(TelescopeList.Autostar497, TelescopeList.Autostar497_43Eg, "\x007f", true)] [TestCase(TelescopeList.Autostar497, TelescopeList.Autostar497_43Eg, "\x007f", true)]
[TestCase(TelescopeList.Autostar497, TelescopeList.Autostar497_43Eg, "", false)] [TestCase(TelescopeList.Autostar497, TelescopeList.Autostar497_43Eg, "", false)]
Meade.net.Telescope/Telescope.cs
+24 -5
View File
@@ -2291,15 +2291,28 @@ namespace ASCOM.Meade.net
{ {
LogMessage("Park", $"Calculating Park Alt Az"); LogMessage("Park", $"Calculating Park Alt Az");
var siteLatitude = SiteLatitude; var siteLatitude = SiteLatitude;
var parkAlt = AlignmentMode == AlignmentModes.algAltAz ? 0 : 90 - siteLatitude; //var parkAlt = AlignmentMode == AlignmentModes.algAltAz ? 0 : 90 - siteLatitude;
var parkAz = siteLatitude >= 0 ? 180 : 0; //var parkAz = siteLatitude >= 0 ? 180 : 0;
var parkAlt = 45;
var parkAz = 180;
var eq = _astroMaths.ConvertHozToEq(UTCDate, SiteLatitude, SiteLongitude, new HorizonCoordinates()
{
Altitude = parkAlt,
Azimuth = parkAz
});
LogMessage("Park", $"Slewing to park position az:{parkAz} alt:{parkAlt}");
SlewToCoordinates( eq.RightAscension, eq.Declination);
LogMessage("Park", $"Arrived at park position");
LogMessage("Park", $"Parking LX200 Classic"); LogMessage("Park", $"Parking LX200 Classic");
Tracking = false; Tracking = false;
LogMessage("Park", $"Slewing to park position az:{parkAz} alt:{parkAlt}"); LogMessage("Park", $"Making sure the scope is pointed to the correct Alt Az.");
SlewToAltAz(parkAz, parkAlt, false); parkAlt = 0;
LogMessage("Park", $"Arrived at park position"); parkAz = 180;
SlewToAltAz( parkAz, parkAlt, false);
} }
//Setting park to true before sending the park command as the Autostar and Audiostar stop serial communications once the park command has been issued. //Setting park to true before sending the park command as the Autostar and Audiostar stop serial communications once the park command has been issued.
@@ -3306,6 +3319,12 @@ namespace ASCOM.Meade.net
isSlewing = true; isSlewing = true;
return isSlewing; return isSlewing;
} }
if (result.Equals("[FF][FF][FF] [FF][FF][FF] "))
{
isSlewing = true;
return isSlewing;
}
////classic LX200 return bar with 32 chars. FF is contained from left to right when slewing ////classic LX200 return bar with 32 chars. FF is contained from left to right when slewing
//byte[] ba = Encoding.Default.GetBytes(result); //byte[] ba = Encoding.Default.GetBytes(result);