diff --git a/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs b/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs index 808ea3b..a4e35a7 100644 --- a/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs +++ b/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs @@ -2389,6 +2389,8 @@ namespace Meade.net.Telescope.UnitTests public void TargetDeclination_Set_WhenTelescopeReportsInvalidDec_ThenThrowsException() { _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, It.IsAny(), false)).Returns("0"); + _utilMock.Setup(x => x.DegreesToDM(It.IsAny(), "*", ":", 0)).Returns("00*00"); + _utilMock.Setup(x => x.DegreesToDMS(It.IsAny(), "*", ":", ":", It.IsAny())).Returns("00*00"); ConnectTelescope(); @@ -3124,6 +3126,9 @@ namespace Meade.net.Telescope.UnitTests [Test] public void SlewToTargetAsync_WhenTargetRightAscensionNotSet_ThenThrowsException() { + _utilMock.Setup(x => x.DegreesToDM(It.IsAny(), "*", ":", 0)).Returns("00*00"); + _utilMock.Setup(x => x.DegreesToDMS(It.IsAny(), "*", ":", ":", It.IsAny())).Returns("00*00"); + ConnectTelescope(); _telescope.TargetDeclination = 1; @@ -3136,6 +3141,8 @@ namespace Meade.net.Telescope.UnitTests public void SlewToTargetAsync_WhenTargetSet_ThenAttemptsSlew() { _utilMock.Setup(x => x.HoursToHMS(It.IsAny(), ":", ":", ":", It.IsAny())).Returns("00:00:00.00"); + _utilMock.Setup(x => x.DegreesToDM(It.IsAny(), "*", ":", 0)).Returns("00*00"); + _utilMock.Setup(x => x.DegreesToDMS(It.IsAny(), "*", ":", ":", It.IsAny())).Returns("00*00"); ConnectTelescope(); @@ -3152,6 +3159,8 @@ namespace Meade.net.Telescope.UnitTests _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, "MS", false)).Returns("0"); _utilMock.Setup(x => x.HoursToHMS(It.IsAny(), ":", ":", ":", It.IsAny())).Returns("00:00:00.00"); + _utilMock.Setup(x => x.DegreesToDM(It.IsAny(), "*", ":", 0)).Returns("00*00"); + _utilMock.Setup(x => x.DegreesToDMS(It.IsAny(), "*", ":", ":", It.IsAny())).Returns("00*00"); ConnectTelescope(); @@ -3171,6 +3180,8 @@ namespace Meade.net.Telescope.UnitTests _sharedResourcesWrapperMock.Setup(x => x.ReadTerminated()).Returns("Below horizon"); _utilMock.Setup(x => x.HoursToHMS(It.IsAny(), ":", ":", ":", It.IsAny())).Returns("00:00:00.00"); + _utilMock.Setup(x => x.DegreesToDM(It.IsAny(), "*", ":", 0)).Returns("00*00"); + _utilMock.Setup(x => x.DegreesToDMS(It.IsAny(), "*", ":", ":", It.IsAny())).Returns("00*00"); ConnectTelescope(); @@ -3184,6 +3195,9 @@ namespace Meade.net.Telescope.UnitTests [Test] public void SlewToTargetAsync_WhenTargetBelowElevation_ThenThrowsException() { + _utilMock.Setup(x => x.DegreesToDM(It.IsAny(), "*", ":", 0)).Returns("00*00"); + _utilMock.Setup(x => x.DegreesToDMS(It.IsAny(), "*", ":", ":", It.IsAny())).Returns("00*00"); + _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, "MS", false)).Returns("2"); _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.ReadTerminated()).Returns("the telescope can hit the tripod"); + _utilMock.Setup(x => x.DegreesToDM(It.IsAny(), "*", ":", 0)).Returns("00*00"); + _utilMock.Setup(x => x.DegreesToDMS(It.IsAny(), "*", ":", ":", It.IsAny())).Returns("00*00"); _utilMock.Setup(x => x.HoursToHMS(It.IsAny(), ":", ":", ":", It.IsAny())).Returns("00:00:00.00"); @@ -3231,6 +3247,10 @@ namespace Meade.net.Telescope.UnitTests var slewCounter = 0; var iterations = 10; + _utilMock.Setup(x => x.DegreesToDM(It.IsAny(), "*", ":", 0)).Returns("00*00"); + _utilMock.Setup(x => x.DegreesToDMS(It.IsAny(), "*", ":", ":", It.IsAny())).Returns("00*00"); + + _utilMock.Setup(x => x.HoursToHMS(It.IsAny(), ":", ":", ":", It.IsAny())).Returns("00:00:00.00"); _utilMock.Setup(x => x.HoursToHMS(It.IsAny(), ":", ":", ":", It.IsAny())).Returns("00:00:00.00"); _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "D", false)).Returns(() => diff --git a/Meade.net.Telescope/Telescope.cs b/Meade.net.Telescope/Telescope.cs index db9cf01..1272d7e 100644 --- a/Meade.net.Telescope/Telescope.cs +++ b/Meade.net.Telescope/Telescope.cs @@ -3449,9 +3449,10 @@ namespace ASCOM.Meade.net { var dms = useLongFormat ? _utilities.DegreesToDMS(value, "*", ":", ":", _digitsDe) - //: _utilities.DegreesToDM(value, "*", "", _digitsDe); : _utilities.DegreesToDM(value, "*", "", 0); + dms = dms.TrimEnd(':'); + var s = value < 0 ? string.Empty : "+"; var command = $"Sd{s}{dms}";