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

Let's see what this does

Browse Source
This commit is contained in:
Colin Dawson
2022-11-12 17:28:25 +00:00
parent da1d1baa30
commit cd304f5955
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
+20
View File
@@ -2389,6 +2389,8 @@ namespace Meade.net.Telescope.UnitTests
public void TargetDeclination_Set_WhenTelescopeReportsInvalidDec_ThenThrowsException() public void TargetDeclination_Set_WhenTelescopeReportsInvalidDec_ThenThrowsException()
{ {
_sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, It.IsAny<string>(), false)).Returns("0"); _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, It.IsAny<string>(), false)).Returns("0");
_utilMock.Setup(x => x.DegreesToDM(It.IsAny<double>(), "*", ":", 0)).Returns("00*00");
_utilMock.Setup(x => x.DegreesToDMS(It.IsAny<double>(), "*", ":", ":", It.IsAny<int>())).Returns("00*00");
ConnectTelescope(); ConnectTelescope();
@@ -3124,6 +3126,9 @@ namespace Meade.net.Telescope.UnitTests
[Test] [Test]
public void SlewToTargetAsync_WhenTargetRightAscensionNotSet_ThenThrowsException() public void SlewToTargetAsync_WhenTargetRightAscensionNotSet_ThenThrowsException()
{ {
_utilMock.Setup(x => x.DegreesToDM(It.IsAny<double>(), "*", ":", 0)).Returns("00*00");
_utilMock.Setup(x => x.DegreesToDMS(It.IsAny<double>(), "*", ":", ":", It.IsAny<int>())).Returns("00*00");
ConnectTelescope(); ConnectTelescope();
_telescope.TargetDeclination = 1; _telescope.TargetDeclination = 1;
@@ -3136,6 +3141,8 @@ namespace Meade.net.Telescope.UnitTests
public void SlewToTargetAsync_WhenTargetSet_ThenAttemptsSlew() public void SlewToTargetAsync_WhenTargetSet_ThenAttemptsSlew()
{ {
_utilMock.Setup(x => x.HoursToHMS(It.IsAny<double>(), ":", ":", ":", It.IsAny<int>())).Returns("00:00:00.00"); _utilMock.Setup(x => x.HoursToHMS(It.IsAny<double>(), ":", ":", ":", It.IsAny<int>())).Returns("00:00:00.00");
_utilMock.Setup(x => x.DegreesToDM(It.IsAny<double>(), "*", ":", 0)).Returns("00*00");
_utilMock.Setup(x => x.DegreesToDMS(It.IsAny<double>(), "*", ":", ":", It.IsAny<int>())).Returns("00*00");
ConnectTelescope(); ConnectTelescope();
@@ -3152,6 +3159,8 @@ namespace Meade.net.Telescope.UnitTests
_sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, "MS", false)).Returns("0"); _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, "MS", false)).Returns("0");
_utilMock.Setup(x => x.HoursToHMS(It.IsAny<double>(), ":", ":", ":", It.IsAny<int>())).Returns("00:00:00.00"); _utilMock.Setup(x => x.HoursToHMS(It.IsAny<double>(), ":", ":", ":", It.IsAny<int>())).Returns("00:00:00.00");
_utilMock.Setup(x => x.DegreesToDM(It.IsAny<double>(), "*", ":", 0)).Returns("00*00");
_utilMock.Setup(x => x.DegreesToDMS(It.IsAny<double>(), "*", ":", ":", It.IsAny<int>())).Returns("00*00");
ConnectTelescope(); ConnectTelescope();
@@ -3171,6 +3180,8 @@ namespace Meade.net.Telescope.UnitTests
_sharedResourcesWrapperMock.Setup(x => x.ReadTerminated()).Returns("Below horizon"); _sharedResourcesWrapperMock.Setup(x => x.ReadTerminated()).Returns("Below horizon");
_utilMock.Setup(x => x.HoursToHMS(It.IsAny<double>(), ":", ":", ":", It.IsAny<int>())).Returns("00:00:00.00"); _utilMock.Setup(x => x.HoursToHMS(It.IsAny<double>(), ":", ":", ":", It.IsAny<int>())).Returns("00:00:00.00");
_utilMock.Setup(x => x.DegreesToDM(It.IsAny<double>(), "*", ":", 0)).Returns("00*00");
_utilMock.Setup(x => x.DegreesToDMS(It.IsAny<double>(), "*", ":", ":", It.IsAny<int>())).Returns("00*00");
ConnectTelescope(); ConnectTelescope();
@@ -3184,6 +3195,9 @@ namespace Meade.net.Telescope.UnitTests
[Test] [Test]
public void SlewToTargetAsync_WhenTargetBelowElevation_ThenThrowsException() public void SlewToTargetAsync_WhenTargetBelowElevation_ThenThrowsException()
{ {
_utilMock.Setup(x => x.DegreesToDM(It.IsAny<double>(), "*", ":", 0)).Returns("00*00");
_utilMock.Setup(x => x.DegreesToDMS(It.IsAny<double>(), "*", ":", ":", It.IsAny<int>())).Returns("00*00");
_sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, "MS", false)).Returns("2"); _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, "MS", false)).Returns("2");
_sharedResourcesWrapperMock.Setup(x => x.ReadTerminated()).Returns("Above below elevation"); _sharedResourcesWrapperMock.Setup(x => x.ReadTerminated()).Returns("Above below elevation");
@@ -3203,6 +3217,8 @@ namespace Meade.net.Telescope.UnitTests
{ {
_sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, "MS", false)).Returns("3"); _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, "MS", false)).Returns("3");
_sharedResourcesWrapperMock.Setup(x => x.ReadTerminated()).Returns("the telescope can hit the tripod"); _sharedResourcesWrapperMock.Setup(x => x.ReadTerminated()).Returns("the telescope can hit the tripod");
_utilMock.Setup(x => x.DegreesToDM(It.IsAny<double>(), "*", ":", 0)).Returns("00*00");
_utilMock.Setup(x => x.DegreesToDMS(It.IsAny<double>(), "*", ":", ":", It.IsAny<int>())).Returns("00*00");
_utilMock.Setup(x => x.HoursToHMS(It.IsAny<double>(), ":", ":", ":", It.IsAny<int>())).Returns("00:00:00.00"); _utilMock.Setup(x => x.HoursToHMS(It.IsAny<double>(), ":", ":", ":", It.IsAny<int>())).Returns("00:00:00.00");
@@ -3231,6 +3247,10 @@ namespace Meade.net.Telescope.UnitTests
var slewCounter = 0; var slewCounter = 0;
var iterations = 10; var iterations = 10;
_utilMock.Setup(x => x.DegreesToDM(It.IsAny<double>(), "*", ":", 0)).Returns("00*00");
_utilMock.Setup(x => x.DegreesToDMS(It.IsAny<double>(), "*", ":", ":", It.IsAny<int>())).Returns("00*00");
_utilMock.Setup(x => x.HoursToHMS(It.IsAny<double>(), ":", ":", ":", It.IsAny<int>())).Returns("00:00:00.00");
_utilMock.Setup(x => x.HoursToHMS(It.IsAny<double>(), ":", ":", ":", It.IsAny<int>())).Returns("00:00:00.00"); _utilMock.Setup(x => x.HoursToHMS(It.IsAny<double>(), ":", ":", ":", It.IsAny<int>())).Returns("00:00:00.00");
_sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "D", false)).Returns(() => _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "D", false)).Returns(() =>
Meade.net.Telescope/Telescope.cs
+2 -1
View File
@@ -3449,9 +3449,10 @@ namespace ASCOM.Meade.net
{ {
var dms = useLongFormat var dms = useLongFormat
? _utilities.DegreesToDMS(value, "*", ":", ":", _digitsDe) ? _utilities.DegreesToDMS(value, "*", ":", ":", _digitsDe)
//: _utilities.DegreesToDM(value, "*", "", _digitsDe);
: _utilities.DegreesToDM(value, "*", "", 0); : _utilities.DegreesToDM(value, "*", "", 0);
dms = dms.TrimEnd(':');
var s = value < 0 ? string.Empty : "+"; var s = value < 0 ? string.Empty : "+";
var command = $"Sd{s}{dms}"; var command = $"Sd{s}{dms}";