Merged in develop (pull request #39)

Removed unneeded lock and will cause a lock recursion and break things.

Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs

@@ -56,12 +56,14 @@ namespace Meade.net.Telescope.UnitTests
 
         private bool _isParked;
         private ParkedPosition _parkedPosition;
+        private string _siderealTrackingRate;
 
         [SetUp]
         public void Setup()
         {
             _isParked = false;
             _parkedPosition = null;
+            _siderealTrackingRate = "+60.1";
 
             _testProperties = new TestProperties();
 
@@ -142,11 +144,10 @@ namespace Meade.net.Telescope.UnitTests
             _sharedResourcesWrapperMock.Setup(x => x.SendString("GL", false)).Returns(() => _testProperties.telescopeTime);
             _sharedResourcesWrapperMock.Setup(x => x.SendString("GG", false)).Returns(() => _testProperties.telescopeUtcCorrection);
 
-            const string siderealTrackingRate = "+60.1";
+            _testProperties.TrackingRate = _siderealTrackingRate;
-            _testProperties.TrackingRate = siderealTrackingRate;
             _sharedResourcesWrapperMock.Setup(x => x.SendString("GT", false)).Returns(() => _testProperties.TrackingRate);
             _sharedResourcesWrapperMock.Setup(x => x.SendBlind("TL", false)).Callback(() => _testProperties.TrackingRate = "lunar");
-            _sharedResourcesWrapperMock.Setup(x => x.SendBlind("TQ", false)).Callback(() => _testProperties.TrackingRate = siderealTrackingRate);
+            _sharedResourcesWrapperMock.Setup(x => x.SendBlind("TQ", false)).Callback(() => _testProperties.TrackingRate = _siderealTrackingRate);
 
             _sharedResourcesWrapperMock.Setup(x => x.ProductName).Returns(() => productName);
             _sharedResourcesWrapperMock.Setup(x => x.FirmwareVersion).Returns(() => firmwareVersion);
@@ -246,6 +247,10 @@ namespace Meade.net.Telescope.UnitTests
         [TestCase("down", "EK118")]
         [TestCase("back", "EK87")]
         [TestCase("forward", "EK69")]
+        [TestCase("left", "EK87")]
+        [TestCase("right", "EK69")]
+        [TestCase("scrollup", "EK85")]
+        [TestCase("scrolldown", "EK68")]
         [TestCase("?", "EK63")]
         public void Action_Handbox_WhenCalling_ThenSendsAppropriateBlindCommands(string action, string expectedString)
         {
@@ -822,9 +827,9 @@ namespace Meade.net.Telescope.UnitTests
             Assert.That(exception.Message, Is.EqualTo("Not connected to telescope when trying to execute: AlignmentMode Set"));
         }
 
-        [TestCase("AUTOSTAR", "43Eg", AlignmentModes.algAltAz, "AA")]
+        [TestCase(TelescopeList.Autostar497, TelescopeList.Autostar497_43Eg, AlignmentModes.algAltAz, "AA")]
-        [TestCase("AUTOSTAR", "43Eg", AlignmentModes.algPolar, "AP")]
+        [TestCase(TelescopeList.Autostar497, TelescopeList.Autostar497_43Eg, AlignmentModes.algPolar, "AP")]
-        [TestCase("AUTOSTAR", "43Eg", AlignmentModes.algGermanPolar, "AP")]
+        [TestCase(TelescopeList.Autostar497, TelescopeList.Autostar497_43Eg, AlignmentModes.algGermanPolar, "AP")]
         public void AlignmentMode_Set_WhenConnected_ThenSendsExpectedCommand(string productName, string firmware, AlignmentModes alignmentMode, string expectedCommand)
         {
             _sharedResourcesWrapperMock.Setup(x => x.ProductName).Returns(productName);
@@ -2702,7 +2707,10 @@ namespace Meade.net.Telescope.UnitTests
         [TestCase(DriveRates.driveLunar, "TL")]
         public void TrackingRate_Set_WhenConnected_ThenSendsCommandToTelescope(DriveRates rate, string commandString)
         {
-            ConnectTelescope();
+            string productName = TelescopeList.Autostar497;
+            string firmwareVersion = TelescopeList.Autostar497_43Eg;
+
+            ConnectTelescope(productName, firmwareVersion);
 
             _telescope.TrackingRate = rate;
 
@@ -2715,15 +2723,19 @@ namespace Meade.net.Telescope.UnitTests
         [Test]
         public void TrackingRate_Set_WhenUnSupportedRateSet_ThenThrowsException()
         {
-            ConnectTelescope();
+            string productName = TelescopeList.Autostar497;
+            string firmwareVersion = TelescopeList.Autostar497_43Eg;
+
+            ConnectTelescope(productName, firmwareVersion);
 
             var exception = Assert.Throws<ArgumentOutOfRangeException>(() => _telescope.TrackingRate = DriveRates.driveKing);
 
             Assert.That(exception.Message, Is.EqualTo("Exception of type 'System.ArgumentOutOfRangeException' was thrown.\r\nParameter name: value\r\nActual value was driveKing."));
         }
 
-        [Test]
+        [TestCase("60.1")]
-        public void TrackingRage_Get_WhenReadongDefaultValue_ThenAssumesSidereal()
+        [TestCase("+60.1")]
+        public void TrackingRage_Get_WhenReadingDefaultValue_ThenAssumesSidereal(string trackingRate)
         {
             ConnectTelescope();
 
@@ -2732,11 +2744,18 @@ namespace Meade.net.Telescope.UnitTests
             Assert.That(result, Is.EqualTo(DriveRates.driveSidereal));
         }
 
-        [TestCase(DriveRates.driveSidereal)]
+        [TestCase(DriveRates.driveSidereal, "60.1")]
-        [TestCase(DriveRates.driveLunar)]
+        [TestCase(DriveRates.driveLunar, "60.1")]
-        public void TrackingRate_Get_WhenConnected_ThenSendsCommandToTelescope(DriveRates rate)
+        [TestCase(DriveRates.driveSidereal, "+60.1")]
+        [TestCase(DriveRates.driveLunar, "+60.1")]
+        public void TrackingRate_Get_WhenConnected_ThenSendsCommandToTelescope(DriveRates rate, string trackingRate)
         {
-            ConnectTelescope();
+            _siderealTrackingRate = trackingRate;
+
+            string productName = TelescopeList.Autostar497;
+            string firmwareVersion = TelescopeList.Autostar497_43Eg;
+
+            ConnectTelescope(productName, firmwareVersion);
 
             _telescope.TrackingRate = rate;
 
@@ -2745,13 +2764,41 @@ namespace Meade.net.Telescope.UnitTests
             Assert.That(result, Is.EqualTo(rate));
         }
 
-        [Test]
+        [TestCase(DriveRates.driveSidereal, "60.1")]
-        public void TrackingRates_Get_ReturnsExpectedType()
+        [TestCase(DriveRates.driveLunar, "60.1")]
+        [TestCase(DriveRates.driveSidereal, "+60.1")]
+        [TestCase(DriveRates.driveLunar, "+60.1")]
+        public void TrackingRate_Set_WhenConnectedToLX200_ThenThrowsException(DriveRates rate, string trackingRate)
         {
+            string productName = TelescopeList.LX200CLASSIC;
+            string firmwareVersion = string.Empty;
+
+            ConnectTelescope(productName, firmwareVersion);
+
+            var result = Assert.Throws<ASCOM.NotImplementedException>( () =>  _telescope.TrackingRate = rate );
+
+            Assert.That(result.Message, Is.EqualTo("TrackingRate Set is not implemented in this driver."));
+        }
+
+        [TestCase(TelescopeList.Autostar497, TelescopeList.Autostar497_43Eg, true )]
+        [TestCase(TelescopeList.LX200CLASSIC, "", false)]
+        public void TrackingRates_Get_ReturnsExpectedType(string productName, string firmwareVersion, bool supportsLunar)
+        {
+            ConnectTelescope(productName, firmwareVersion);
+
             var result = _telescope.TrackingRates;
 
             Assert.That(result, Is.Not.Null);
             Assert.That(result, Is.AssignableTo<TrackingRates>());
+
+            if (supportsLunar)
+            {
+                Assert.That(result.Count, Is.EqualTo(2));
+            }
+            else
+            {
+                Assert.That(result.Count, Is.EqualTo(1));
+            }
         }
 
         [Test]

Meade.net.Telescope/Rates.cs

@@ -149,15 +149,19 @@ namespace ASCOM.Meade.net
         // Default constructor - Internal prevents public creation
         // of instances. Returned by Telescope.AxisRates.
         //
-        internal TrackingRates()
+        internal TrackingRates(bool supportsLunar)
         {
             //
             // This array must hold ONE or more DriveRates values, indicating
             // the tracking rates supported by your telescope. The one value
             // (tracking rate) that MUST be supported is driveSidereal!
             //
-            _trackingRates = new[] { DriveRates.driveSidereal, DriveRates.driveLunar };
+            if (supportsLunar)
-            // TODO Initialize this array with any additional tracking rates that your driver may provide
+            {
+                _trackingRates = new[] {DriveRates.driveSidereal, DriveRates.driveLunar};
+            }
+            else
+                _trackingRates = new[] { DriveRates.driveSidereal };
         }
 
         #region ITrackingRates Members

Meade.net.Telescope/Telescope.cs

@@ -249,11 +249,19 @@ namespace ASCOM.Meade.net
                             SharedResourcesWrapper.SendBlind("EK118");
                             break;
                         case "back":
+                        case "left":
                             SharedResourcesWrapper.SendBlind("EK87");
                             break;
                         case "forward":
+                        case "right":
                             SharedResourcesWrapper.SendBlind("EK69");
                             break;
+                        case "scrollup":
+                            SharedResourcesWrapper.SendBlind("EK85");
+                            break;
+                        case "scrolldown":
+                            SharedResourcesWrapper.SendBlind("EK68");
+                            break;
                         case "?":
                             SharedResourcesWrapper.SendBlind("EK63");
                             break;
@@ -339,7 +347,7 @@ namespace ASCOM.Meade.net
 
         public void CommandBlind(string command, bool raw)
         {
-            LogMessage("CommandBlind", "raw: {0} command {0}", raw, command);
+            LogMessage("CommandBlind", $"raw: {raw} command {command}");
             CheckConnected("CommandBlind");
             // Call CommandString and return as soon as it finishes
             //this.CommandString(command, raw);
@@ -352,16 +360,16 @@ namespace ASCOM.Meade.net
 
         public bool CommandBool(string command, bool raw)
         {
-            LogMessage("CommandBool", "raw: {0} command {0}", raw, command);
+            LogMessage("CommandBool", $"raw: {raw} command {command}");
             CheckConnected("CommandBool");
             var result = SharedResourcesWrapper.SendBool(command, raw);
-            LogMessage("CommandBool", "Completed: {0}", result);
+            LogMessage("CommandBool", $"Completed: {result}");
             return result;
         }
 
         public string CommandString(string command, bool raw)
         {
-            LogMessage("CommandString", "raw: {0} command {0}", raw, command);
+            LogMessage("CommandString", $"raw: {raw} command {command}");
             CheckConnected("CommandString");
             // it's a good idea to put all the low level communication with the device here,
             // then all communication calls this function
@@ -377,7 +385,7 @@ namespace ASCOM.Meade.net
             {
                 result = SharedResourcesWrapper.SendString(command, raw);
             }
-            LogMessage("CommandString", "Completed: {0}", result);
+            LogMessage("CommandString", $"Completed: {result}");
             return result;
         }
 
@@ -622,13 +630,26 @@ namespace ASCOM.Meade.net
             return false;
         }
 
-        private bool IsGWCommandSupported() => FirmwareIsGreaterThan(TelescopeList.Autostar497_43Eg);
+        private bool IsGwCommandSupported()
+        {
+            switch (SharedResourcesWrapper.ProductName)
+            {
+                case TelescopeList.LX200CLASSIC:
+                    return false;
+                case TelescopeList.Autostar497:
+                    return FirmwareIsGreaterThan(TelescopeList.Autostar497_43Eg);
+                case TelescopeList.LX200GPS:
+                    return FirmwareIsGreaterThan(TelescopeList.LX200GPS_42G);
+                default:
+                    return false;
+            }
+        }
 
         // true iff the mount will perform a meridian flip when required
         // According to "A User's Guide to the Meade LXD55 and LXD75 Telescopes" Autostar supports meridian flip so
         // we assume that for any telescope that supports the GW command and is not in Alt-Az mode then
         // meridian flip on slew is supported
-        private bool IsMeridianFlipOnSlewSupported() => IsGWCommandSupported() && AlignmentMode != AlignmentModes.algAltAz;
+        private bool IsMeridianFlipOnSlewSupported() => IsGwCommandSupported() && AlignmentMode != AlignmentModes.algAltAz;
 
         private bool FirmwareIsGreaterThan(string minVersion)
         {
@@ -955,7 +976,7 @@ namespace ASCOM.Meade.net
 
                 CheckConnected("AlignmentMode Get");
 
-                if (IsGWCommandSupported())
+                if (IsGwCommandSupported())
                 {
                     var alignmentStatus = GetScopeAlignmentStatus();
                     return alignmentStatus.AlignmentMode;
@@ -996,7 +1017,7 @@ namespace ASCOM.Meade.net
                 CheckConnected("AlignmentMode Set");
 
                 //todo tidy this up into a better solution that means can :GW#, :AL#, :AA#, & :AP# and checked for Autostar properly
-                if (!IsGWCommandSupported())
+                if (!IsGwCommandSupported())
                     throw new PropertyNotImplementedException("AlignmentMode", true);
 
                 switch (value)
@@ -1023,6 +1044,7 @@ namespace ASCOM.Meade.net
 
         private AlignmentStatus GetScopeAlignmentStatus()
         {
+            LogMessage("GetScopeAlignmentStatus", "Started");
             var alignmentString = CommandString("GW", false);
             //:GW# Get Scope Alignment Status
             //Returns: <mount><tracking><alignment>#
@@ -1045,6 +1067,7 @@ namespace ASCOM.Meade.net
                     alignmentStatus.AlignmentMode = AlignmentModes.algGermanPolar;
                     break;
             }
+
             alignmentStatus.Tracking = alignmentString[1] == 'T';
             switch (alignmentString[2])
             {
@@ -1068,6 +1091,7 @@ namespace ASCOM.Meade.net
                     break;
             }
 
+            LogMessage("GetScopeAlignmentStatus", $"Result {alignmentStatus}");
             return alignmentStatus;
         }
 
@@ -1309,7 +1333,7 @@ namespace ASCOM.Meade.net
         {
             get
             {
-                var canSetTracking = IsGWCommandSupported();
+                var canSetTracking = IsGwCommandSupported();
                 LogMessage("CanSetTracking", "Get - " + canSetTracking);
                 return canSetTracking;
             }
@@ -2267,14 +2291,11 @@ namespace ASCOM.Meade.net
             CheckConnected("SlewToCoordinatesAsync");
             CheckParked();
 
-            SharedResourcesWrapper.Lock(() =>
-                {
             TargetRightAscension = rightAscension;
             TargetDeclination = declination;
-
             DoSlewAsync(true);
-                }
+
-            );
+            LogMessage("SlewToCoordinatesAsync", $"Completed Ra={rightAscension}, Dec={declination}");
         }
 
         public void SlewToTarget()
@@ -2591,7 +2612,7 @@ namespace ASCOM.Meade.net
             get
             {
                 LogMessage("Tracking", "Get");
-                if (IsGWCommandSupported())
+                if (IsGwCommandSupported())
                 {
                     var alignmentStatus = GetScopeAlignmentStatus();
                     return alignmentStatus.Tracking;
@@ -2607,7 +2628,7 @@ namespace ASCOM.Meade.net
                 }
 
                 LogMessage("Tracking Set", $"{value}");
-                SharedResourcesWrapper.SendBlind(value ? "AP" : "AL");
+                SharedResourcesWrapper.SendBlind(value ? "AP" : "AL"); //todo need to route this to the real commands.
             }
         }
 
@@ -2616,12 +2637,18 @@ namespace ASCOM.Meade.net
             get
             {
                 var rate = CommandString("GT", false);
+                //:GT# Get tracking rate
+                //Returns: TT.T#
+                //Current Track Frequency expressed in hertz assuming a synchonous motor design where a 60.0 Hz motor clock
+                //    would produce 1 revolution of the telescope in 24 hours.
 
-                if (rate == "+60.1")
+                rate = rate.Replace("+",  string.Empty);
-                    return DriveRates.driveSidereal;
 
-                // we only support two rates ATM so return lunar tracking rate
+                DriveRates result = rate == "60.1" ? DriveRates.driveSidereal : DriveRates.driveLunar;
-                return DriveRates.driveLunar;
+
+                LogMessage("TrackingRate Get", $"{rate} {result}");
+
+                return result;
             }
             set
             {
@@ -2629,6 +2656,11 @@ namespace ASCOM.Meade.net
                 CheckConnected("TrackingRate Set");
                 CheckParked();
 
+                if (SharedResourcesWrapper.ProductName == TelescopeList.LX200CLASSIC)
+                {
+                    throw new ASCOM.NotImplementedException("TrackingRate Set");
+                }
+
                 switch (value)
                 {
                     case DriveRates.driveSidereal:
@@ -2660,7 +2692,7 @@ namespace ASCOM.Meade.net
         {
             get
             {
-                ITrackingRates trackingRates = new TrackingRates();
+                ITrackingRates trackingRates = new TrackingRates(SharedResourcesWrapper.ProductName != TelescopeList.LX200CLASSIC);
                 LogMessage("TrackingRates", "Get - ");
                 foreach (DriveRates driveRate in trackingRates)
                 {
@@ -2737,7 +2769,7 @@ namespace ASCOM.Meade.net
 
                     return utcDate;
                 }
-                catch (ParkedException e)
+                catch (ParkedException)
                 {
                     if (ParkedBehaviour == ParkedBehaviour.NoCoordinates)
                         throw;

Meade.net/SharedResources.cs

@@ -291,6 +291,8 @@ namespace ASCOM.Meade.net
         #region SetupDialog
 
         public static void SetupDialog()
+        {
+            try
             {
                 var profileProperties = ReadProfile();
 
@@ -308,10 +310,17 @@ namespace ASCOM.Meade.net
                     {
                         profileProperties = f.GetProfile();
 
-                    WriteProfile(profileProperties); // Persist device configuration values to the ASCOM Profile store
+                        WriteProfile(
+                            profileProperties); // Persist device configuration values to the ASCOM Profile store
                     }
                 }
             }
+            catch (Exception e)
+            {
+                Console.WriteLine(e);
+                throw;
+            }
+        }
 
         #endregion