Merged in develop (pull request #32)

Develop

Meade.net.Focuser.UnitTests/FocuserUnitTests.cs

@@ -109,16 +109,17 @@ namespace Meade.net.Focuser.UnitTests
             Assert.That(exception.Message, Is.EqualTo("Not connected to focuser when trying to execute: CommandBlind"));
         }
 
-        [Test]
-        public void CommandBlind_WhenConnected_ThenSendsExpectedMessage()
+        [TestCase(false)]
+        [TestCase(true)]
+        public void CommandBlind_WhenConnected_ThenSendsExpectedMessage(bool raw)
         {
             string expectedMessage = "test blind Message";
 
             ConnectFocuser();
 
-            _focuser.CommandBlind(expectedMessage, true);
+            _focuser.CommandBlind(expectedMessage, raw);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(expectedMessage), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(expectedMessage, raw), Times.Once);
         }
 
         [Test]
@@ -130,16 +131,19 @@ namespace Meade.net.Focuser.UnitTests
             Assert.That(exception.Message, Is.EqualTo("Not connected to focuser when trying to execute: CommandBool"));
         }
 
-        [Test]
-        public void CommandBool_WhenConnected_ThenSendsExpectedMessage()
+        [TestCase(false)]
+        [TestCase(true)]
+        public void CommandBool_WhenConnected_ThenSendsExpectedMessage(bool raw)
         {
             string expectedMessage = "test blind Message";
+            _sharedResourcesWrapperMock.Setup(x => x.SendBool(expectedMessage, raw)).Returns(true);
 
             ConnectFocuser();
 
-            var exception = Assert.Throws<MethodNotImplementedException>(() => { _focuser.CommandBool(expectedMessage, true); });
+            var result = _focuser.CommandBool(expectedMessage, raw);
 
-            Assert.That(exception.Message, Is.EqualTo("Method CommandBool is not implemented in this driver."));
+            _sharedResourcesWrapperMock.Verify(x => x.SendBool(expectedMessage, raw), Times.Once);
+            Assert.That(result, Is.True);
         }
 
         [Test]
@@ -319,7 +323,7 @@ namespace Meade.net.Focuser.UnitTests
 
             _focuser.Halt();
 
-            _sharedResourcesWrapperMock.Verify( x => x.SendBlind(":FQ#"), Times.AtLeastOnce);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("FQ", false), Times.AtLeastOnce);
         }
 
         [Test]
@@ -334,13 +338,13 @@ namespace Meade.net.Focuser.UnitTests
 
         [TestCase(false)]
         [TestCase(true)]
-        public void Link_Get_ReturnsSameValueAsConnected( bool connected)
+        public void Link_Get_ReturnsSameValueAsConnected(bool connected)
         {
             _sharedResourcesWrapperMock.Setup(x => x.ProductName).Returns(() => TelescopeList.Autostar497);
             _sharedResourcesWrapperMock.Setup(x => x.FirmwareVersion).Returns(() => TelescopeList.Autostar497_31Ee);
             _focuser.Connected = connected;
 
-            Assert.That( _focuser.Link, Is.EqualTo(connected));
+            Assert.That(_focuser.Link, Is.EqualTo(connected));
         }
 
         [TestCase(false)]
@@ -394,12 +398,12 @@ namespace Meade.net.Focuser.UnitTests
 
             _focuser.Move(0);
 
-            _utilMock.Verify( x => x.WaitForMilliseconds(It.IsAny<int>()), Times.Never);
+            _utilMock.Verify(x => x.WaitForMilliseconds(It.IsAny<int>()), Times.Never);
         }
 
         [TestCase(200)]
         [TestCase(-200)]
-        public void Move_WhenIncrementIsNot0_ThenMovesFocuserAndStopsFocuser( int position)
+        public void Move_WhenIncrementIsNot0_ThenMovesFocuserAndStopsFocuser(int position)
         {
             _profileProperties.BacklashCompensation = 0;
 
@@ -409,16 +413,16 @@ namespace Meade.net.Focuser.UnitTests
 
             if (position < 0)
             {
-                _sharedResourcesWrapperMock.Verify( x => x.SendBlind(":F-#"), Times.Once);
-                _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":F+#"), Times.Never);
+                _sharedResourcesWrapperMock.Verify(x => x.SendBlind("F-", false), Times.Once);
+                _sharedResourcesWrapperMock.Verify(x => x.SendBlind("F+", false), Times.Never);
             }
             else
             {
-                _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":F-#"), Times.Never);
-                _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":F+#"), Times.Once);
+                _sharedResourcesWrapperMock.Verify(x => x.SendBlind("F-", false), Times.Never);
+                _sharedResourcesWrapperMock.Verify(x => x.SendBlind("F+", false), Times.Once);
             }
 
