diff --git a/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs b/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs index 626c4ab..3c53564 100644 --- a/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs +++ b/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs @@ -1041,8 +1041,9 @@ namespace Meade.net.Telescope.UnitTests var ra = 12d; var dec = 34d; - _utilMock.Setup(x => x.HoursToHM(ra, ":", "", 1)).Returns(ra + "HM"); - _utilMock.Setup(x => x.DegreesToDM(dec, "*", "", 0)).Returns(dec + "DM"); + _utilMock.Setup(x => x.HoursToHMS(ra, ":", ":", ":", 0)).Returns(ra + "HM"); + _utilMock.Setup(x => x.DegreesToDMS(dec, "*", ":", ":", 0)).Returns(dec + "DM"); + _utilMock.Setup(x => x.DMSToDegrees(_testProperties.TelescopeRaResult)).Returns(_testProperties.Declination); ConnectTelescope(TelescopeList.LX200CLASSIC); @@ -1063,8 +1064,8 @@ namespace Meade.net.Telescope.UnitTests secondTelescopeInstance.TargetRightAscension = ra; secondTelescopeInstance.TargetDeclination = dec; - _utilMock.Verify(x => x.HoursToHM(ra, ":", "", 1), Times.Exactly(2)); - _utilMock.Verify(x => x.DegreesToDM(dec, "*", "", 0), Times.Exactly(2)); + _utilMock.Verify(x => x.HoursToHMS(ra, ":", ":", ":", 0), Times.Exactly(2)); + _utilMock.Verify(x => x.DegreesToDMS(dec, "*", ":", ":", 0), Times.Exactly(2)); _utilMock.Verify(x => x.HoursToHMS(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), 2), Times.Never); _utilMock.Verify(x => x.DegreesToDMS(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), 2), Times.Never); } diff --git a/Meade.net.Telescope/Telescope.cs b/Meade.net.Telescope/Telescope.cs index 81dcdfb..3de6c6c 100644 --- a/Meade.net.Telescope/Telescope.cs +++ b/Meade.net.Telescope/Telescope.cs @@ -1747,10 +1747,11 @@ namespace ASCOM.Meade.net try { CheckConnected("CanUnpark"); + var canUnPark = IsUnparkable; - LogMessage("CanUnpark", "Get - " + true); + LogMessage("CanUnpark", "Get - " + canUnPark); - return IsUnparkable; + return canUnPark; } catch (Exception ex) { @@ -3448,7 +3449,8 @@ namespace ASCOM.Meade.net { var dms = useLongFormat ? _utilities.DegreesToDMS(value, "*", ":", ":", _digitsDe) - : _utilities.DegreesToDM(value, "*", "", _digitsDe); + //: _utilities.DegreesToDM(value, "*", "", _digitsDe); + : _utilities.DegreesToDMS(value, "*", ":", ":", 0); var s = value < 0 ? string.Empty : "+"; @@ -3535,7 +3537,8 @@ namespace ASCOM.Meade.net { var hms = useLongFormat ? _utilities.HoursToHMS(value, ":", ":", ":", _digitsRa) - : _utilities.HoursToHM(value, ":", "", _digitsRa).Replace(',', '.'); + //: _utilities.HoursToHM(value, ":", "", _digitsRa).Replace(',', '.'); + : _utilities.HoursToHMS(value, ":", ":", ":", 0); hms = hms.TrimEnd(':');