From 670a5ccf811a1baa4bd9fd7db8bc3c5455072d53 Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 4 Oct 2019 20:34:42 +0100 Subject: [PATCH] Modified how the RA detection is done, and changed the message logs --- Meade.net.Telescope/Telescope.cs | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/Meade.net.Telescope/Telescope.cs b/Meade.net.Telescope/Telescope.cs index b9cbcc1..5f7ee87 100644 --- a/Meade.net.Telescope/Telescope.cs +++ b/Meade.net.Telescope/Telescope.cs @@ -847,11 +847,7 @@ namespace ASCOM.Meade.net UtcDateTime = UTCDate, SiteLongitude = SiteLongitude, SiteLatitude = SiteLatitude, - EquatorialCoordinates = new EquatorialCoordinates - { - RightAscension = RightAscension, - Declination = Declination - } + EquatorialCoordinates = GetTelescopeRaAndDec() }); double hourAngle = _astroMaths.RightAscensionToHourAngle(altitudeData.UtcDateTime, altitudeData.SiteLongitude, @@ -860,6 +856,15 @@ namespace ASCOM.Meade.net return altAz; } + private EquatorialCoordinates GetTelescopeRaAndDec() + { + return new EquatorialCoordinates + { + RightAscension = RightAscension, + Declination = Declination + }; + } + public double ApertureArea { get @@ -1368,13 +1373,7 @@ namespace ASCOM.Meade.net LogMessage("PulseGuide", $"pulse guide direction {direction} duration {duration}"); CheckConnected("PulseGuide"); - var coordinatesBeforeMove = new EquatorialCoordinates - { - RightAscension = RightAscension, - Declination = Declination - }; - - + var coordinatesBeforeMove = GetTelescopeRaAndDec(); if (_userNewerPulseGuiding && duration < 10000) { @@ -1464,13 +1463,10 @@ namespace ASCOM.Meade.net //}); } - var coordinatesAfterMove = new EquatorialCoordinates - { - RightAscension = RightAscension, - Declination = Declination - }; + var coordinatesAfterMove = GetTelescopeRaAndDec(); - LogMessage("PulseGuide", $"Complete - RA change: {_utilitiesExtra.HoursToHMS(coordinatesAfterMove.RightAscension - coordinatesAfterMove.RightAscension)} Dec change: {_utilitiesExtra.HoursToHMS(coordinatesAfterMove.Declination - coordinatesBeforeMove.Declination)}"); + LogMessage("PulseGuide", $"Complete Before RA: {_utilitiesExtra.HoursToHMS(coordinatesBeforeMove.RightAscension)} Dec:{_utilitiesExtra.DegreesToDMS(coordinatesBeforeMove.Declination)}"); + LogMessage("PulseGuide", $"Complete Before RA: {_utilitiesExtra.HoursToHMS(coordinatesAfterMove.RightAscension)} Dec:{_utilitiesExtra.DegreesToDMS(coordinatesAfterMove.Declination)}"); } public double RightAscension