-            _sharedResourcesWrapperMock.Verify( x => x.Lock(It.IsAny<Action>()), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.Lock(It.IsAny<Action>()), Times.Once);
 
             _utilMock.Verify(x => x.WaitForMilliseconds(Math.Abs(position)), Times.Once);
             _utilMock.Verify(x => x.WaitForMilliseconds(Math.Abs(_profileProperties.BacklashCompensation)), Times.Never);
@@ -437,16 +441,16 @@ namespace Meade.net.Focuser.UnitTests
 
             if (position < 0)
             {
-                _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":F-#"), Times.Once);
-                _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":F+#"), Times.Never);
+                _sharedResourcesWrapperMock.Verify(x => x.SendBlind("F-", false), Times.Once);
+                _sharedResourcesWrapperMock.Verify(x => x.SendBlind("F+", false), Times.Never);
                 _utilMock.Verify(x => x.WaitForMilliseconds(Math.Abs(position)), Times.Once);
                 _utilMock.Verify(x => x.WaitForMilliseconds(Math.Abs(_profileProperties.BacklashCompensation)), Times.Never);
                 _utilMock.Verify(x => x.WaitForMilliseconds(100), Times.Exactly(1));
             }
             else
             {
-                _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":F-#"), Times.Once);
-                _sharedResourcesWrapperMock.Verify(x => x.SendBlind(":F+#"), Times.Once);
+                _sharedResourcesWrapperMock.Verify(x => x.SendBlind("F-", false), Times.Once);
+                _sharedResourcesWrapperMock.Verify(x => x.SendBlind("F+", false), Times.Once);
                 _utilMock.Verify(x => x.WaitForMilliseconds(Math.Abs(position) + _profileProperties.BacklashCompensation), Times.Once);
                 _utilMock.Verify(x => x.WaitForMilliseconds(_profileProperties.BacklashCompensation), Times.Once);
                 _utilMock.Verify(x => x.WaitForMilliseconds(100), Times.Exactly(2));
@@ -503,7 +507,7 @@ namespace Meade.net.Focuser.UnitTests
         {
             var exception = Assert.Throws<PropertyNotImplementedException>(() =>
             {
-                var result = _focuser.Temperature; 
+                var result = _focuser.Temperature;
                 Assert.Fail($"{result} should not have a value");
             });
             Assert.That(exception.Message, Is.EqualTo("Property read Temperature is not implemented in this driver."));

Meade.net.UnitTests/SharedResourcesUnitTests.cs

@@ -32,35 +32,36 @@ namespace Meade.net.UnitTests
             Assert.That(SharedResources.SharedSerial,Is.EqualTo(_serialMock.Object));
         }
 
-        [Test]
-        public void SendBlind_WhenCalled_Then_ClearsBuffersAndSendsMessage()
+        [TestCase(true, "Test")]
+        [TestCase(false, "#:Test#")]
+        public void SendBlind_WhenCalled_Then_ClearsBuffersAndSendsMessage(bool raw, string expectedMessage)
         {
-            var expectedMessage = "Test";
-
-            SharedResources.SendBlind(expectedMessage);
+            var sendMessage = "Test";
+            SharedResources.SendBlind(sendMessage, raw);
 
             _serialMock.Verify(x=> x.ClearBuffers(), Times.Once);
             _serialMock.Verify(x=>x.Transmit(expectedMessage), Times.Once);
         }
 
-        [Test]
-        public void SendChar_WhenCalled_ThenSendsMessageAndReadsExpectedNumberOfCharacters()
+        [TestCase(false, "#:Test#")]
+        [TestCase(true, "Test")]
+        public void SendChar_WhenCalled_ThenSendsMessageAndReadsExpectedNumberOfCharacters(bool raw, string expectedCommand)
         {
-            var expectedMessage = "Test";
+            var command = "Test";
             var expectedResult = "A";
 
             _serialMock.Setup(x => x.ReceiveCounted(1)).Returns(expectedResult);
 
-            var result = SharedResources.SendChar(expectedMessage);
+            var result = SharedResources.SendChar(command, raw);
 
             _serialMock.Verify(x => x.ClearBuffers(), Times.Once);
-            _serialMock.Verify(x => x.Transmit(expectedMessage), Times.Once);
+            _serialMock.Verify(x => x.Transmit(expectedCommand), Times.Once);
             _serialMock.Verify(x => x.ReceiveCounted(1), Times.Once);
             Assert.That(result, Is.EqualTo(expectedResult));
         }
 
-        [TestCase(false, "Test")]
-        [TestCase(true, "#Test")]
+        [TestCase(true, "Test")]
+        [TestCase(false, "#:Test#")]
         public void SendString_WhenCalled_ThenSendsMessageAndReadsResultUntilTerminatorFound(bool includePrefix, string expectedMessage)
         {
             var transmitMessage = "Test";

Meade.net.focuser/Focuser.cs

@@ -101,32 +101,39 @@ namespace ASCOM.Meade.net
 
         public void CommandBlind(string command, bool raw)
         {
+            LogMessage("CommandBlind", "raw: {0} command {0}", raw, command);
             CheckConnected("CommandBlind");
             // Call CommandString and return as soon as it finishes
             //this.CommandString(command, raw);
-            SharedResourcesWrapper.SendBlind(command);
+            SharedResourcesWrapper.SendBlind(command, raw);
             // or
             //throw new ASCOM.MethodNotImplementedException("CommandBlind");
             // DO NOT have both these sections!  One or the other
+            LogMessage("CommandBlind", "Completed");
         }
 
         public bool CommandBool(string command, bool raw)
         {
+            LogMessage("CommandBool", "raw: {0} command {0}", raw, command);
             CheckConnected("CommandBool");
-            //string ret = CommandString(command, raw);
-            // decode the return string and return true or false
+            var result = SharedResourcesWrapper.SendBool(command, raw);
+            LogMessage("CommandBool", "Completed: {0}", result);
+            return result;
             // or
-            throw new MethodNotImplementedException("CommandBool");
+            //throw new MethodNotImplementedException("CommandBool");
             // DO NOT have both these sections!  One or the other
         }
 
         public string CommandString(string command, bool raw)
         {
+            LogMessage("CommandString", "raw: {0} command {0}", raw, 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
             // you need something to ensure that only one command is in progress at a time
-            return SharedResourcesWrapper.SendString(command);
+            var result = SharedResourcesWrapper.SendString(command, raw);
+            LogMessage("CommandBool", "Completed: {0}", result);
+            return result;
             //throw new ASCOM.MethodNotImplementedException("CommandString");
         }
 
@@ -225,7 +232,7 @@ namespace ASCOM.Meade.net
 
             //todo fix this issue: A single halt command is sometimes missed by the #909 apm, so let's do it a few times to be safe.
 
-            SharedResourcesWrapper.SendBlind(":FQ#");
+            SharedResourcesWrapper.SendBlind("FQ");
             //:FQ# Halt Focuser Motion
             //Returns: Nothing
         }
@@ -329,7 +336,7 @@ namespace ASCOM.Meade.net
 
         private void MoveFocuser(bool directionOut, int steps)
         {
-            //_sharedResourcesWrapper.SendBlind(":FF#");
+            //_sharedResourcesWrapper.SendBlind("FF");
             //:FF# Set Focus speed to fastest setting
             //Returns: Nothing
 
@@ -350,7 +357,7 @@ namespace ASCOM.Meade.net
 
         private void PerformFocuserMove(bool directionOut)
         {
-            SharedResourcesWrapper.SendBlind(directionOut ? ":F+#" : ":F-#");
+            SharedResourcesWrapper.SendBlind(directionOut ? "F+" : "F-");
             //:F+# Start Focuser moving inward (toward objective)
             //Returns: None
 

Meade.net/Meade.net.csproj

@@ -141,6 +141,7 @@
     <Compile Include="LocalServer.cs" />
     <Compile Include="MeadeTelescopeBase.cs" />
     <Compile Include="ParkedBehaviour.cs" />
+    <Compile Include="ParkedPosition.cs" />
     <Compile Include="ProfileFactory.cs" />
     <Compile Include="ProfileProperties.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

Meade.net/ParkedPosition.cs

@@ -0,0 +1,10 @@
+namespace ASCOM.Meade.net
+{
+    public class ParkedPosition
+    {
+        public double Altitude { get; set; }
+        public double Azimuth { get; set; }
+        public double RightAscension { get; set; }
+        public double Declination { get; set; }
+    }
+}

Meade.net/SharedResources.cs

@@ -18,6 +18,7 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Runtime.InteropServices;
+using System.Security.AccessControl;
 using System.Windows.Forms;
 using ASCOM.Meade.net.Wrapper;
 using ASCOM.Utilities;
@@ -77,12 +78,13 @@ namespace ASCOM.Meade.net
         }
 
         //todo add code to ensure that there is a minimum gap between commands. 5ms as default.
-        public static void SendBlind(string message)
+        public static void SendBlind(string message, bool raw = false)
         {
             lock (LockObject)
             {
                 SharedSerial.ClearBuffers();
-                SharedSerial.Transmit(message);
+                var encodedMessage = raw ? message : $"#:{message}#";
+                SharedSerial.Transmit(encodedMessage);
             }
         }
 
@@ -93,14 +95,16 @@ namespace ASCOM.Meade.net
         /// and that the reply will always be terminated by a "#" character.
         /// </summary>
         /// <param name="message"></param>
+        /// <param name="raw"></param>
         /// <returns></returns>
-        public static string SendString(string message, bool includePrefix = true)
+        public static string SendString(string message, bool raw = false)
         {
             lock (LockObject)
             {
                 SharedSerial.ClearBuffers();
 
-                SharedSerial.Transmit(includePrefix ? $"#{message}" : message);
+                var encodedMessage = raw ? message : $"#:{message}#";
+                SharedSerial.Transmit(encodedMessage);
 
                 try
                 {
@@ -116,12 +120,22 @@ namespace ASCOM.Meade.net
             }
         }
 
-        public static string SendChar(string message)
+        public static bool SendBool(string command, bool raw = false)
+        {
+        
+            var result = SendChar(command, raw);
+
+            return result == "1";
+        }
+
+        public static string SendChar(string command, bool raw = false)
         {
             lock (LockObject)
             {
                 SharedSerial.ClearBuffers();
-                SharedSerial.Transmit(message);
+
+                var encodedMessage = raw ? command : $"#:{command}#";
+                SharedSerial.Transmit(encodedMessage);
 
                 try
                 {
@@ -357,8 +371,8 @@ namespace ASCOM.Meade.net
 
                         try
                         {
-                            ProductName = SendString(":GVP#");
-                            FirmwareVersion = SendString(":GVN#");
+                            ProductName = SendString("GVP");
+                            FirmwareVersion = SendString("GVN");
                         }
                         catch (Exception ex)
                         {
@@ -378,7 +392,7 @@ namespace ASCOM.Meade.net
 
                         try
                         {
-                            string utcOffSet = SendString(":GG#");
+                            string utcOffSet = SendString("GG");
                             //:GG# Get UTC offset time
                             //Returns: sHH# or sHH.H#
                             //The number of decimal hours to add to local time to convert it to UTC. If the number is a whole number the
@@ -479,5 +493,15 @@ namespace ASCOM.Meade.net
                 Count = 0;
             }
         }
+        
+        public static void SetParked(bool atPark, ParkedPosition parkedPosition)
+        {
+            IsParked = atPark;
+            ParkedPosition = parkedPosition;
+        }
+
+        public static bool IsParked { get; private set; }
+
+        public static ParkedPosition ParkedPosition { get; private set; }
     }
 }

Meade.net/Wrapper/SharedResourcesWrapper.cs

@@ -15,9 +15,10 @@ namespace ASCOM.Meade.net.Wrapper
         void Lock(Action action);
         T Lock<T>(Func<T> func);
 
-        string SendString(string message, bool includePrefix = true);
-        void SendBlind(string message);
-        string SendChar(string message);
+        string SendString(string message, bool raw = false);
+        void SendBlind(string message, bool raw = false);
+        bool SendBool(string command, bool raw = false);
+        string SendChar(string message, bool raw = false);
 
         string ReadTerminated();
 
@@ -26,6 +27,10 @@ namespace ASCOM.Meade.net.Wrapper
         void SetupDialog();
         void WriteProfile(ProfileProperties profileProperties);
         void ReadCharacters(int throwAwayCharacters);
+
+        void SetParked(bool atPark, ParkedPosition parkedPosition);
+        bool IsParked { get; }
+        ParkedPosition ParkedPosition { get; }
     }
 
     public class SharedResourcesWrapper : ISharedResourcesWrapper
@@ -54,19 +59,24 @@ namespace ASCOM.Meade.net.Wrapper
             return SharedResources.Lock(func);
         }
 
-        public string SendString(string message, bool includePrefix = true)
+        public string SendString(string message, bool raw = false)
         {
-            return SharedResources.SendString(message, includePrefix);
+            return SharedResources.SendString(message, raw);
         }
 
-        public void SendBlind(string message)
+        public void SendBlind(string message, bool raw = false)
         {
-            SharedResources.SendBlind(message);
+            SharedResources.SendBlind(message, raw);
         }
 
-        public string SendChar(string message)
+        public bool SendBool(string command, bool raw = false)
         {
-            return SharedResources.SendChar(message);
+            return SharedResources.SendBool(command, raw);
+        }
+
+        public string SendChar(string message,bool raw = false)
+        {
+            return SharedResources.SendChar(message, raw);
         }
 
         public string ReadTerminated()
@@ -93,5 +103,14 @@ namespace ASCOM.Meade.net.Wrapper
         {
             SharedResources.WriteProfile(profileProperties);
         }
+
+        public void SetParked(bool atPark, ParkedPosition parkedPosition)
+        {
+            SharedResources.SetParked(atPark, parkedPosition);
+        }
+
+        public bool IsParked => SharedResources.IsParked;
+
+        public ParkedPosition ParkedPosition => SharedResources.ParkedPosition;
     }
 }