From fd4c5242649671d857f50b0d564d6dd20ee7e32c Mon Sep 17 00:00:00 2001
From: Colin Dawson <me@cjdawson.com>
Date: Fri, 24 Jun 2022 20:05:40 +0100
Subject: [PATCH 01/21] Upgraded requirements to need Ascom 6.6.0 and .net
 framework 4.8 or higher.

---
 FocuserTestConsole/FocuserTestConsole.csproj     | 2 +-
 FocuserTestConsole/app.config                    | 2 +-
 Meade.net.Setup/Product.wxs                      | 8 ++++----
 TelescopeTestConsole/TelescopeTestConsole.csproj | 2 +-
 TelescopeTestConsole/app.config                  | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/FocuserTestConsole/FocuserTestConsole.csproj b/FocuserTestConsole/FocuserTestConsole.csproj
index a0e33a3..0b2500d 100644
--- a/FocuserTestConsole/FocuserTestConsole.csproj
+++ b/FocuserTestConsole/FocuserTestConsole.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ASCOM.MeadeGeneric</RootNamespace>
     <AssemblyName>ASCOM.MeadeGeneric.Test</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
diff --git a/FocuserTestConsole/app.config b/FocuserTestConsole/app.config
index c5e1dae..786a845 100644
--- a/FocuserTestConsole/app.config
+++ b/FocuserTestConsole/app.config
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
diff --git a/Meade.net.Setup/Product.wxs b/Meade.net.Setup/Product.wxs
index e2e47d8..a9c6429 100644
--- a/Meade.net.Setup/Product.wxs
+++ b/Meade.net.Setup/Product.wxs
@@ -21,13 +21,13 @@
                       Type="raw" />
     </Property>
 
-    <Condition Message="This application requires Ascom Platform 6.4 SP1 or higher. Please install this before installing the driver.">
-      <![CDATA[Installed OR ASCOMPLATFORMVERSION >= "6.4.1"]]>
+    <Condition Message="This application requires Ascom Platform 6.6.0 higher. Please install this before installing the driver.">
+      <![CDATA[Installed OR ASCOMPLATFORMVERSION >= "6.6.0"]]>
     </Condition>
 
     <PropertyRef Id="NETFRAMEWORK45"/>
-    <Condition Message="This application requires .NET Framework 4.5 or higher. Please install the .NET Framework then run this installer again.">
-      <![CDATA[Installed OR NETFRAMEWORK45]]>
+    <Condition Message="This application requires .NET Framework 4.8 or higher. Please install the .NET Framework then run this installer again.">
+      <![CDATA[Installed OR Net48_Installed]]>
     </Condition>
 
     <!-- <Condition Message="Please use the correct installer for your operating system - x86 for 32-bit, x64 for 64-bit.">
diff --git a/TelescopeTestConsole/TelescopeTestConsole.csproj b/TelescopeTestConsole/TelescopeTestConsole.csproj
index 8a979b0..4d30bf2 100644
--- a/TelescopeTestConsole/TelescopeTestConsole.csproj
+++ b/TelescopeTestConsole/TelescopeTestConsole.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ASCOM.Meade.net</RootNamespace>
     <AssemblyName>ASCOM.Meade.net.Test</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
diff --git a/TelescopeTestConsole/app.config b/TelescopeTestConsole/app.config
index c5e1dae..786a845 100644
--- a/TelescopeTestConsole/app.config
+++ b/TelescopeTestConsole/app.config
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

From 0806696d30daaa0bcbd4801f2cf2c75e3365a43b Mon Sep 17 00:00:00 2001
From: Colin Dawson <me@cjdawson.com>
Date: Mon, 27 Jun 2022 21:25:58 +0100
Subject: [PATCH 02/21] Added support for allowing pulse guiding for AltAz
 telescope using older guiding method.

---
 .../Meade.net.Telescope.v3.ncrunchproject         |  3 +++
 Meade.net.Telescope/Telescope.cs                  | 15 ++++++++++-----
 .../Meade.net.focuser.v3.ncrunchproject           |  3 +++
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/Meade.net.Telescope/Meade.net.Telescope.v3.ncrunchproject b/Meade.net.Telescope/Meade.net.Telescope.v3.ncrunchproject
index 54c2f06..e3727d7 100644
--- a/Meade.net.Telescope/Meade.net.Telescope.v3.ncrunchproject
+++ b/Meade.net.Telescope/Meade.net.Telescope.v3.ncrunchproject
@@ -1,5 +1,8 @@
 <ProjectConfiguration>
   <Settings>
+    <HiddenComponentWarnings>
+      <Value>CopyReferencedAssembliesToWorkspaceIsOn</Value>
+    </HiddenComponentWarnings>
     <UseCPUArchitecture>x86</UseCPUArchitecture>
   </Settings>
 </ProjectConfiguration>
\ No newline at end of file
diff --git a/Meade.net.Telescope/Telescope.cs b/Meade.net.Telescope/Telescope.cs
index cc0e097..0578ed8 100644
--- a/Meade.net.Telescope/Telescope.cs
+++ b/Meade.net.Telescope/Telescope.cs
@@ -488,9 +488,9 @@ namespace ASCOM.Meade.net
                                 LogMessage("Connected Set",
                                     $"Connected to port {_profileProperties.ComPort}. Product: {SharedResourcesWrapper.ProductName} Version:{SharedResourcesWrapper.FirmwareVersion}");
 
-                                _userNewerPulseGuiding = IsNewPulseGuidingSupported();
+                                _useNewerPulseGuiding = IsNewPulseGuidingSupported();
 
-                                LogMessage("Connected Set", $"New Pulse Guiding Supported: {_userNewerPulseGuiding}");
+                                LogMessage("Connected Set", $"New Pulse Guiding Supported: {_useNewerPulseGuiding}");
                                 IsConnected = true;
 
                                 if (connectionInfo.SameDevice == 1)
@@ -1523,7 +1523,12 @@ namespace ASCOM.Meade.net
                 try
                 {
                     CheckConnected("CanPulseGuide");
-                    var canPulseGuide = AlignmentMode != AlignmentModes.algAltAz;
+                    
+                    var canPulseGuide = true;
+
+                    if (_useNewerPulseGuiding)
+                        canPulseGuide = AlignmentMode != AlignmentModes.algAltAz;
+                    
                     LogMessage("CanPulseGuide", $"Get - {canPulseGuide}");
                     return canPulseGuide;
                 }
@@ -2284,7 +2289,7 @@ namespace ASCOM.Meade.net
             }
         }
 
-        private bool _userNewerPulseGuiding = true;
+        private bool _useNewerPulseGuiding = true;
 
         public void PulseGuide(GuideDirections direction, int duration)
         {
@@ -2312,7 +2317,7 @@ namespace ASCOM.Meade.net
 
                     var coordinatesBeforeMove = GetTelescopeRaAndDec();
 
-                    if (_userNewerPulseGuiding)
+                    if (_useNewerPulseGuiding)
                     {
                         string d = string.Empty;
                         switch (direction)
diff --git a/Meade.net.focuser/Meade.net.focuser.v3.ncrunchproject b/Meade.net.focuser/Meade.net.focuser.v3.ncrunchproject
index 54c2f06..e3727d7 100644
--- a/Meade.net.focuser/Meade.net.focuser.v3.ncrunchproject
+++ b/Meade.net.focuser/Meade.net.focuser.v3.ncrunchproject
@@ -1,5 +1,8 @@
 <ProjectConfiguration>
   <Settings>
+    <HiddenComponentWarnings>
+      <Value>CopyReferencedAssembliesToWorkspaceIsOn</Value>
+    </HiddenComponentWarnings>
     <UseCPUArchitecture>x86</UseCPUArchitecture>
   </Settings>
 </ProjectConfiguration>
\ No newline at end of file

From 9b2818ddbaa265d17895195cceddd1acd2a517dd Mon Sep 17 00:00:00 2001
From: Colin Dawson <me@cjdawson.com>
Date: Mon, 27 Jun 2022 21:55:09 +0100
Subject: [PATCH 03/21] Added pseudocode for detecting StarPatch firmware

---
 Meade.net.Telescope/Telescope.cs | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/Meade.net.Telescope/Telescope.cs b/Meade.net.Telescope/Telescope.cs
index 0578ed8..33981c2 100644
--- a/Meade.net.Telescope/Telescope.cs
+++ b/Meade.net.Telescope/Telescope.cs
@@ -489,6 +489,7 @@ namespace ASCOM.Meade.net
                                     $"Connected to port {_profileProperties.ComPort}. Product: {SharedResourcesWrapper.ProductName} Version:{SharedResourcesWrapper.FirmwareVersion}");
 
                                 _useNewerPulseGuiding = IsNewPulseGuidingSupported();
+                                _isStarPatch = IsStarPatch();
 
                                 LogMessage("Connected Set", $"New Pulse Guiding Supported: {_useNewerPulseGuiding}");
                                 IsConnected = true;
@@ -599,6 +600,17 @@ namespace ASCOM.Meade.net
             }
         }
 
+        private bool IsStarPatch()
+        {
+            //Todo add tests to see if the firmware is star patch.
+            //Check if last character is a letter
+            //   lower case = Meade, upper case = StarPatch
+            //If last character is a number
+            //  Get case of second to last character
+            //   lower case = StarPatch, upper case = Meade
+            return false;
+        }
+
         private void SendCurrentDateTime(string connect)
         {
             if (_profileProperties.SendDateTime)
@@ -1528,7 +1540,10 @@ namespace ASCOM.Meade.net
 
                     if (_useNewerPulseGuiding)
                         canPulseGuide = AlignmentMode != AlignmentModes.algAltAz;
-                    
+
+                    if (_isStarPatch)
+                        canPulseGuide = true;
+
                     LogMessage("CanPulseGuide", $"Get - {canPulseGuide}");
                     return canPulseGuide;
                 }
@@ -2290,6 +2305,7 @@ namespace ASCOM.Meade.net
         }
 
         private bool _useNewerPulseGuiding = true;
+        private bool _isStarPatch = false;
 
         public void PulseGuide(GuideDirections direction, int duration)
         {

From 0066a6ebed7741f981ea74dfd969bce3fa6ad3ee Mon Sep 17 00:00:00 2001
From: Colin Dawson <me@cjdawson.com>
Date: Tue, 28 Jun 2022 17:45:55 +0100
Subject: [PATCH 04/21] Fixed broken unit test

---
 Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs b/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
index 6195dc9..2f01bbb 100644
--- a/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
+++ b/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
@@ -1027,7 +1027,7 @@ namespace Meade.net.Telescope.UnitTests
 
             _connectionInfo.SameDevice = 2;
 
-            _telescope.Connected = true;
+            ConnectTelescope();
 
             _sharedResourcesWrapperMock.Verify(x => x.SendChar("P", false), Times.Never);
             _sharedResourcesWrapperMock.Verify(x => x.IsLongFormat, Times.Once);

From 42f2f458662673986b93ed6237ce9b08ed37b0c4 Mon Sep 17 00:00:00 2001
From: Colin Dawson <me@cjdawson.com>
Date: Tue, 28 Jun 2022 18:47:33 +0100
Subject: [PATCH 05/21] Added test for StarParch firmware.  PulseGuiding is
 always enabled.

---
 .../TelescopeUnitTests.cs                     | 21 ++++++++-----
 Meade.net.Telescope/Telescope.cs              | 30 ++++++++++++++-----
 2 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs b/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
index 2f01bbb..6bf096d 100644
--- a/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
+++ b/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
@@ -916,24 +916,31 @@ namespace Meade.net.Telescope.UnitTests
             Assert.That(result, Is.True);
         }
 
-        [Test]
-        public void CanPulseGuide_GetInPolarMode_ReturnsTrue()
+        [TestCase("Autostar", "43Eg")]
+        public void CanPulseGuide_GetInPolarMode_ReturnsTrue(string productName, string firmware)
         {
             _testProperties.AlignmentMode = "P";
-            ConnectTelescope();
+
+            ConnectTelescope(productName, firmware, $"{_testProperties.AlignmentMode}N0");
             var result = _telescope.CanPulseGuide;
 
             Assert.That(result, Is.True);
         }
 
-        [Test]
-        public void CanPulseGuide_GetInAltAzMode_ReturnsFalse()
+        [TestCase("Autostar", "30Ab", true)]
+        [TestCase("Autostar", "43Eg", false)]
+        [TestCase("Autostar", "A4S4", false)]
+        [TestCase("Autostar", "43EG", true)]
+        [TestCase("Autostar", "A4s4", true)]
+        public void CanPulseGuide_GetInAltAzMode_ReturnsExpectedResult(string productName, string firmware, bool canPulseGuide)
         {
             _testProperties.AlignmentMode = "A";
-            ConnectTelescope();
+
+            ConnectTelescope(productName, firmware, $"{_testProperties.AlignmentMode}N0");
+
             var result = _telescope.CanPulseGuide;
 
-            Assert.That(result, Is.False);
+            Assert.That(result, Is.EqualTo(canPulseGuide));
         }
 
         [Test]
diff --git a/Meade.net.Telescope/Telescope.cs b/Meade.net.Telescope/Telescope.cs
index 33981c2..7921107 100644
--- a/Meade.net.Telescope/Telescope.cs
+++ b/Meade.net.Telescope/Telescope.cs
@@ -602,13 +602,29 @@ namespace ASCOM.Meade.net
 
         private bool IsStarPatch()
         {
-            //Todo add tests to see if the firmware is star patch.
-            //Check if last character is a letter
-            //   lower case = Meade, upper case = StarPatch
-            //If last character is a number
-            //  Get case of second to last character
-            //   lower case = StarPatch, upper case = Meade
-            return false;
+            var isStarPatch =  false;
+
+            var firmwareVersionArray = SharedResourcesWrapper.FirmwareVersion.ToCharArray();
+            if (firmwareVersionArray.Length > 1)
+            {
+                //If last character is a number
+                var lastChr = firmwareVersionArray[firmwareVersionArray.Length - 1];
+                if (char.IsNumber(lastChr))
+                {
+                    //  Get case of second to last character
+                    var secondLastChar = firmwareVersionArray[firmwareVersionArray.Length - 2];
+                    //   lower case = StarPatch, upper case = Meade
+                    isStarPatch = char.IsLower(secondLastChar);
+                }
+                else
+                {
+                    //   lower case = Meade, upper case = StarPatch
+                    isStarPatch = char.IsUpper(lastChr);
+                }
+            }
+
+            LogMessage("Is StarPatch Firmware", $": {isStarPatch}");
+            return isStarPatch;
         }
 
         private void SendCurrentDateTime(string connect)

From e0d51eae81fc83840cfe51e5a1d01c45ea7986b3 Mon Sep 17 00:00:00 2001
From: Colin Dawson <me@cjdawson.com>
Date: Wed, 29 Jun 2022 18:41:51 +0100
Subject: [PATCH 06/21] Removed redundant code.

---
 Meade.net.Telescope/Telescope.cs | 78 ++------------------------------
 1 file changed, 4 insertions(+), 74 deletions(-)

diff --git a/Meade.net.Telescope/Telescope.cs b/Meade.net.Telescope/Telescope.cs
index 7921107..65b0b2e 100644
--- a/Meade.net.Telescope/Telescope.cs
+++ b/Meade.net.Telescope/Telescope.cs
@@ -458,8 +458,9 @@ namespace ASCOM.Meade.net
             {
                 try
                 {
-                    LogMessage("Connected", "Get {0}", IsConnected);
-                    return IsConnected;
+                    var isConnected = IsConnected;
+                    LogMessage("Connected", "Get {0}", isConnected);
+                    return isConnected;
                 }
                 catch (Exception ex)
                 {
@@ -754,7 +755,7 @@ namespace ASCOM.Meade.net
             }
         }
 
-        // true iff the mount will perform a meridian flip when required
+        // true if 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
@@ -767,76 +768,6 @@ namespace ASCOM.Meade.net
             return comparison >= 0;
         }
 
-        /// <summary>
-        /// classic LX200 needs initial set of target coordinates, if it is slewing and the target RA DE coordinates are 0 and differ from the current coordinates
-        /// </summary>
-        private bool IsTargetCoordinateInitRequired()
-        {
-            if (SharedResourcesWrapper.ProductName != TelescopeList.LX200CLASSIC)
-                return false;
-
-            if (!SharedResourcesWrapper.IsTargetCoordinateInitRequired)
-                return SharedResourcesWrapper.IsTargetCoordinateInitRequired;
-
-            if (!IsConnected)
-                return true;
-
-            if (SharedResourcesWrapper.ProductName != TelescopeList.LX200CLASSIC)
-            {
-                SharedResourcesWrapper.IsTargetCoordinateInitRequired = false;
-                return SharedResourcesWrapper.IsTargetCoordinateInitRequired;
-            }
-
-            const double eps = 0.00001d;
-
-            double rightTargetAscension = RightAscension;
-            //target RA == 0
-            if (Math.Abs(rightTargetAscension) > eps)
-            {
-                SharedResourcesWrapper.IsTargetCoordinateInitRequired = false;
-                return SharedResourcesWrapper.IsTargetCoordinateInitRequired;
-            }
-
-            double targetDeclination = Declination;
-            //target DE == 0
-            if (Math.Abs(targetDeclination) > eps)
-            {
-                SharedResourcesWrapper.IsTargetCoordinateInitRequired = false;
-                return SharedResourcesWrapper.IsTargetCoordinateInitRequired;
-            }
-
-            //target coordinates are equal current coordinates
-            if ((Math.Abs(RightAscension - rightTargetAscension) <= eps) &&
-                (Math.Abs(Declination - targetDeclination) <= eps))
-            {
-                LogMessage("IsTargetCoordinateInitRequired", "0 diff -> false");
-                SharedResourcesWrapper.IsTargetCoordinateInitRequired = false;
-                return SharedResourcesWrapper.IsTargetCoordinateInitRequired;
-            }
-
-            LogMessage("IsTargetCoordinateInitRequired", $"{SharedResourcesWrapper.IsTargetCoordinateInitRequired}");
-            return SharedResourcesWrapper.IsTargetCoordinateInitRequired;
-        }
-
-        private void InitTargetCoordinates()
-        {
-            try
-            {
-                var raAndDec = GetTelescopeRaAndDec();
-                //when connection the first time the telescope target coordinates should be the current ones.
-                //for the classic LX200 at least this is not the case, target ra and dec are 0, when switched on.
-                LogMessage("InitTargetCoordinates", "sync telescope target");
-                SyncToCoordinates(raAndDec.RightAscension, raAndDec.Declination);
-
-                //do it only once
-                SharedResourcesWrapper.IsTargetCoordinateInitRequired = false;
-            }
-            catch (Exception ex)
-            {
-                LogMessage("InitTargetCoordinates", "Error sync telescope position", ex.Message);
-            }
-        }
-
         public void SetLongFormat(bool setLongFormat)
         {
             try
@@ -2727,7 +2658,6 @@ namespace ASCOM.Meade.net
             }
         }
 
-
         public double SiteLongitude
         {
             get

From 519005d892ef5fc5cebba365b2e2dcccb2802b85 Mon Sep 17 00:00:00 2001
From: Colin Dawson <me@cjdawson.com>
Date: Wed, 13 Jul 2022 17:41:22 +0100
Subject: [PATCH 07/21] Fixed the property name for .net framework 4.8
 detection. Fixed Typo in the Ascom Platform required line.

---
 Meade.net.Setup/Product.wxs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Meade.net.Setup/Product.wxs b/Meade.net.Setup/Product.wxs
index a9c6429..86180e7 100644
--- a/Meade.net.Setup/Product.wxs
+++ b/Meade.net.Setup/Product.wxs
@@ -21,11 +21,11 @@
                       Type="raw" />
     </Property>
 
-    <Condition Message="This application requires Ascom Platform 6.6.0 higher. Please install this before installing the driver.">
+    <Condition Message="This application requires Ascom Platform 6.6.0 or higher. Please install this before installing the driver.">
       <![CDATA[Installed OR ASCOMPLATFORMVERSION >= "6.6.0"]]>
     </Condition>
 
-    <PropertyRef Id="NETFRAMEWORK45"/>
+    <PropertyRef Id="Net48_Installed"/>
     <Condition Message="This application requires .NET Framework 4.8 or higher. Please install the .NET Framework then run this installer again.">
       <![CDATA[Installed OR Net48_Installed]]>
     </Condition>

From 78e686b3cb1e85b49d7d2b3b4c88a3de30e673af Mon Sep 17 00:00:00 2001
From: Colin Dawson <me@cjdawson.com>
Date: Wed, 13 Jul 2022 17:55:56 +0100
Subject: [PATCH 08/21] Attempt to fix .net 4.8 install detection

---
 Meade.net.Setup/Product.wxs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Meade.net.Setup/Product.wxs b/Meade.net.Setup/Product.wxs
index 86180e7..83a573a 100644
--- a/Meade.net.Setup/Product.wxs
+++ b/Meade.net.Setup/Product.wxs
@@ -25,9 +25,9 @@
       <![CDATA[Installed OR ASCOMPLATFORMVERSION >= "6.6.0"]]>
     </Condition>
 
-    <PropertyRef Id="Net48_Installed"/>
+    <PropertyRef Id='WIXNETFX4RELEASEINSTALLED'/>
     <Condition Message="This application requires .NET Framework 4.8 or higher. Please install the .NET Framework then run this installer again.">
-      <![CDATA[Installed OR Net48_Installed]]>
+      <![CDATA[Installed OR (WIXNETFX4RELEASEINSTALLED >= "#528040")]]>
     </Condition>
 
     <!-- <Condition Message="Please use the correct installer for your operating system - x86 for 32-bit, x64 for 64-bit.">

From aff44494bccef2613a552f469df9075a42f38217 Mon Sep 17 00:00:00 2001
From: Colin Dawson <me@cjdawson.com>
Date: Fri, 15 Jul 2022 21:08:54 +0100
Subject: [PATCH 09/21] Added long enter and goto commands.

---
 Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs | 2 ++
 Meade.net.Telescope/Telescope.cs                    | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs b/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
index 6bf096d..4812a2b 100644
--- a/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
+++ b/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
@@ -233,6 +233,8 @@ namespace Meade.net.Telescope.UnitTests
         [TestCase("enter", "EK13")]
         [TestCase("mode", "EK9")]
         [TestCase("longMode", "EK11")]
+        [TestCase("longenter", "EK10")]
+        [TestCase("longgoto", "EK25")]
         [TestCase("goto", "EK24")]
         [TestCase("0", "EK48")]
         [TestCase("1", "EK49")]
diff --git a/Meade.net.Telescope/Telescope.cs b/Meade.net.Telescope/Telescope.cs
index 65b0b2e..d9ad0c3 100644
--- a/Meade.net.Telescope/Telescope.cs
+++ b/Meade.net.Telescope/Telescope.cs
@@ -220,6 +220,9 @@ namespace ASCOM.Meade.net
                             case "enter":
                                 SharedResourcesWrapper.SendBlind("EK13");
                                 break;
+                            case "longenter":
+                                SharedResourcesWrapper.SendBlind("EK10");
+                                break;
                             case "mode":
                                 SharedResourcesWrapper.SendBlind("EK9");
                                 break;
@@ -229,7 +232,9 @@ namespace ASCOM.Meade.net
                             case "goto":
                                 SharedResourcesWrapper.SendBlind("EK24");
                                 break;
-
+                            case "longgoto":
+                                SharedResourcesWrapper.SendBlind("EK25");
+                                break;
                             case "0": //light and 0
                                 SharedResourcesWrapper.SendBlind("EK48");
                                 break;

From 5f759161161e37da5de2cc16a0c5b31d7d2bc104 Mon Sep 17 00:00:00 2001
From: Colin Dawson <me@cjdawson.com>
Date: Sat, 16 Jul 2022 14:17:39 +0100
Subject: [PATCH 10/21] Added support for RCX400 using newer pulse guiding
 commands. Refactored the connect set to be a little less cluttered.

---
 .../TelescopeUnitTests.cs                     |  3 +-
 Meade.net.Telescope/Telescope.cs              | 85 +++++++++++--------
 Meade.net/TelescopeList.cs                    |  8 ++
 3 files changed, 58 insertions(+), 38 deletions(-)

diff --git a/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs b/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
index 4812a2b..960ebfe 100644
--- a/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
+++ b/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
@@ -638,7 +638,8 @@ namespace Meade.net.Telescope.UnitTests
         [TestCase("Auto", ":GVP", "", false)] //LX200 Classic
         [TestCase("Guide Rate Slew", "LX2001", "", false)] //force old style
         [TestCase("Pulse Guiding", ":GVP", "", true)] //force new style
-
+        [TestCase("Auto", "RCX400", "2.1i", false)] //don't what the real minimum firmware is.
+        [TestCase("Auto", "RCX400", "2.2i", true)]
         public void IsNewPulseGuidingSupported_ThenIsSupported_ThenReturnsTrue(string guidingStyle, string productName, string firmware, bool isSupported)
         {
             _profileProperties.GuidingStyle = guidingStyle;
diff --git a/Meade.net.Telescope/Telescope.cs b/Meade.net.Telescope/Telescope.cs
index d9ad0c3..65d77fe 100644
--- a/Meade.net.Telescope/Telescope.cs
+++ b/Meade.net.Telescope/Telescope.cs
@@ -522,39 +522,7 @@ namespace ASCOM.Meade.net
                                     SharedResourcesWrapper.TargetDeclination = InvalidParameter;
                                     SharedResourcesWrapper.TargetRightAscension = InvalidParameter;
 
-                                    LogMessage("Connected Set", $"SendDateTime: {_profileProperties.SendDateTime}");
-                                    if (_profileProperties.SendDateTime)
-                                    {
-                                        if (SharedResourcesWrapper.ProductName == TelescopeList.LX200GPS)
-                                        {
-                                            LogMessage("Connected Set",
-                                                $"LX200GPS Detecting if daylight savings message on screen: {_profileProperties.SendDateTime}");
-                                            var displayText = Action("Handbox", "readdisplay");
-                                            LogMessage("Connected Set", $"Current Handset display: {displayText}");
-                                            if (displayText.Contains("Daylight"))
-                                            {
-                                                LogMessage("Connected Set",
-                                                    $"LX200GPS Setting Date time and bypassing settings screens: {_profileProperties.SendDateTime}");
-                                                BypassHandboxEntryForAutostarII();
-                                            }
-                                            else
-                                            {
-                                                LogMessage("Connected Set",
-                                                    $"LX200GPS Sending current date and time: {_profileProperties.SendDateTime}");
-                                                SendCurrentDateTime("Connect");
-                                                LogMessage("Connected Set",
-                                                    $"LX200GPS Attempting manual bypass of prompts: {_profileProperties.SendDateTime}");
-                                                ApplySkipAutoStarPrompts("Connect");
-                                            }
-
-                                        }
-                                        else
-                                        {
-                                            LogMessage("Connected Set", "Autostar Attempting manual bypass of prompts");
-                                            ApplySkipAutoStarPrompts("Connect");
-                                            SendCurrentDateTime("Connect");
-                                        }
-                                    }
+                                    SendTimeTimeToHandbox();
 
                                     SharedResources.AlignmentMode = AlignmentMode;
                                 }
@@ -606,6 +574,42 @@ namespace ASCOM.Meade.net
             }
         }
 
+        private void SendTimeTimeToHandbox()
+        {
+            LogMessage("SendTimeTimeToHandbox", $"SendDateTime: {_profileProperties.SendDateTime}");
+            if (_profileProperties.SendDateTime)
+            {
+                if (SharedResourcesWrapper.ProductName == TelescopeList.LX200GPS)
+                {
+                    LogMessage("SendTimeTimeToHandbox",
+                        $"LX200GPS Detecting if daylight savings message on screen: {_profileProperties.SendDateTime}");
+                    var displayText = Action("Handbox", "readdisplay");
+                    LogMessage("SendTimeTimeToHandbox", $"Current Handset display: {displayText}");
+                    if (displayText.Contains("Daylight"))
+                    {
+                        LogMessage("SendTimeTimeToHandbox",
+                            $"LX200GPS Setting Date time and bypassing settings screens: {_profileProperties.SendDateTime}");
+                        BypassHandboxEntryForAutostarII();
+                    }
+                    else
+                    {
+                        LogMessage("SendTimeTimeToHandbox",
+                            $"LX200GPS Sending current date and time: {_profileProperties.SendDateTime}");
+                        SendCurrentDateTime();
+                        LogMessage("SendTimeTimeToHandbox",
+                            $"LX200GPS Attempting manual bypass of prompts: {_profileProperties.SendDateTime}");
+                        ApplySkipAutoStarPrompts();
+                    }
+                }
+                else
+                {
+                    LogMessage("Connected Set", "Autostar Attempting manual bypass of prompts");
+                    ApplySkipAutoStarPrompts();
+                    SendCurrentDateTime();
+                }
+            }
+        }
+
         private bool IsStarPatch()
         {
             var isStarPatch =  false;
@@ -633,7 +637,7 @@ namespace ASCOM.Meade.net
             return isStarPatch;
         }
 
-        private void SendCurrentDateTime(string connect)
+        private void SendCurrentDateTime()
         {
             if (_profileProperties.SendDateTime)
             {
@@ -641,9 +645,9 @@ namespace ASCOM.Meade.net
             }
         }
 
-        private void ApplySkipAutoStarPrompts(string connect)
+        private void ApplySkipAutoStarPrompts()
         {
-            if (SharedResourcesWrapper.ProductName == TelescopeList.LX200GPS)
+            if (SharedResourcesWrapper.ProductName == TelescopeList.LX200GPS || SharedResourcesWrapper.ProductName == TelescopeList.RCX400) 
             {
                 var displayText = Action("Handbox", "readdisplay");
 
@@ -715,6 +719,11 @@ namespace ASCOM.Meade.net
                             return true;
                         }
 
+                        if (SharedResourcesWrapper.ProductName == TelescopeList.RCX400)
+                        {
+                            return FirmwareIsGreaterThan(TelescopeList.RCX400_22I);
+                        }
+
                         return false;
                 }
             }
@@ -755,6 +764,8 @@ namespace ASCOM.Meade.net
                     return FirmwareIsGreaterThan(TelescopeList.Autostar497_43Eg);
                 case TelescopeList.LX200GPS:
                     return FirmwareIsGreaterThan(TelescopeList.LX200GPS_42G);
+                case TelescopeList.RCX400:
+                    return FirmwareIsGreaterThan(TelescopeList.RCX400_22I);
                 default:
                     return false;
             }
@@ -769,7 +780,7 @@ namespace ASCOM.Meade.net
         private bool FirmwareIsGreaterThan(string minVersion)
         {
             var currentVersion = SharedResourcesWrapper.FirmwareVersion;
-            var comparison = string.Compare(currentVersion, minVersion, StringComparison.Ordinal);
+            var comparison = string.Compare(currentVersion, minVersion, StringComparison.OrdinalIgnoreCase);
             return comparison >= 0;
         }
 
diff --git a/Meade.net/TelescopeList.cs b/Meade.net/TelescopeList.cs
index 42f92d0..1f5f99e 100644
--- a/Meade.net/TelescopeList.cs
+++ b/Meade.net/TelescopeList.cs
@@ -32,5 +32,13 @@
         // ReSharper disable once InconsistentNaming
         public const string LX200CLASSIC = "LX200 Classic"; //GVP command is not supported!
         #endregion
+
+        #region RCX400
+        // ReSharper disable once InconsistentNaming
+        public const string RCX400 = "RCX400";
+
+        public const string RCX400_22I = "2.2i";
+
+        #endregion
     }
 }

From 5f3157a58d8acccd7a32941db19e4cae593e7aa9 Mon Sep 17 00:00:00 2001
From: Colin Dawson <me@cjdawson.com>
Date: Sun, 17 Jul 2022 12:03:32 +0100
Subject: [PATCH 11/21] Refactored code Added support for setting the guide
 rate on the RCX400

---
 .../TelescopeUnitTests.cs                     |  21 +-
 Meade.net.Telescope/Telescope.cs              | 196 ++++++++++--------
 2 files changed, 114 insertions(+), 103 deletions(-)

diff --git a/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs b/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
index 960ebfe..e501ca3 100644
--- a/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
+++ b/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
@@ -965,24 +965,16 @@ namespace Meade.net.Telescope.UnitTests
             Assert.That(exception.Message, Is.EqualTo("Not connected to telescope when trying to execute: CanSetGuideRates Get"));
         }
 
-        [Test]
-        public void CanSetGuideRates_Get_WhenConnectedToAutostar_ThenReturnsFalse()
+        [TestCase(TelescopeList.Autostar497, TelescopeList.Autostar497_31Ee, false)]
+        [TestCase(TelescopeList.LX200GPS, TelescopeList.LX200GPS_42G, true )]
+        [TestCase(TelescopeList.RCX400, TelescopeList.RCX400_22I, true)]
+        public void CanSetGuideRates_Get_WhenConnectedToTelescope_ThenReturnsExpectedValue( string productName, string firmware, bool expectedResult)
         {
-            ConnectTelescope();
+            ConnectTelescope(productName, firmware);
 
             var result = _telescope.CanSetGuideRates;
 
-            Assert.That(result, Is.False);
-        }
-
-        [Test]
-        public void CanSetGuideRates_Get_WhenConnectedToLX200GPS_ThenReturnsTrue()
-        {
-            ConnectTelescope(TelescopeList.LX200GPS, TelescopeList.LX200GPS_42G);
-
-            var result = _telescope.CanSetGuideRates;
-
-            Assert.That(result, Is.True);
+            Assert.That(result, Is.EqualTo(expectedResult));
         }
 
         [Test]
@@ -1195,6 +1187,7 @@ namespace Meade.net.Telescope.UnitTests
         }
 
         [TestCase(TelescopeList.LX200GPS, TelescopeList.LX200GPS_42G, true)]
+        [TestCase(TelescopeList.RCX400, TelescopeList.RCX400_22I, true)]
         [TestCase(TelescopeList.Autostar497, TelescopeList.Autostar497_43Eg, false)]
         public void CanUnpark_Get_ReturnsExpectedValue(string productVersion, string firmware, bool expectedResult)
         {
diff --git a/Meade.net.Telescope/Telescope.cs b/Meade.net.Telescope/Telescope.cs
index 65d77fe..05b57bc 100644
--- a/Meade.net.Telescope/Telescope.cs
+++ b/Meade.net.Telescope/Telescope.cs
@@ -579,33 +579,38 @@ namespace ASCOM.Meade.net
             LogMessage("SendTimeTimeToHandbox", $"SendDateTime: {_profileProperties.SendDateTime}");
             if (_profileProperties.SendDateTime)
             {
-                if (SharedResourcesWrapper.ProductName == TelescopeList.LX200GPS)
+                switch (SharedResourcesWrapper.ProductName)
                 {
-                    LogMessage("SendTimeTimeToHandbox",
-                        $"LX200GPS Detecting if daylight savings message on screen: {_profileProperties.SendDateTime}");
-                    var displayText = Action("Handbox", "readdisplay");
-                    LogMessage("SendTimeTimeToHandbox", $"Current Handset display: {displayText}");
-                    if (displayText.Contains("Daylight"))
-                    {
+                    case TelescopeList.LX200GPS:
+                    case TelescopeList.RCX400:
+                        {
                         LogMessage("SendTimeTimeToHandbox",
-                            $"LX200GPS Setting Date time and bypassing settings screens: {_profileProperties.SendDateTime}");
-                        BypassHandboxEntryForAutostarII();
+                            $"{SharedResourcesWrapper.ProductName} Detecting if daylight savings message on screen: {_profileProperties.SendDateTime}");
+                        var displayText = Action("Handbox", "readdisplay");
+                        LogMessage("SendTimeTimeToHandbox", $"Current Handset display: {displayText}");
+                        if (displayText.Contains("Daylight"))
+                        {
+                            LogMessage("SendTimeTimeToHandbox",
+                                $"{SharedResourcesWrapper.ProductName} Setting Date time and bypassing settings screens: {_profileProperties.SendDateTime}");
+                            BypassHandboxEntryForAutostarII();
+                        }
+                        else
+                        {
+                            LogMessage("SendTimeTimeToHandbox",
+                                $"{SharedResourcesWrapper.ProductName} Sending current date and time: {_profileProperties.SendDateTime}");
+                            SendCurrentDateTime();
+                            LogMessage("SendTimeTimeToHandbox",
+                                $"{SharedResourcesWrapper.ProductName} Attempting manual bypass of prompts: {_profileProperties.SendDateTime}");
+                            ApplySkipAutoStarPrompts();
+                        }
+
+                        break;
                     }
-                    else
-                    {
-                        LogMessage("SendTimeTimeToHandbox",
-                            $"LX200GPS Sending current date and time: {_profileProperties.SendDateTime}");
-                        SendCurrentDateTime();
-                        LogMessage("SendTimeTimeToHandbox",
-                            $"LX200GPS Attempting manual bypass of prompts: {_profileProperties.SendDateTime}");
+                    default:
+                        LogMessage("Connected Set", $"{SharedResourcesWrapper.ProductName} Attempting manual bypass of prompts");
                         ApplySkipAutoStarPrompts();
-                    }
-                }
-                else
-                {
-                    LogMessage("Connected Set", "Autostar Attempting manual bypass of prompts");
-                    ApplySkipAutoStarPrompts();
-                    SendCurrentDateTime();
+                        SendCurrentDateTime();
+                        break;
                 }
             }
         }
@@ -647,34 +652,42 @@ namespace ASCOM.Meade.net
 
         private void ApplySkipAutoStarPrompts()
         {
-            if (SharedResourcesWrapper.ProductName == TelescopeList.LX200GPS || SharedResourcesWrapper.ProductName == TelescopeList.RCX400) 
+            switch (SharedResourcesWrapper.ProductName)
             {
-                var displayText = Action("Handbox", "readdisplay");
-
-                if (displayText.Contains("Daylight"))
-                {
-                    for (var i = 0; i < 3; i++)
-                    {
-                        Action("Handbox", "enter");
-                        _utilities.WaitForMilliseconds(2000);
-                    }
-                }
-            }
-            else if (SharedResourcesWrapper.ProductName == TelescopeList.Autostar497)
-            {
-                var i = 10;
-                while (i > 0)
+                case TelescopeList.LX200GPS:
+                case TelescopeList.RCX400:
                 {
                     var displayText = Action("Handbox", "readdisplay");
-                    if (displayText.Contains("Align:"))
+
+                    if (displayText.Contains("Daylight"))
                     {
-                        i = 0;
-                        continue;
+                        for (var i = 0; i < 3; i++)
+                        {
+                            Action("Handbox", "enter");
+                            _utilities.WaitForMilliseconds(2000);
+                        }
                     }
 
-                    Action("Handbox", "mode");
-                    _utilities.WaitForMilliseconds(500);
-                    i--;
+                    break;
+                }
+                default:
+                {
+                    var i = 10;
+                    while (i > 0)
+                    {
+                        var displayText = Action("Handbox", "readdisplay");
+                        if (displayText.Contains("Align:"))
+                        {
+                            i = 0;
+                            continue;
+                        }
+
+                        Action("Handbox", "mode");
+                        _utilities.WaitForMilliseconds(500);
+                        i--;
+                    }
+
+                    break;
                 }
             }
         }
@@ -707,24 +720,18 @@ namespace ASCOM.Meade.net
                         return false;
                     case "pulse guiding":
                         return true;
-
                     default:
-                        if (SharedResourcesWrapper.ProductName == TelescopeList.Autostar497)
+                        switch (SharedResourcesWrapper.ProductName)
                         {
-                            return FirmwareIsGreaterThan(TelescopeList.Autostar497_31Ee);
+                            case TelescopeList.Autostar497:
+                                return FirmwareIsGreaterThan(TelescopeList.Autostar497_31Ee);
+                            case TelescopeList.LX200GPS:
+                                return true;
+                            case TelescopeList.RCX400:
+                                return FirmwareIsGreaterThan(TelescopeList.RCX400_22I);
+                            default:
+                                return false;
                         }
-
-                        if (SharedResourcesWrapper.ProductName == TelescopeList.LX200GPS)
-                        {
-                            return true;
-                        }
-
-                        if (SharedResourcesWrapper.ProductName == TelescopeList.RCX400)
-                        {
-                            return FirmwareIsGreaterThan(TelescopeList.RCX400_22I);
-                        }
-
-                        return false;
                 }
             }
             catch (Exception ex)
@@ -746,12 +753,14 @@ namespace ASCOM.Meade.net
 
         private bool IsGuideRateSettingSupported()
         {
-            if (SharedResourcesWrapper.ProductName == TelescopeList.LX200GPS)
+            switch (SharedResourcesWrapper.ProductName)
             {
-                return true;
+                case TelescopeList.LX200GPS:
+                case TelescopeList.RCX400:
+                    return true;
+                default:
+                    return false;
             }
-
-            return false;
         }
 
         private bool IsGwCommandSupported()
@@ -1230,14 +1239,16 @@ namespace ASCOM.Meade.net
                 {
                     CheckConnected("Altitude Get");
 
-                    if (SharedResourcesWrapper.ProductName == TelescopeList.LX200GPS)
+                    switch (SharedResourcesWrapper.ProductName)
                     {
-                        return GetRealTelescopeAltitude();
+                        case TelescopeList.LX200GPS:
+                        case TelescopeList.RCX400:
+                            return GetRealTelescopeAltitude();
+                        default:
+                            var altAz = CalcAltAzFromTelescopeEqData();
+                            LogMessage("Altitude", $"{altAz.Altitude}");
+                            return altAz.Altitude;
                     }
-
-                    var altAz = CalcAltAzFromTelescopeEqData();
-                    LogMessage("Altitude", $"{altAz.Altitude}");
-                    return altAz.Altitude;
                 }
                 catch (Exception ex)
                 {
@@ -1394,14 +1405,16 @@ namespace ASCOM.Meade.net
                 {
                     CheckConnected("Azimuth Get");
 
-                    if (SharedResourcesWrapper.ProductName == TelescopeList.LX200GPS)
+                    switch (SharedResourcesWrapper.ProductName)
                     {
-                        return GetRealTelescopeAzimuth();
+                        case TelescopeList.LX200GPS:
+                        case TelescopeList.RCX400:
+                            return GetRealTelescopeAzimuth();
+                        default:
+                            var altAz = CalcAltAzFromTelescopeEqData();
+                            LogMessage("Azimuth Get", $"{altAz.Azimuth}");
+                            return altAz.Azimuth;
                     }
-
-                    var altAz = CalcAltAzFromTelescopeEqData();
-                    LogMessage("Azimuth Get", $"{altAz.Azimuth}");
-                    return altAz.Azimuth;
                 }
                 catch (Exception ex)
                 {
@@ -1754,6 +1767,7 @@ namespace ASCOM.Meade.net
                 var unParkableScopes = new List<string>
                 {
                     TelescopeList.LX200GPS,
+                    TelescopeList.RCX400,
                     TelescopeList.LX200CLASSIC
                 };
 
@@ -3812,22 +3826,26 @@ namespace ASCOM.Meade.net
                 if (!AtPark)
                     return;
 
-                if (SharedResourcesWrapper.ProductName == TelescopeList.LX200GPS)
+                switch (SharedResourcesWrapper.ProductName)
                 {
+                    case TelescopeList.RCX400:
+                    case TelescopeList.LX200GPS:
+                        SharedResourcesWrapper.SendChar("I");
+                        //:I# LX200 GPS Only - Causes the telescope to cease current operations and restart at its power on initialization.
+                        //Returns: X once the handset restart has completed
 
-                    SharedResourcesWrapper.SendChar("I");
-                    //:I# LX200 GPS Only - Causes the telescope to cease current operations and restart at its power on initialization.
-                    //Returns: X once the handset restart has completed
-
-                    BypassHandboxEntryForAutostarII();
-                }
-                else if (SharedResourcesWrapper.ProductName == TelescopeList.LX200CLASSIC)
-                {
-                    if (SharedResourcesWrapper.RestartTracking)
+                        BypassHandboxEntryForAutostarII();
+                        break;
+                    case TelescopeList.LX200CLASSIC:
                     {
-                        LogMessage("Unpark", "Turning tracking on");
-                        Tracking = true;
-                        LogMessage("Unpark", "Turning tracking on completed");
+                        if (SharedResourcesWrapper.RestartTracking)
+                        {
+                            LogMessage("Unpark", "Turning tracking on");
+                            Tracking = true;
+                            LogMessage("Unpark", "Turning tracking on completed");
+                        }
+
+                        break;
                     }
                 }
 

From 57a76383bc5254a38f0cd26f873c924a97d12e85 Mon Sep 17 00:00:00 2001
From: Colin Dawson <me@cjdawson.com>
Date: Sun, 17 Jul 2022 12:39:11 +0100
Subject: [PATCH 12/21] Added Wix installer as a nuget package.  Hopefully this
 will fix the new build agent.

---
 Meade.net.Setup/Meade.net.Setup.wixproj | 10 ++++++++++
 Meade.net.Setup/packages.config         |  4 ++++
 2 files changed, 14 insertions(+)
 create mode 100644 Meade.net.Setup/packages.config

diff --git a/Meade.net.Setup/Meade.net.Setup.wixproj b/Meade.net.Setup/Meade.net.Setup.wixproj
index a02f724..b981fc4 100644
--- a/Meade.net.Setup/Meade.net.Setup.wixproj
+++ b/Meade.net.Setup/Meade.net.Setup.wixproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\WiX.3.11.2\build\wix.props" Condition="Exists('..\packages\WiX.3.11.2\build\wix.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -8,6 +9,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <OutputName>Meade.net.Setup</OutputName>
     <OutputType>Package</OutputType>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
@@ -49,6 +52,7 @@
   <ItemGroup>
     <Content Include="Config.wxi" />
     <Content Include="License.rtf" />
+    <Content Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Meade.net.focuser\Meade.net.focuser.csproj">
@@ -81,6 +85,12 @@
   <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
     <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
   </Target>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\WiX.3.11.2\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WiX.3.11.2\build\wix.props'))" />
+  </Target>
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.
 	Other similar extension points exist, see Wix.targets.
diff --git a/Meade.net.Setup/packages.config b/Meade.net.Setup/packages.config
new file mode 100644
index 0000000..48182e9
--- /dev/null
+++ b/Meade.net.Setup/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="WiX" version="3.11.2" />
+</packages>
\ No newline at end of file

From adeab53bd3d1a343e21b2decd1c11d40eed80884 Mon Sep 17 00:00:00 2001
From: Colin Dawson <me@cjdawson.com>
Date: Sun, 17 Jul 2022 12:46:41 +0100
Subject: [PATCH 13/21] Attempting to override project restore

---
 Meade.net.Setup/Meade.net.Setup.wixproj | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Meade.net.Setup/Meade.net.Setup.wixproj b/Meade.net.Setup/Meade.net.Setup.wixproj
index b981fc4..f729bf8 100644
--- a/Meade.net.Setup/Meade.net.Setup.wixproj
+++ b/Meade.net.Setup/Meade.net.Setup.wixproj
@@ -99,4 +99,12 @@
 	<Target Name="AfterBuild">
 	</Target>
 	-->
+  <!-- prevents NU1503 -->
+  <Target Name="_IsProjectRestoreSupported"
+          Returns="@(_ValidProjectsForRestore)">
+    <ItemGroup>
+      <_ValidProjectsForRestore Include="$(MSBuildProjectFullPath)" />
+    </ItemGroup>
+  </Target>
+  <Target Name="Restore" />
 </Project>
\ No newline at end of file

From 2a40807dc336105131094729d19711145617ac42 Mon Sep 17 00:00:00 2001
From: Colin Dawson <me@cjdawson.com>
Date: Sun, 17 Jul 2022 13:12:07 +0100
Subject: [PATCH 14/21] Revert "Attempting to override project restore"

This reverts commit adeab53bd3d1a343e21b2decd1c11d40eed80884.
---
 Meade.net.Setup/Meade.net.Setup.wixproj | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/Meade.net.Setup/Meade.net.Setup.wixproj b/Meade.net.Setup/Meade.net.Setup.wixproj
index f729bf8..b981fc4 100644
--- a/Meade.net.Setup/Meade.net.Setup.wixproj
+++ b/Meade.net.Setup/Meade.net.Setup.wixproj
@@ -99,12 +99,4 @@
 	<Target Name="AfterBuild">
 	</Target>
 	-->
-  <!-- prevents NU1503 -->
-  <Target Name="_IsProjectRestoreSupported"
-          Returns="@(_ValidProjectsForRestore)">
-    <ItemGroup>
-      <_ValidProjectsForRestore Include="$(MSBuildProjectFullPath)" />
-    </ItemGroup>
-  </Target>
-  <Target Name="Restore" />
 </Project>
\ No newline at end of file

From d996d6f8d66cde3272dd8e739b3380b21ccd5dfb Mon Sep 17 00:00:00 2001
From: Colin Dawson <me@cjdawson.com>
Date: Sun, 17 Jul 2022 13:12:07 +0100
Subject: [PATCH 15/21] Revert "Added Wix installer as a nuget package. 
 Hopefully this will fix the new build agent."

This reverts commit 57a76383bc5254a38f0cd26f873c924a97d12e85.
---
 Meade.net.Setup/Meade.net.Setup.wixproj | 10 ----------
 Meade.net.Setup/packages.config         |  4 ----
 2 files changed, 14 deletions(-)
 delete mode 100644 Meade.net.Setup/packages.config

diff --git a/Meade.net.Setup/Meade.net.Setup.wixproj b/Meade.net.Setup/Meade.net.Setup.wixproj
index b981fc4..a02f724 100644
--- a/Meade.net.Setup/Meade.net.Setup.wixproj
+++ b/Meade.net.Setup/Meade.net.Setup.wixproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\WiX.3.11.2\build\wix.props" Condition="Exists('..\packages\WiX.3.11.2\build\wix.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -9,8 +8,6 @@
     <SchemaVersion>2.0</SchemaVersion>
     <OutputName>Meade.net.Setup</OutputName>
     <OutputType>Package</OutputType>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
@@ -52,7 +49,6 @@
   <ItemGroup>
     <Content Include="Config.wxi" />
     <Content Include="License.rtf" />
-    <Content Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Meade.net.focuser\Meade.net.focuser.csproj">
@@ -85,12 +81,6 @@
   <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
     <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
   </Target>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\WiX.3.11.2\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WiX.3.11.2\build\wix.props'))" />
-  </Target>
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.
 	Other similar extension points exist, see Wix.targets.
diff --git a/Meade.net.Setup/packages.config b/Meade.net.Setup/packages.config
deleted file mode 100644
index 48182e9..0000000
--- a/Meade.net.Setup/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="WiX" version="3.11.2" />
-</packages>
\ No newline at end of file

From faf2692fae6f94e7abe01b424905a33720540bdb Mon Sep 17 00:00:00 2001
From: Colin Dawson <me@cjdawson.com>
Date: Tue, 19 Jul 2022 18:30:26 +0100
Subject: [PATCH 16/21] Added code to allow pulseguide commands to be sent to
 telescopes with StarPatch installed.

---
 Meade.net.Telescope/Telescope.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Meade.net.Telescope/Telescope.cs b/Meade.net.Telescope/Telescope.cs
index 05b57bc..a8a3c58 100644
--- a/Meade.net.Telescope/Telescope.cs
+++ b/Meade.net.Telescope/Telescope.cs
@@ -2294,8 +2294,11 @@ namespace ASCOM.Meade.net
                 if (IsSlewingToTarget())
                     throw new InvalidOperationException("Unable to PulseGuide whilst slewing to target.");
 
-                if (AlignmentMode == AlignmentModes.algAltAz)
-                    throw new InvalidOperationException("Unable to PulseGuide whilst in AltAz mode.");
+                if (!_isStarPatch)
+                {
+                    if (AlignmentMode == AlignmentModes.algAltAz)
+                        throw new InvalidOperationException("Unable to PulseGuide whilst in AltAz mode.");
+                }
 
                 SharedResourcesWrapper.IsGuiding = true;
                 try

From 0fbb2331cf91fdd2ed7d669fd3052f5d62a823f7 Mon Sep 17 00:00:00 2001
From: Colin Dawson <me@cjdawson.com>
Date: Tue, 19 Jul 2022 18:42:34 +0100
Subject: [PATCH 17/21] Added unit tests to show that StarPatch firmware can
 attempt pulse guide

---
 .../TelescopeUnitTests.cs                     | 51 +++++++++++++++++++
 Meade.net/TelescopeList.cs                    |  4 +-
 2 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs b/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
index e501ca3..f1fabbe 100644
--- a/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
+++ b/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
@@ -1701,6 +1701,57 @@ namespace Meade.net.Telescope.UnitTests
             _utilMock.Verify(x => x.WaitForMilliseconds(duration), Times.Once);
         }
 
+        [TestCase(GuideDirections.guideEast, 0, TelescopeList.LX200GPS, "4.2G")]
+        [TestCase(GuideDirections.guideWest, 0, TelescopeList.LX200GPS, "4.2G")]
+        [TestCase(GuideDirections.guideNorth, 0, TelescopeList.LX200GPS, "4.2G")]
+        [TestCase(GuideDirections.guideSouth, 0, TelescopeList.LX200GPS, "4.2G")]
+        [TestCase(GuideDirections.guideEast, 22161, TelescopeList.LX200GPS, "4.2G")]
+        [TestCase(GuideDirections.guideWest, 22161, TelescopeList.LX200GPS, "4.2G")]
+        [TestCase(GuideDirections.guideNorth, 22161, TelescopeList.LX200GPS, "4.2G")]
+        [TestCase(GuideDirections.guideSouth, 22161, TelescopeList.LX200GPS, "4.2G")]
+        [TestCase(GuideDirections.guideEast, 0, TelescopeList.RCX400, "2.2I")]
+        [TestCase(GuideDirections.guideWest, 0, TelescopeList.RCX400, "2.2I")]
+        [TestCase(GuideDirections.guideNorth, 0, TelescopeList.RCX400, "2.2I")]
+        [TestCase(GuideDirections.guideSouth, 0, TelescopeList.RCX400, "2.2I")]
+        [TestCase(GuideDirections.guideEast, 22161, TelescopeList.RCX400, "2.2I")]
+        [TestCase(GuideDirections.guideWest, 22161, TelescopeList.RCX400, "2.2I")]
+        [TestCase(GuideDirections.guideNorth, 22161, TelescopeList.RCX400, "2.2I")]
+        [TestCase(GuideDirections.guideSouth, 22161, TelescopeList.RCX400, "2.2I")]
+        [TestCase(GuideDirections.guideEast, 0, TelescopeList.Autostar497, "43EG")]
+        [TestCase(GuideDirections.guideWest, 0, TelescopeList.Autostar497, "43EG")]
+        [TestCase(GuideDirections.guideNorth, 0, TelescopeList.Autostar497, "43EG")]
+        [TestCase(GuideDirections.guideSouth, 0, TelescopeList.Autostar497, "43EG")]
+        [TestCase(GuideDirections.guideEast, 22161, TelescopeList.Autostar497, "43EG")]
+        [TestCase(GuideDirections.guideWest, 22161, TelescopeList.Autostar497, "43EG")]
+        [TestCase(GuideDirections.guideNorth, 22161, TelescopeList.Autostar497, "43EG")]
+        [TestCase(GuideDirections.guideSouth, 22161, TelescopeList.Autostar497, "43EG")]
+        public void PulseGuide_WhenConnectedInAlTAzModeAndUsingStarGPSFirmware_ThenSendsNewCommandsAndWaits(GuideDirections direction, int duration, string product, string firmware)
+        {            
+            ConnectTelescope(product, firmware, "AT0");
+
+            _telescope.PulseGuide(direction, duration);
+
+            string d = string.Empty;
+            switch (direction)
+            {
+                case GuideDirections.guideEast:
+                    d = "e";
+                    break;
+                case GuideDirections.guideWest:
+                    d = "w";
+                    break;
+                case GuideDirections.guideNorth:
+                    d = "n";
+                    break;
+                case GuideDirections.guideSouth:
+                    d = "s";
+                    break;
+            }
+
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind($"Mg{d}{duration:0000}", false));
+            _utilMock.Verify(x => x.WaitForMilliseconds(duration), Times.Once);
+        }
+
         [TestCase(GuideDirections.guideEast)]
         [TestCase(GuideDirections.guideWest)]
         [TestCase(GuideDirections.guideNorth)]
diff --git a/Meade.net/TelescopeList.cs b/Meade.net/TelescopeList.cs
index 1f5f99e..082ed89 100644
--- a/Meade.net/TelescopeList.cs
+++ b/Meade.net/TelescopeList.cs
@@ -23,9 +23,9 @@
         // ReSharper disable once InconsistentNaming
         public const string LX200GPS = "LX2001";
 
-        public const string LX200GPS_42F = "4.2F";
+        public const string LX200GPS_42F = "4.2f";
         // ReSharper disable once InconsistentNaming
-        public const string LX200GPS_42G = "4.2G";
+        public const string LX200GPS_42G = "4.2g";
         #endregion
 
         #region LX200EMC

From 6428e6d31b79a836078a69a4f6ae8e3045c424d2 Mon Sep 17 00:00:00 2001
From: Colin Dawson <me@cjdawson.com>
Date: Mon, 25 Jul 2022 15:53:29 +0100
Subject: [PATCH 18/21] Added the tracelogger to the calls that send the actual
 serial commands.

---
 .../FocuserUnitTests.cs                       |  33 +-
 .../TelescopeUnitTests.cs                     | 362 +++++++++---------
 Meade.net.Telescope/Telescope.cs              | 182 ++++-----
 .../SharedResourcesUnitTests.cs               |   2 +-
 Meade.net.focuser/Focuser.cs                  |  56 +--
 Meade.net/MeadeTelescopeBase.cs               |  11 +-
 Meade.net/SharedResources.cs                  |   2 +-
 Meade.net/Wrapper/SharedResourcesWrapper.cs   |  22 +-
 8 files changed, 338 insertions(+), 332 deletions(-)

diff --git a/Meade.net.Focuser.UnitTests/FocuserUnitTests.cs b/Meade.net.Focuser.UnitTests/FocuserUnitTests.cs
index a898637..e5699dc 100644
--- a/Meade.net.Focuser.UnitTests/FocuserUnitTests.cs
+++ b/Meade.net.Focuser.UnitTests/FocuserUnitTests.cs
@@ -15,6 +15,7 @@ namespace Meade.net.Focuser.UnitTests
     {
         private Mock<IUtil> _utilMock;
         private Mock<ISharedResourcesWrapper> _sharedResourcesWrapperMock;
+        private Mock<ITraceLogger> _traceLoggerMock;
 
         private ProfileProperties _profileProperties;
 
@@ -40,11 +41,13 @@ namespace Meade.net.Focuser.UnitTests
 
             _utilMock = new Mock<IUtil>();
 
+            _traceLoggerMock = new Mock<ITraceLogger>();
+
             _sharedResourcesWrapperMock = new Mock<ISharedResourcesWrapper>();
 
             _sharedResourcesWrapperMock.Setup(x => x.ReadProfile()).Returns(() => _profileProperties);
 
-            _focuser = new ASCOM.Meade.net.Focuser(_utilMock.Object, _sharedResourcesWrapperMock.Object);
+            _focuser = new ASCOM.Meade.net.Focuser(_utilMock.Object, _sharedResourcesWrapperMock.Object, _traceLoggerMock.Object);
         }
 
         private void ConnectFocuser()
@@ -117,7 +120,7 @@ namespace Meade.net.Focuser.UnitTests
 
             _focuser.CommandBlind(expectedMessage, raw);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(expectedMessage, raw), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, expectedMessage, raw), Times.Once);
         }
 
         [Test]
@@ -134,13 +137,13 @@ namespace Meade.net.Focuser.UnitTests
         public void CommandBool_WhenConnected_ThenSendsExpectedMessage(bool raw)
         {
             string expectedMessage = "test blind Message";
-            _sharedResourcesWrapperMock.Setup(x => x.SendBool(expectedMessage, raw)).Returns(true);
+            _sharedResourcesWrapperMock.Setup(x => x.SendBool(_traceLoggerMock.Object, expectedMessage, raw)).Returns(true);
 
             ConnectFocuser();
 
             var result = _focuser.CommandBool(expectedMessage, raw);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBool(expectedMessage, raw), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBool(_traceLoggerMock.Object, expectedMessage, raw), Times.Once);
             Assert.That(result, Is.True);
         }
 
@@ -161,11 +164,11 @@ namespace Meade.net.Focuser.UnitTests
 
             ConnectFocuser();
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(sendMessage, true)).Returns(() => expectedMessage);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, sendMessage, true)).Returns(() => expectedMessage);
 
             var actualMessage = _focuser.CommandString(sendMessage, true);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendString(sendMessage, true), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendString(_traceLoggerMock.Object, sendMessage, true), Times.Once);
             Assert.That(actualMessage, Is.EqualTo(expectedMessage));
         }
 
@@ -321,7 +324,7 @@ namespace Meade.net.Focuser.UnitTests
 
             _focuser.Halt();
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("FQ", false), Times.AtLeastOnce);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "FQ", false), Times.AtLeastOnce);
         }
 
         [Test]
@@ -411,13 +414,13 @@ namespace Meade.net.Focuser.UnitTests
 
             if (position < 0)
             {
-                _sharedResourcesWrapperMock.Verify(x => x.SendBlind("F-", false), Times.Once);
-                _sharedResourcesWrapperMock.Verify(x => x.SendBlind("F+", false), Times.Never);
+                _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "F-", false), Times.Once);
+                _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "F+", false), Times.Never);
             }
             else
             {
-                _sharedResourcesWrapperMock.Verify(x => x.SendBlind("F-", false), Times.Never);
-                _sharedResourcesWrapperMock.Verify(x => x.SendBlind("F+", false), Times.Once);
+                _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "F-", false), Times.Never);
+                _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "F+", false), Times.Once);
             }
 
             _utilMock.Verify(x => x.WaitForMilliseconds(Math.Abs(position)), Times.Once);
@@ -437,16 +440,16 @@ namespace Meade.net.Focuser.UnitTests
 
             if (position < 0)
             {
-                _sharedResourcesWrapperMock.Verify(x => x.SendBlind("F-", false), Times.Once);
-                _sharedResourcesWrapperMock.Verify(x => x.SendBlind("F+", false), Times.Never);
+                _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "F-", false), Times.Once);
+                _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "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-", false), Times.Once);
-                _sharedResourcesWrapperMock.Verify(x => x.SendBlind("F+", false), Times.Once);
+                _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "F-", false), Times.Once);
+                _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "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));
diff --git a/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs b/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
index f1fabbe..6c7565f 100644
--- a/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
+++ b/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
@@ -48,6 +48,7 @@ namespace Meade.net.Telescope.UnitTests
         private Mock<IAstroMaths> _astroMathsMock;
         private Mock<IClock> _clockMock;
         private Mock<INOVAS31> _novasMock;
+        private Mock<ITraceLogger> _traceLoggerMock;
 
         private ProfileProperties _profileProperties;
         private ConnectionInfo _connectionInfo;
@@ -92,9 +93,10 @@ namespace Meade.net.Telescope.UnitTests
             _utilMock = new Mock<IUtil>();
             _utilExtraMock = new Mock<IUtilExtra>();
             _astroUtilsMock = new Mock<IAstroUtils>();
+            _traceLoggerMock = new Mock<ITraceLogger>();
 
             _sharedResourcesWrapperMock = new Mock<ISharedResourcesWrapper>();
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("GZ", false)).Returns("DDD*MM’SS");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "GZ", false)).Returns("DDD*MM’SS");
 
             _sharedResourcesWrapperMock.Setup(x => x.ReadProfile()).Returns(() =>_profileProperties);
 
@@ -121,32 +123,32 @@ namespace Meade.net.Telescope.UnitTests
             _novasMock = new Mock<INOVAS31>();
 
             _telescope = new ASCOM.Meade.net.Telescope(_utilMock.Object, _utilExtraMock.Object, _astroUtilsMock.Object,
-                _sharedResourcesWrapperMock.Object, _astroMathsMock.Object, _clockMock.Object, _novasMock.Object);
+                _sharedResourcesWrapperMock.Object, _astroMathsMock.Object, _clockMock.Object, _novasMock.Object, _traceLoggerMock.Object);
         }
 
         private void ConnectTelescope(string productName = TelescopeList.Autostar497, string firmwareVersion = TelescopeList.Autostar497_31Ee, string alignmentStatus = "GT0")
         {
             _testProperties.AlignmentStatus = alignmentStatus.ToCharArray();
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendChars("GW", false, 3)).Returns(() => new string(_testProperties.AlignmentStatus));
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("GW", false)).Returns(() => new string(_testProperties.AlignmentStatus));
-            _sharedResourcesWrapperMock.Setup(x => x.SendBlind("AP", false)).Callback(() => _testProperties.AlignmentStatus[1] = 'T');
-            _sharedResourcesWrapperMock.Setup(x => x.SendBlind("AL", false)).Callback(() => _testProperties.AlignmentStatus[1] = 'N');
+            _sharedResourcesWrapperMock.Setup(x => x.SendChars(_traceLoggerMock.Object, "GW", false, 3)).Returns(() => new string(_testProperties.AlignmentStatus));
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "GW", false)).Returns(() => new string(_testProperties.AlignmentStatus));
+            _sharedResourcesWrapperMock.Setup(x => x.SendBlind(_traceLoggerMock.Object, "AP", false)).Callback(() => _testProperties.AlignmentStatus[1] = 'T');
+            _sharedResourcesWrapperMock.Setup(x => x.SendBlind(_traceLoggerMock.Object, "AL", false)).Callback(() => _testProperties.AlignmentStatus[1] = 'N');
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("Gt", false)).Returns( () => _testProperties.SiteLatitudeString);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "Gt", false)).Returns( () => _testProperties.SiteLatitudeString);
             _utilMock.Setup(x => x.DMSToDegrees(_testProperties.SiteLatitudeString)).Returns( () => _testProperties.SiteLatitudeValue);
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("GR", false)).Returns( () =>_testProperties.telescopeRaResult);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "GR", false)).Returns( () =>_testProperties.telescopeRaResult);
             _utilMock.Setup(x => x.HMSToHours(_testProperties.telescopeRaResult)).Returns( () => _testProperties.rightAscension);
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("GC", false)).Returns(() => _testProperties.telescopeDate);
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("GL", false)).Returns(() => _testProperties.telescopeTime);
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("GG", false)).Returns(() => _testProperties.telescopeUtcCorrection);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "GC", false)).Returns(() => _testProperties.telescopeDate);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "GL", false)).Returns(() => _testProperties.telescopeTime);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "GG", false)).Returns(() => _testProperties.telescopeUtcCorrection);
 
             _testProperties.TrackingRate = _siderealTrackingRate;
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("GT", false)).Returns(() => _testProperties.TrackingRate);
-            _sharedResourcesWrapperMock.Setup(x => x.SendBlind("TL", false)).Callback(() => _testProperties.TrackingRate = "57.9");
-            _sharedResourcesWrapperMock.Setup(x => x.SendBlind("TQ", false)).Callback(() => _testProperties.TrackingRate = _siderealTrackingRate);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "GT", false)).Returns(() => _testProperties.TrackingRate);
+            _sharedResourcesWrapperMock.Setup(x => x.SendBlind(_traceLoggerMock.Object, "TL", false)).Callback(() => _testProperties.TrackingRate = "57.9");
+            _sharedResourcesWrapperMock.Setup(x => x.SendBlind(_traceLoggerMock.Object, "TQ", false)).Callback(() => _testProperties.TrackingRate = _siderealTrackingRate);
 
             _sharedResourcesWrapperMock.Setup(x => x.ProductName).Returns(() => productName);
             _sharedResourcesWrapperMock.Setup(x => x.FirmwareVersion).Returns(() => firmwareVersion);
@@ -158,7 +160,7 @@ namespace Meade.net.Telescope.UnitTests
             });
 
             const char ack = (char)6;
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar(ack.ToString(), false)).Returns( () => _testProperties.AlignmentMode);
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, ack.ToString(), false)).Returns( () => _testProperties.AlignmentMode);
 
             _sharedResourcesWrapperMock.SetupGet(x => x.IsParked).Returns(() => _isParked);
             _sharedResourcesWrapperMock.SetupGet(x => x.ParkedPosition).Returns(() => _parkedPosition);
@@ -221,12 +223,12 @@ namespace Meade.net.Telescope.UnitTests
         public void Action_Handbox_ReadDisplay()
         {
             string expectedResult = "test result string";
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("ED", false)).Returns(expectedResult);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "ED", false)).Returns(expectedResult);
             ConnectTelescope();
 
             var actualResult = _telescope.Action("handbox", "readdisplay");
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendString("ED", false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendString(_traceLoggerMock.Object, "ED", false), Times.Once);
             Assert.That(actualResult, Is.EqualTo(expectedResult));
         }
 
@@ -261,7 +263,7 @@ namespace Meade.net.Telescope.UnitTests
 
             _telescope.Action("handbox", action);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(expectedString, false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, expectedString, false), Times.Once);
         }
 
         [TestCase("1")]
@@ -275,7 +277,7 @@ namespace Meade.net.Telescope.UnitTests
             string parameters = $"select {site}";
             _telescope.Action("site", parameters);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind($"W{site}", false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, $"W{site}", false), Times.Once);
         }
 
         [TestCase("0")]
@@ -296,14 +298,14 @@ namespace Meade.net.Telescope.UnitTests
         [TestCase("4", "GP", "Parents")]
         public void Action_Site_GetName_WhenCallingWithValidValues_ThenSelectsCorrectSite(string site, string telescopeCommand, string siteName)
         {
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(telescopeCommand, false)).Returns(siteName);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, telescopeCommand, false)).Returns(siteName);
 
             ConnectTelescope();
 
             string parameters = $"GetName {site}";
             var result = _telescope.Action("site", parameters);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendString(telescopeCommand, false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendString(_traceLoggerMock.Object, telescopeCommand, false), Times.Once);
             Assert.That(result, Is.EqualTo(siteName));
         }
 
@@ -337,14 +339,14 @@ namespace Meade.net.Telescope.UnitTests
         public void Action_Site_SetName_WhenCallingWithValidValues_ThenSelectsCorrectSite(string site, string telescopeCommand, string siteName)
         {
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar(telescopeCommand, false)).Returns("1");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, telescopeCommand, false)).Returns("1");
 
             ConnectTelescope();
 
             string parameters = $"SetName {site} {siteName}";
             _telescope.Action("site", parameters);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendChar(telescopeCommand, false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendChar(_traceLoggerMock.Object, telescopeCommand, false), Times.Once);
         }
 
         [TestCase("0")]
@@ -412,7 +414,7 @@ namespace Meade.net.Telescope.UnitTests
 
             _telescope.CommandBlind(expectedMessage, raw);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(expectedMessage, raw), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, expectedMessage, raw), Times.Once);
         }
 
         [Test]
@@ -430,13 +432,13 @@ namespace Meade.net.Telescope.UnitTests
         public void CommandBool_WhenConnected_ThenSendsExpectedMessage(bool raw)
         {
             string expectedMessage = "test blind Message";
-            _sharedResourcesWrapperMock.Setup(x => x.SendBool(expectedMessage, raw)).Returns(true);
+            _sharedResourcesWrapperMock.Setup(x => x.SendBool(_traceLoggerMock.Object, expectedMessage, raw)).Returns(true);
 
             ConnectTelescope();
 
             var result = _telescope.CommandBool(expectedMessage, raw);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBool(expectedMessage, raw), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBool(_traceLoggerMock.Object, expectedMessage, raw), Times.Once);
             Assert.That(result, Is.True);
         }
 
@@ -456,13 +458,13 @@ namespace Meade.net.Telescope.UnitTests
             string expectedMessage = "expected result message";
             string sendMessage = "test blind Message";
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(sendMessage, raw)).Returns(() => expectedMessage);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, sendMessage, raw)).Returns(() => expectedMessage);
 
             ConnectTelescope();
 
             var actualMessage = _telescope.CommandString(sendMessage, raw);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendString(sendMessage, raw), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendString(_traceLoggerMock.Object, sendMessage, raw), Times.Once);
             Assert.That(actualMessage, Is.EqualTo(expectedMessage));
         }
 
@@ -480,8 +482,8 @@ namespace Meade.net.Telescope.UnitTests
 
             if (expectedConnected)
             {
-                _sharedResourcesWrapperMock.Verify(x => x.SendString("GZ", false), Times.AtLeastOnce);
-                _sharedResourcesWrapperMock.Verify(x => x.SendBlind($"Rg{_profileProperties.GuideRateArcSecondsPerSecond:00.0}", false), Times.Never);
+                _sharedResourcesWrapperMock.Verify(x => x.SendString(_traceLoggerMock.Object, "GZ", false), Times.AtLeastOnce);
+                _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, $"Rg{_profileProperties.GuideRateArcSecondsPerSecond:00.0}", false), Times.Never);
             }
         }
 
@@ -491,9 +493,9 @@ namespace Meade.net.Telescope.UnitTests
             ConnectTelescope(TelescopeList.LX200GPS, string.Empty);
 
             _sharedResourcesWrapperMock.Verify(x => x.Connect("Serial", It.IsAny<string>(), It.IsAny<ITraceLogger>()), Times.Once);
-            _sharedResourcesWrapperMock.Verify(x => x.SendString("GZ", false), Times.AtLeastOnce);
+            _sharedResourcesWrapperMock.Verify(x => x.SendString(_traceLoggerMock.Object, "GZ", false), Times.AtLeastOnce);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind($"Rg{_profileProperties.GuideRateArcSecondsPerSecond:00.0}", false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, $"Rg{_profileProperties.GuideRateArcSecondsPerSecond:00.0}", false), Times.Once);
         }
 
         [Test]
@@ -508,12 +510,12 @@ namespace Meade.net.Telescope.UnitTests
             string setDateCommand = $"hI{testNow:yyMMddHHmmss}";
 
             string expectedResult = "Daylight Savings Time:";
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("ED", false)).Returns(expectedResult);
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar(setDateCommand, false)).Returns("1");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "ED", false)).Returns(expectedResult);
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, setDateCommand, false)).Returns("1");
 
             ConnectTelescope(TelescopeList.LX200GPS, string.Empty);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendChar(setDateCommand, false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendChar(_traceLoggerMock.Object, setDateCommand, false), Times.Once);
         }
 
         [Test]
@@ -531,14 +533,14 @@ namespace Meade.net.Telescope.UnitTests
             string setDateCommand = $"hI{endSlewingDatetime:yyMMddHHmmss}";
 
             string expectedResult = "Align";
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("ED", false)).Returns(expectedResult);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "ED", false)).Returns(expectedResult);
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar($"SL{telescopeTime}", false)).Returns("1");
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar($"SC{telescopeDate}", false)).Returns("1");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, $"SL{telescopeTime}", false)).Returns("1");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, $"SC{telescopeDate}", false)).Returns("1");
 
             ConnectTelescope(TelescopeList.LX200GPS, string.Empty);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendChar(setDateCommand, false), Times.Never);
+            _sharedResourcesWrapperMock.Verify(x => x.SendChar(_traceLoggerMock.Object, setDateCommand, false), Times.Never);
             _sharedResourcesWrapperMock.Verify(x => x.ReadTerminated(), Times.Exactly(2));
         }
 
@@ -560,15 +562,15 @@ namespace Meade.net.Telescope.UnitTests
             string setDateCommand = $"hI{endSlewingDatetime:yyMMddHHmmss}";
 
             string expectedResult = "Align";
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("ED", false)).Returns(expectedResult);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "ED", false)).Returns(expectedResult);
 
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar($"SL{telescopeTime}", false)).Returns("1");
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar($"SC{telescopeDate}", false)).Returns("1");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, $"SL{telescopeTime}", false)).Returns("1");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, $"SC{telescopeDate}", false)).Returns("1");
 
             ConnectTelescope();
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendChar(setDateCommand, false), Times.Never);
+            _sharedResourcesWrapperMock.Verify(x => x.SendChar(_traceLoggerMock.Object, setDateCommand, false), Times.Never);
             _sharedResourcesWrapperMock.Verify(x => x.ReadTerminated(), Times.Exactly(2));
         }
 
@@ -583,8 +585,8 @@ namespace Meade.net.Telescope.UnitTests
             _telescope.Connected = true;
 
             _sharedResourcesWrapperMock.Verify(x => x.Connect("Serial", It.IsAny<string>(), It.IsAny<ITraceLogger>()), Times.Once);
-            _sharedResourcesWrapperMock.Verify(x => x.SendString("GZ", false), Times.Never);
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind($"Rg{_profileProperties.GuideRateArcSecondsPerSecond:00.0}", false), Times.Never);
+            _sharedResourcesWrapperMock.Verify(x => x.SendString(_traceLoggerMock.Object, "GZ", false), Times.Never);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, $"Rg{_profileProperties.GuideRateArcSecondsPerSecond:00.0}", false), Times.Never);
         }
 
 
@@ -620,7 +622,7 @@ namespace Meade.net.Telescope.UnitTests
             _sharedResourcesWrapperMock.Setup(x => x.ProductName).Returns(() => TelescopeList.Autostar497);
             _sharedResourcesWrapperMock.Setup(x => x.FirmwareVersion).Returns(() => TelescopeList.Autostar497_31Ee);
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendString(It.IsAny<string>(), It.IsAny<bool>())).Throws(new Exception("TestFailed"));
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, It.IsAny<string>(), It.IsAny<bool>())).Throws(new Exception("TestFailed"));
 
             //act
             _telescope.Connected = true;
@@ -654,37 +656,37 @@ namespace Meade.net.Telescope.UnitTests
         [Test]
         public void SetLongFormatFalse_WhenTelescopeReturnsShortFormat_ThenDoesNothing()
         {
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("GZ", false)).Returns("DDD*MM");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "GZ", false)).Returns("DDD*MM");
             _telescope.SetLongFormat(false);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("U", false), Times.Never);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "U", false), Times.Never);
         }
 
         [Test]
         public void SetLongFormatFalse_WhenTelescopeReturnsLongFormat_ThenTogglesPrecision()
         {
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("GZ", false)).Returns("DDD*MM’SS");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "GZ", false)).Returns("DDD*MM’SS");
             _telescope.SetLongFormat(false);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("U", false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "U", false), Times.Once);
         }
 
         [Test]
         public void SetLongFormatTrue_WhenTelescopeReturnsLongFormat_ThenDoesNothing()
         {
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("GZ", false)).Returns("DDD*MM’SS");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "GZ", false)).Returns("DDD*MM’SS");
             _telescope.SetLongFormat(true);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("U", false), Times.Never);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "U", false), Times.Never);
         }
 
         [Test]
         public void SetLongFormatTrue_WhenTelescopeReturnsShortFormat_ThenTogglesPrecision()
         {
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("GZ", false)).Returns("DDD*MM");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "GZ", false)).Returns("DDD*MM");
             _telescope.SetLongFormat(true);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("U", false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "U", false), Times.Once);
         }
 
         [Test]
@@ -726,7 +728,7 @@ namespace Meade.net.Telescope.UnitTests
 
             _telescope.SelectSite(site);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind($"W{site}", false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, $"W{site}", false), Times.Once);
         }
 
         [Test]
@@ -837,7 +839,7 @@ namespace Meade.net.Telescope.UnitTests
 
             _telescope.AlignmentMode = alignmentMode;
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(expectedCommand, false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, expectedCommand, false), Times.Once);
         }
 
         [Test]
@@ -982,7 +984,7 @@ namespace Meade.net.Telescope.UnitTests
         {
             _telescope.Connected = true;
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendString("P", false), Times.Never);
+            _sharedResourcesWrapperMock.Verify(x => x.SendString(_traceLoggerMock.Object, "P", false), Times.Never);
         }
 
         [TestCase("High", false, true)]
@@ -994,7 +996,7 @@ namespace Meade.net.Telescope.UnitTests
             _profileProperties.Precision = desiredPresision;
             var currentPrecision = telescopePrecision;
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar("P", false)).Returns(() =>
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, "P", false)).Returns(() =>
             {
                 currentPrecision = !currentPrecision;
 
@@ -1010,7 +1012,7 @@ namespace Meade.net.Telescope.UnitTests
             ConnectTelescope();
 
             Assert.That(currentPrecision, Is.EqualTo(finalPrecision));
-            _sharedResourcesWrapperMock.Verify(x => x.SendChar("P", false), Times.AtLeastOnce);
+            _sharedResourcesWrapperMock.Verify(x => x.SendChar(_traceLoggerMock.Object, "P", false), Times.AtLeastOnce);
         }
 
         [TestCase("High")]
@@ -1022,7 +1024,7 @@ namespace Meade.net.Telescope.UnitTests
                         ? false
                         : throw new ArgumentOutOfRangeException(nameof(desiredPresision), desiredPresision, "Should be High or Low"));
             _sharedResourcesWrapperMock.SetupProperty(x => x.IsLongFormat, isLongFormat);
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("GR", false)).Returns(() => _testProperties.telescopeRaResult);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "GR", false)).Returns(() => _testProperties.telescopeRaResult);
             _utilMock.Setup(x => x.HMSToHours(_testProperties.telescopeRaResult)).Returns(() => _testProperties.rightAscension);
 
             _profileProperties.Precision = desiredPresision;
@@ -1031,7 +1033,7 @@ namespace Meade.net.Telescope.UnitTests
 
             ConnectTelescope();
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendChar("P", false), Times.Never);
+            _sharedResourcesWrapperMock.Verify(x => x.SendChar(_traceLoggerMock.Object, "P", false), Times.Never);
             _sharedResourcesWrapperMock.Verify(x => x.IsLongFormat, Times.Once);
         }
 
@@ -1053,7 +1055,7 @@ namespace Meade.net.Telescope.UnitTests
 
             var secondTelescopeInstance =
                 new ASCOM.Meade.net.Telescope(_utilMock.Object, _utilExtraMock.Object, _astroUtilsMock.Object,
-                    _sharedResourcesWrapperMock.Object, _astroMathsMock.Object, _clockMock.Object, _novasMock.Object);
+                    _sharedResourcesWrapperMock.Object, _astroMathsMock.Object, _clockMock.Object, _novasMock.Object, _traceLoggerMock.Object);
 
             Assert.That(secondTelescopeInstance.Connected, Is.False);
 
@@ -1082,7 +1084,7 @@ namespace Meade.net.Telescope.UnitTests
 
             var secondTelescopeInstance =
                 new ASCOM.Meade.net.Telescope(_utilMock.Object, _utilExtraMock.Object, _astroUtilsMock.Object,
-                    _sharedResourcesWrapperMock.Object, _astroMathsMock.Object, _clockMock.Object, _novasMock.Object);
+                    _sharedResourcesWrapperMock.Object, _astroMathsMock.Object, _clockMock.Object, _novasMock.Object, _traceLoggerMock.Object);
 
             Assert.That(secondTelescopeInstance.Connected, Is.False);
 
@@ -1241,7 +1243,7 @@ namespace Meade.net.Telescope.UnitTests
         public void Declination_Get_WhenConnected_ThenReadsValueFromScope(string declincationString)
         {
             var expectedResult = 12.34;
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("GD", false)).Returns(declincationString);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "GD", false)).Returns(declincationString);
             _utilMock.Setup(x => x.DMSToDegrees(declincationString)).Returns(expectedResult);
 
             ConnectTelescope();
@@ -1256,14 +1258,14 @@ namespace Meade.net.Telescope.UnitTests
             var telescopeDecResult = "s12*34’56";
             var dmsResult = 1.2;
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("GD", false)).Returns(telescopeDecResult);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "GD", false)).Returns(telescopeDecResult);
             _utilMock.Setup(x => x.DMSToDegrees(telescopeDecResult)).Returns(dmsResult);
 
             ConnectTelescope();
 
             var result = _telescope.Declination;
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendString("GD", false), Times.Exactly(2));
+            _sharedResourcesWrapperMock.Verify(x => x.SendString(_traceLoggerMock.Object, "GD", false), Times.Exactly(2));
             _utilMock.Verify(x => x.DMSToDegrees(telescopeDecResult), Times.Exactly(2));
 
             Assert.That(result, Is.EqualTo(dmsResult));
@@ -1448,7 +1450,7 @@ namespace Meade.net.Telescope.UnitTests
 
             _telescope.GuideRateDeclination = newGuideRate;
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("Rg01.2", false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "Rg01.2", false), Times.Once);
 
             Assert.That(_telescope.GuideRateDeclination, Is.EqualTo(newGuideRate));
         }
@@ -1481,7 +1483,7 @@ namespace Meade.net.Telescope.UnitTests
 
             _telescope.GuideRateRightAscension = newGuideRate;
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("Rg01.2", false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "Rg01.2", false), Times.Once);
 
             Assert.That(_telescope.GuideRateDeclination, Is.EqualTo(newGuideRate));
         }
@@ -1527,13 +1529,13 @@ namespace Meade.net.Telescope.UnitTests
             _telescope.MoveAxis(axis, rate);
 
             if (slewRateCommand != string.Empty)
-                _sharedResourcesWrapperMock.Verify(x => x.SendBlind(slewRateCommand, false), Times.Once);
+                _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, slewRateCommand, false), Times.Once);
             else
             {
-                _sharedResourcesWrapperMock.Verify(x => x.SendBlind("RG", false), Times.Never);
-                _sharedResourcesWrapperMock.Verify(x => x.SendBlind("RC", false), Times.Never);
-                _sharedResourcesWrapperMock.Verify(x => x.SendBlind("RM", false), Times.Never);
-                _sharedResourcesWrapperMock.Verify(x => x.SendBlind("RS", false), Times.Never);
+                _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "RG", false), Times.Never);
+                _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "RC", false), Times.Never);
+                _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "RM", false), Times.Never);
+                _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "RS", false), Times.Never);
             }
 
             switch (axis)
@@ -1542,14 +1544,14 @@ namespace Meade.net.Telescope.UnitTests
                     switch (rate.Compare(0))
                     {
                         case ComparisonResult.Equals:
-                            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("Qe", false), Times.Once);
-                            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("Qw", false), Times.Once);
+                            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "Qe", false), Times.Once);
+                            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "Qw", false), Times.Once);
                             break;
                         case ComparisonResult.Greater:
-                            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("Me", false), Times.Once);
+                            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "Me", false), Times.Once);
                             break;
                         case ComparisonResult.Lower:
-                            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("Mw", false), Times.Once);
+                            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "Mw", false), Times.Once);
                             break;
                     }
                     break;
@@ -1557,14 +1559,14 @@ namespace Meade.net.Telescope.UnitTests
                     switch (rate.Compare(0))
                     {
                         case ComparisonResult.Equals:
-                            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("Qn", false), Times.Once);
-                            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("Qs", false), Times.Once);
+                            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "Qn", false), Times.Once);
+                            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "Qs", false), Times.Once);
                             break;
                         case ComparisonResult.Greater:
-                            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("Mn", false), Times.Once);
+                            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "Mn", false), Times.Once);
                             break;
                         case ComparisonResult.Lower:
-                            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("Ms", false), Times.Once);
+                            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "Ms", false), Times.Once);
                             break;
                     }
                     break;
@@ -1610,11 +1612,11 @@ namespace Meade.net.Telescope.UnitTests
         {
             ConnectTelescope();
             Assert.That(_telescope.AtPark, Is.False);
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("hP", false), Times.Never);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "hP", false), Times.Never);
 
             _telescope.Park();
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("hP", false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "hP", false), Times.Once);
             Assert.That(_telescope.AtPark, Is.True);
         }
 
@@ -1629,8 +1631,8 @@ namespace Meade.net.Telescope.UnitTests
             var azAsDM = "180*00";
             _utilMock.Setup(x => x.DegreesToDM(az, "*", "", 2)).Returns(azAsDM);
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendBool("Sa+77*30", false)).Returns(true);
-            _sharedResourcesWrapperMock.Setup(x => x.SendBool("Sz180*00", false)).Returns(true);           
+            _sharedResourcesWrapperMock.Setup(x => x.SendBool(_traceLoggerMock.Object, "Sa+77*30", false)).Returns(true);
+            _sharedResourcesWrapperMock.Setup(x => x.SendBool(_traceLoggerMock.Object, "Sz180*00", false)).Returns(true);           
 
             ConnectTelescope(TelescopeList.LX200CLASSIC);
             Assert.That(_telescope.AtPark, Is.False);
@@ -1647,7 +1649,7 @@ namespace Meade.net.Telescope.UnitTests
 
             _telescope.Park();
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("hP", false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "hP", false), Times.Once);
             Assert.That(_telescope.AtPark, Is.True);
 
 
@@ -1655,7 +1657,7 @@ namespace Meade.net.Telescope.UnitTests
             _telescope.Park();
 
             //no change from previous state.
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("hP", false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "hP", false), Times.Once);
             Assert.That(_telescope.AtPark, Is.True);
         }
 
@@ -1697,7 +1699,7 @@ namespace Meade.net.Telescope.UnitTests
                     break;
             }
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind($"Mg{d}{duration:0000}", false));
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, $"Mg{d}{duration:0000}", false));
             _utilMock.Verify(x => x.WaitForMilliseconds(duration), Times.Once);
         }
 
@@ -1748,7 +1750,7 @@ namespace Meade.net.Telescope.UnitTests
                     break;
             }
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind($"Mg{d}{duration:0000}", false));
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, $"Mg{d}{duration:0000}", false));
             _utilMock.Verify(x => x.WaitForMilliseconds(duration), Times.Once);
         }
 
@@ -1758,7 +1760,7 @@ namespace Meade.net.Telescope.UnitTests
         [TestCase(GuideDirections.guideSouth)]
         public void PulseGuide_WhenSlewingAndPulseGuideAttempted_ThenThrowsExpectedException(GuideDirections direction)
         {
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("D", false)).Returns("|");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "D", false)).Returns("|");
 
             var duration = 0;
             ConnectTelescope();
@@ -1775,7 +1777,7 @@ namespace Meade.net.Telescope.UnitTests
         public void PulseGuide_WhenAltAzPulseGuideAttempted_ThenThrowsExpectedException(GuideDirections direction)
         {
             _testProperties.AlignmentMode = "A";
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("D", false)).Returns("");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "D", false)).Returns("");
 
             var duration = 1;
             ConnectTelescope();
@@ -1794,7 +1796,7 @@ namespace Meade.net.Telescope.UnitTests
             _sharedResourcesWrapperMock.SetupProperty(x => x.MovingPrimary);
             _sharedResourcesWrapperMock.SetupProperty(x => x.MovingSecondary);
             _sharedResourcesWrapperMock.SetupProperty(x => x.EarliestNonSlewingTime, DateTime.MinValue);
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("D", false)).Returns("");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "D", false)).Returns("");
 
             var duration = 0;
             ConnectTelescope();
@@ -1819,7 +1821,7 @@ namespace Meade.net.Telescope.UnitTests
 
             _testProperties.rightAscension = 1.3;
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("GD", false)).Returns(telescopeDecResult);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "GD", false)).Returns(telescopeDecResult);
             _utilMock.Setup(x => x.DMSToDegrees(telescopeDecResult)).Returns(dmsResult);
 
             var duration = 0;
@@ -1849,7 +1851,7 @@ namespace Meade.net.Telescope.UnitTests
             var dmsResult = 1.2;
             var duration = 0;
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("GD", false)).Returns(telescopeDecResult);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "GD", false)).Returns(telescopeDecResult);
             _utilMock.Setup(x => x.DMSToDegrees(telescopeDecResult)).Returns(dmsResult);
 
             ConnectTelescope(TelescopeList.Autostar497, TelescopeList.Autostar497_30Ee);
@@ -1873,10 +1875,10 @@ namespace Meade.net.Telescope.UnitTests
                     break;
             }
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("RG", false));
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind($"M{d}", false));
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "RG", false));
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, $"M{d}", false));
             _utilMock.Verify(x => x.WaitForMilliseconds(duration), Times.Once);
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind($"Q{d}", false));
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, $"Q{d}", false));
         }
 
         [TestCase(GuideDirections.guideEast)]
@@ -1892,7 +1894,7 @@ namespace Meade.net.Telescope.UnitTests
             var telescopeDecResult = "s12*34’56";
             var dmsResult = 1.2;
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("GD", false)).Returns(telescopeDecResult);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "GD", false)).Returns(telescopeDecResult);
             _utilMock.Setup(x => x.DMSToDegrees(telescopeDecResult)).Returns(dmsResult);
 
             ConnectTelescope(TelescopeList.Autostar497, TelescopeList.Autostar497_30Ee);
@@ -1947,10 +1949,10 @@ namespace Meade.net.Telescope.UnitTests
                     break;
             }
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("RG", false));
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind($"M{d}", false));
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "RG", false));
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, $"M{d}", false));
             _utilMock.Verify(x => x.WaitForMilliseconds(duration), Times.Once);
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind($"Q{d}", false));
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, $"Q{d}", false));
         }
 
         [Test]
@@ -2180,7 +2182,7 @@ namespace Meade.net.Telescope.UnitTests
 
             var result = _telescope.SiteLatitude;
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendString("Gt", false), Times.AtLeastOnce);
+            _sharedResourcesWrapperMock.Verify(x => x.SendString(_traceLoggerMock.Object, "Gt", false), Times.AtLeastOnce);
 
             Assert.That(result, Is.EqualTo(_testProperties.SiteLatitudeValue));
         }
@@ -2214,7 +2216,7 @@ namespace Meade.net.Telescope.UnitTests
         [TestCase(20.75)]
         public void SiteLatitude_Set_WhenValueSetAndTelescopRejects_ThenExceptionThrown(double siteLatitude)
         {
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar(It.IsAny<string>(), false)).Returns("0");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, It.IsAny<string>(), false)).Returns("0");
 
             ConnectTelescope();
 
@@ -2227,13 +2229,13 @@ namespace Meade.net.Telescope.UnitTests
         [TestCase(20.75, "St+20*45")]
         public void SiteLatitude_Set_WhenValidValues_ThenValueSentToTelescope(double siteLatitude, string expectedCommand)
         {
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar(expectedCommand, false)).Returns("1");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, expectedCommand, false)).Returns("1");
 
             ConnectTelescope();
 
             _telescope.SiteLatitude = siteLatitude;
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendChar(expectedCommand, false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendChar(_traceLoggerMock.Object, expectedCommand, false), Times.Once);
         }
 
         [Test]
@@ -2256,7 +2258,7 @@ namespace Meade.net.Telescope.UnitTests
         {
             var telescopeLongitude = "testLongitude";
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("Gg", false)).Returns(telescopeLongitude);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "Gg", false)).Returns(telescopeLongitude);
             _utilMock.Setup(x => x.DMSToDegrees(telescopeLongitude)).Returns(telescopeLongitudeValue);
 
             ConnectTelescope();
@@ -2294,7 +2296,7 @@ namespace Meade.net.Telescope.UnitTests
         [Test]
         public void SiteLongitude_Set_WhenConnectedAndTelescopeFails_ThenThrowsException()
         {
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar(It.IsAny<string>(), false)).Returns("0");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, It.IsAny<string>(), false)).Returns("0");
 
             ConnectTelescope();
 
@@ -2306,13 +2308,13 @@ namespace Meade.net.Telescope.UnitTests
         [TestCase(10, "Sg350*00")]
         public void SiteLongitude_Set_WhenConnectedAndTelescopeFails_ThenThrowsException(double longitude, string expectedCommand)
         {
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar(expectedCommand, false)).Returns("1");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, expectedCommand, false)).Returns("1");
 
             ConnectTelescope();
 
             _telescope.SiteLongitude = longitude;
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendChar(expectedCommand, false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendChar(_traceLoggerMock.Object, expectedCommand, false), Times.Once);
         }
 
         [Test]
@@ -2335,26 +2337,26 @@ namespace Meade.net.Telescope.UnitTests
         [Test]
         public void SyncToTarget_WhenSyncToTargetFails_ThenThrowsException()
         {
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("CM", false)).Returns(string.Empty);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "CM", false)).Returns(string.Empty);
 
             ConnectTelescope();
 
             var exception = Assert.Throws<InvalidOperationException>(() => _telescope.SyncToTarget());
 
             Assert.That(exception.Message, Is.EqualTo("Unable to perform sync"));
-            _sharedResourcesWrapperMock.Verify(x => x.SendString("CM", false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendString(_traceLoggerMock.Object, "CM", false), Times.Once);
         }
 
         [Test]
         public void SyncToTarget_WhenSyncToTargetWorks_ThennoExceptionThrown()
         {
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("CM", false)).Returns(" M31 EX GAL MAG 3.5 SZ178.0'#");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "CM", false)).Returns(" M31 EX GAL MAG 3.5 SZ178.0'#");
 
             ConnectTelescope();
 
             Assert.DoesNotThrow(() => _telescope.SyncToTarget());
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendString("CM", false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendString(_traceLoggerMock.Object, "CM", false), Times.Once);
         }
 
         [Test]
@@ -2385,7 +2387,7 @@ namespace Meade.net.Telescope.UnitTests
         [Test]
         public void TargetDeclination_Set_WhenTelescopeReportsInvalidDec_ThenThrowsException()
         {
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar(It.IsAny<string>(), false)).Returns("0");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, It.IsAny<string>(), false)).Returns("0");
 
             ConnectTelescope();
 
@@ -2401,13 +2403,13 @@ namespace Meade.net.Telescope.UnitTests
         {
 
             _utilMock.Setup(x => x.DegreesToDMS(declination, "*", ":", ":", 2)).Returns(decstring);
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar(commandString, false)).Returns("1");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, commandString, false)).Returns("1");
 
             ConnectTelescope();
 
             _telescope.TargetDeclination = declination;
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendChar(commandString, false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendChar(_traceLoggerMock.Object, commandString, false), Times.Once);
         }
 
         [Test]
@@ -2433,7 +2435,7 @@ namespace Meade.net.Telescope.UnitTests
             _utilMock.Setup(x => x.DegreesToDMS(declination, "*", ":", ":", 2)).Returns(decstring);
             _utilMock.Setup(x => x.DMSToDegrees(decstring)).Returns(declination);
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar(commandString, false)).Returns("1");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, commandString, false)).Returns("1");
 
             ConnectTelescope();
 
@@ -2457,7 +2459,7 @@ namespace Meade.net.Telescope.UnitTests
 
             _utilMock.Setup(x => x.DegreesToDMS(targetDeclination, "*", ":", ":", 2)).Returns(targetDeclinationDMS);
             _utilMock.Setup(x => x.DMSToDegrees(targetDeclinationDMS)).Returns(targetDeclination);
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar(command, false)).Returns("1");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, command, false)).Returns("1");
 
             ConnectTelescope();
             Assert.That(_connectionInfo.SameDevice, Is.EqualTo(1));
@@ -2469,7 +2471,7 @@ namespace Meade.net.Telescope.UnitTests
 
             var secondTelescopeInstance =
                 new ASCOM.Meade.net.Telescope(_utilMock.Object, _utilExtraMock.Object, _astroUtilsMock.Object,
-                    _sharedResourcesWrapperMock.Object, _astroMathsMock.Object, _clockMock.Object, _novasMock.Object);
+                    _sharedResourcesWrapperMock.Object, _astroMathsMock.Object, _clockMock.Object, _novasMock.Object, _traceLoggerMock.Object);
 
             Assert.That(secondTelescopeInstance.Connected, Is.False);
 
@@ -2481,7 +2483,7 @@ namespace Meade.net.Telescope.UnitTests
 
             _utilMock.Verify(x => x.DegreesToDMS(targetDeclination, "*", ":", ":", 2), Times.Once);
             _utilMock.Verify(x => x.DMSToDegrees(targetDeclinationDMS), Times.Once);
-            _sharedResourcesWrapperMock.Verify(x => x.SendChar(command, false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendChar(_traceLoggerMock.Object, command, false), Times.Once);
         }
 
         [Test]
@@ -2512,7 +2514,7 @@ namespace Meade.net.Telescope.UnitTests
         [Test]
         public void TargetRightAscension_Set_WhenTelescopeReportsInvalidRA_ThenThrowsException()
         {
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar(It.IsAny<string>(), false)).Returns("0");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, It.IsAny<string>(), false)).Returns("0");
 
             ConnectTelescope();
 
@@ -2525,13 +2527,13 @@ namespace Meade.net.Telescope.UnitTests
         public void TargetRightAscension_Set_WhenValueOK_ThenSetsNewTargetDeclination(double rightAscension, string hms, string commandString)
         {
             _utilMock.Setup(x => x.HoursToHMS(rightAscension, ":", ":", ":", 2)).Returns(hms);
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar(commandString, false)).Returns("1");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, commandString, false)).Returns("1");
 
             ConnectTelescope();
 
             _telescope.TargetRightAscension = rightAscension;
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendChar(commandString, false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendChar(_traceLoggerMock.Object, commandString, false), Times.Once);
         }
 
         [Test]
@@ -2555,7 +2557,7 @@ namespace Meade.net.Telescope.UnitTests
             _utilMock.Setup(x => x.HoursToHMS(rightAscension, ":", ":", ":", digitsRA)).Returns(hms);
             _utilMock.Setup(x => x.HMSToHours(hms)).Returns(rightAscension);
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar(commandString, false)).Returns("1");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, commandString, false)).Returns("1");
 
             ConnectTelescope();
 
@@ -2577,7 +2579,7 @@ namespace Meade.net.Telescope.UnitTests
 
             _utilMock.Setup(x => x.HoursToHMS(targetRightAscension, ":", ":", ":", 2)).Returns(targetRightAscensionHMS);
             _utilMock.Setup(x => x.HMSToHours(targetRightAscensionHMS)).Returns(targetRightAscension);
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar(command, false)).Returns("1");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, command, false)).Returns("1");
 
             ConnectTelescope();
             Assert.That(_connectionInfo.SameDevice, Is.EqualTo(1));
@@ -2589,7 +2591,7 @@ namespace Meade.net.Telescope.UnitTests
 
             var secondTelescopeInstance =
                 new ASCOM.Meade.net.Telescope(_utilMock.Object, _utilExtraMock.Object, _astroUtilsMock.Object,
-                    _sharedResourcesWrapperMock.Object, _astroMathsMock.Object, _clockMock.Object, _novasMock.Object);
+                    _sharedResourcesWrapperMock.Object, _astroMathsMock.Object, _clockMock.Object, _novasMock.Object, _traceLoggerMock.Object);
 
             Assert.That(secondTelescopeInstance.Connected, Is.False);
 
@@ -2601,7 +2603,7 @@ namespace Meade.net.Telescope.UnitTests
 
             _utilMock.Verify(x => x.HoursToHMS(targetRightAscension, ":", ":", ":", 2), Times.Once);
             _utilMock.Verify(x => x.HMSToHours(targetRightAscensionHMS), Times.Once);
-            _sharedResourcesWrapperMock.Verify(x => x.SendChar(command, false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendChar(_traceLoggerMock.Object, command, false), Times.Once);
         }
 
         [TestCase("A", true)]
@@ -2625,7 +2627,7 @@ namespace Meade.net.Telescope.UnitTests
 
             Assert.That(_telescope.Tracking, Is.EqualTo(tracking));
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(alignmentCommand, false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, alignmentCommand, false), Times.Once);
         }
 
         [Test]
@@ -2648,8 +2650,8 @@ namespace Meade.net.Telescope.UnitTests
 
             Assert.That(_telescope.TrackingRate, Is.EqualTo(rate));
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(commandString, false), Times.Once);
-            _sharedResourcesWrapperMock.Verify(x => x.SendString("GT", false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, commandString, false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendString(_traceLoggerMock.Object, "GT", false), Times.Once);
         }
 
         [Test]
@@ -2788,8 +2790,8 @@ namespace Meade.net.Telescope.UnitTests
 
             var newDate = new DateTime(year, month, day, hour, min, second, DateTimeKind.Local) + utcCorrection;
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("GG", false)).Returns(telescopeUtcCorrection);
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar($"SL{telescopeTime}", false)).Returns("0");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "GG", false)).Returns(telescopeUtcCorrection);
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, $"SL{telescopeTime}", false)).Returns("0");
 
             ConnectTelescope();
 
@@ -2808,8 +2810,8 @@ namespace Meade.net.Telescope.UnitTests
 
             var newDate = new DateTime(year, month, day, hour, min, second, DateTimeKind.Local) + utcCorrection;
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar($"SL{telescopeTime}", false)).Returns("1");
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar($"SC{newDate:MM/dd/yy}", false)).Returns("0");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, $"SL{telescopeTime}", false)).Returns("1");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, $"SC{newDate:MM/dd/yy}", false)).Returns("0");
 
             ConnectTelescope();
 
@@ -2831,8 +2833,8 @@ namespace Meade.net.Telescope.UnitTests
 
             var newDate = new DateTime(year, month, day, hour, min, second, DateTimeKind.Local) + utcCorrection;
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar($"SL{telescopeTime}", false)).Returns("1");
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar($"SC{telescopeDate}", false)).Returns("1");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, $"SL{telescopeTime}", false)).Returns("1");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, $"SC{telescopeDate}", false)).Returns("1");
 
             ConnectTelescope();
 
@@ -2868,7 +2870,7 @@ namespace Meade.net.Telescope.UnitTests
 
             var digitsRA = 2;
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar($"Sr{_testProperties.telescopeRaResult}", false)).Returns("1");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, $"Sr{_testProperties.telescopeRaResult}", false)).Returns("1");
 
             _utilMock.Setup(x => x.HoursToHMS(_testProperties.rightAscension, ":", ":", ":", digitsRA)).Returns(_testProperties.telescopeRaResult);
             _utilMock.Setup(x => x.HMSToHours(hms)).Returns(_testProperties.rightAscension);
@@ -2879,18 +2881,18 @@ namespace Meade.net.Telescope.UnitTests
 
             _utilMock.Setup(x => x.HoursToHMS(_testProperties.rightAscension, ":", ":", ":", 2)).Returns(hms);
             _utilMock.Setup(x => x.DegreesToDMS(declination, "*", ":", ":", digitsRA)).Returns(dec);
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar($"Sr{hms}", false)).Returns("1");
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar($"Sd{dec}", false)).Returns("1");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, $"Sr{hms}", false)).Returns("1");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, $"Sd{dec}", false)).Returns("1");
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendString($"CM", false)).Returns("M31 EX GAL MAG 3.5 SZ178.0'#");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, $"CM", false)).Returns("M31 EX GAL MAG 3.5 SZ178.0'#");
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("GD", false)).Returns(telescopeDecResult);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "GD", false)).Returns(telescopeDecResult);
 
             ConnectTelescope();
 
             _telescope.SyncToCoordinates(_testProperties.rightAscension, declination);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendString("CM", false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendString(_traceLoggerMock.Object, "CM", false), Times.Once);
             Assert.That(_telescope.TargetRightAscension, Is.EqualTo(_testProperties.rightAscension));
             Assert.That(_telescope.TargetDeclination, Is.EqualTo(declination));
         }
@@ -2902,7 +2904,7 @@ namespace Meade.net.Telescope.UnitTests
 
             Assert.That(result, Is.False);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendString("D", false), Times.Never);
+            _sharedResourcesWrapperMock.Verify(x => x.SendString(_traceLoggerMock.Object, "D", false), Times.Never);
         }
 
         [Test]
@@ -2914,13 +2916,13 @@ namespace Meade.net.Telescope.UnitTests
 
             Assert.That(result, Is.False);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendString("D", false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendString(_traceLoggerMock.Object, "D", false), Times.Once);
         }
 
         [Test]
         public void Slewing_WhenTelescopeIsSlewing_ThenReturnsTrue()
         {
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("D", false)).Returns("|");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "D", false)).Returns("|");
 
             ConnectTelescope();
 
@@ -2928,7 +2930,7 @@ namespace Meade.net.Telescope.UnitTests
 
             Assert.That(result, Is.True);
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendString("D", false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendString(_traceLoggerMock.Object, "D", false), Times.Once);
         }
 
         [TestCase(0, 0, "2021-10-03T20:36:00", "2021-10-03T20:36:01", false)]
@@ -2967,7 +2969,7 @@ namespace Meade.net.Telescope.UnitTests
             var slewingText = "|";
             var notSlewingText = String.Empty;
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("D", false)).Returns(() =>
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "D", false)).Returns(() =>
            {
                if (timescalled == 0)
                {
@@ -3000,7 +3002,7 @@ namespace Meade.net.Telescope.UnitTests
         [TestCase(TelescopeList.Autostar497, TelescopeList.Autostar497_43Eg, "", false)]
         public void Slewing_WhenTelescopeNotSlewing_ThenReturnsFalse(string productName, string firmwareVersion, string response, bool isSlewing)
         {
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("D", false)).Returns(response);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "D", false)).Returns(response);
 
             ConnectTelescope(productName, firmwareVersion);
 
@@ -3008,7 +3010,7 @@ namespace Meade.net.Telescope.UnitTests
 
             Assert.That(result, Is.EqualTo(isSlewing));
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendString("D", false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendString(_traceLoggerMock.Object, "D", false), Times.Once);
         }
 
         [TestCase(1, TelescopeAxes.axisPrimary)]
@@ -3031,7 +3033,7 @@ namespace Meade.net.Telescope.UnitTests
             Assert.That(_sharedResourcesWrapperMock.Object.MovingPrimary, Is.EqualTo(axis == TelescopeAxes.axisPrimary));
             Assert.That(_sharedResourcesWrapperMock.Object.MovingSecondary, Is.EqualTo(axis == TelescopeAxes.axisSecondary));
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendString("D", false), Times.Never);
+            _sharedResourcesWrapperMock.Verify(x => x.SendString(_traceLoggerMock.Object, "D", false), Times.Never);
         }
 
         [TestCase(1, TelescopeAxes.axisPrimary, 0, 0, false, false)]
@@ -3138,7 +3140,7 @@ namespace Meade.net.Telescope.UnitTests
         [Test]
         public void SlewToTargetAsync_WhenTargetSetAndSlewIsPossible_ThenAttemptsSlew()
         {
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar("MS", false)).Returns("0");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, "MS", false)).Returns("0");
 
             ConnectTelescope();
 
@@ -3148,13 +3150,13 @@ namespace Meade.net.Telescope.UnitTests
 
             _telescope.SlewToTargetAsync();
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendChar("MS", false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendChar(_traceLoggerMock.Object, "MS", false), Times.Once);
         }
 
         [Test]
         public void SlewToTargetAsync_WhenTargetBelowHorizon_ThenThrowsException()
         {
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar("MS", false)).Returns("1");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, "MS", false)).Returns("1");
             _sharedResourcesWrapperMock.Setup(x => x.ReadTerminated()).Returns("Below horizon");
 
             ConnectTelescope();
@@ -3169,7 +3171,7 @@ namespace Meade.net.Telescope.UnitTests
         [Test]
         public void SlewToTargetAsync_WhenTargetBelowElevation_ThenThrowsException()
         {
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar("MS", false)).Returns("2");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, "MS", false)).Returns("2");
             _sharedResourcesWrapperMock.Setup(x => x.ReadTerminated()).Returns("Above below elevation");
 
             ConnectTelescope();
@@ -3184,7 +3186,7 @@ namespace Meade.net.Telescope.UnitTests
         [Test]
         public void SlewToTargetAsync_WhenTelescopeCanHitTripod_ThenThrowsException()
         {
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar("MS", false)).Returns("3");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, "MS", false)).Returns("3");
             _sharedResourcesWrapperMock.Setup(x => x.ReadTerminated()).Returns("the telescope can hit the tripod");
 
             ConnectTelescope();
@@ -3206,12 +3208,12 @@ namespace Meade.net.Telescope.UnitTests
         [Test]
         public void SlewToTarget_WhenSlewing_ThenWaitsForTheSlewToComplete()
         {
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar("MS", false)).Returns("0");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, "MS", false)).Returns("0");
 
             var preTestItterations = 1;
             var slewCounter = 0;
             var iterations = 10;
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("D", false)).Returns(() =>
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "D", false)).Returns(() =>
             {
                 slewCounter++;
                 if (slewCounter <= preTestItterations)
@@ -3249,10 +3251,10 @@ namespace Meade.net.Telescope.UnitTests
 
             var telescopeDecResult = "s12*34’56";
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar("MS", false)).Returns("0");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, "MS", false)).Returns("0");
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar($"Sr{_testProperties.telescopeRaResult}", false)).Returns("1");
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("GD", false)).Returns(telescopeDecResult);
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, $"Sr{_testProperties.telescopeRaResult}", false)).Returns("1");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "GD", false)).Returns(telescopeDecResult);
             _utilMock.Setup(x => x.HoursToHMS(_testProperties.rightAscension, ":", ":", ":", digitsRA)).Returns(_testProperties.telescopeRaResult);
 
             _utilMock.Setup(x => x.DMSToDegrees(telescopeDecResult)).Returns(declination);
@@ -3264,7 +3266,7 @@ namespace Meade.net.Telescope.UnitTests
 
             Assert.That(_telescope.TargetRightAscension, Is.EqualTo(_testProperties.rightAscension));
             Assert.That(_telescope.TargetDeclination, Is.EqualTo(declination));
-            _sharedResourcesWrapperMock.Verify(x => x.SendChar("MS", false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendChar(_traceLoggerMock.Object, "MS", false), Times.Once);
         }
 
         [Test]
@@ -3284,19 +3286,19 @@ namespace Meade.net.Telescope.UnitTests
             var dmsResult = 1.2;
             var digitsRA = 2;
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("GD", false)).Returns(telescopeDecResult);
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar($"Sr{_testProperties.telescopeRaResult}", false)).Returns("1");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "GD", false)).Returns(telescopeDecResult);
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, $"Sr{_testProperties.telescopeRaResult}", false)).Returns("1");
 
             _utilMock.Setup(x => x.HoursToHMS(_testProperties.rightAscension, ":", ":", ":", digitsRA)).Returns(_testProperties.telescopeRaResult);
             _utilMock.Setup(x => x.DMSToDegrees(telescopeDecResult)).Returns(dmsResult);
             _utilMock.Setup(x => x.DegreesToDMS(declination, "*", ":", ":", digitsRA)).Returns(telescopeDecResult);
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar("MS", false)).Returns("0");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, "MS", false)).Returns("0");
 
             var preTestItterations = 1;
             var slewCounter = 0;
             var iterations = 10;
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("D", false)).Returns(() =>
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "D", false)).Returns(() =>
             {
                 slewCounter++;
                 if (slewCounter <= preTestItterations)
@@ -3311,7 +3313,7 @@ namespace Meade.net.Telescope.UnitTests
             _telescope.SlewToCoordinates(_testProperties.rightAscension, declination);
             Assert.That(_telescope.TargetRightAscension, Is.EqualTo(_testProperties.rightAscension));
             Assert.That(_telescope.TargetDeclination, Is.EqualTo(dmsResult));
-            _sharedResourcesWrapperMock.Verify(x => x.SendChar("MS", false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendChar(_traceLoggerMock.Object, "MS", false), Times.Once);
 
             _utilMock.Verify(x => x.WaitForMilliseconds(It.IsAny<int>()), Times.Exactly(iterations - preTestItterations));
         }
@@ -3368,15 +3370,15 @@ namespace Meade.net.Telescope.UnitTests
             var altitude = 30;
             var azimuth = 45;
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("GG", false)).Returns("-1.0");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "GG", false)).Returns("-1.0");
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar("MS", false)).Returns("0");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, "MS", false)).Returns("0");
 
             var telescopeRaResult = "HH:MM:SS";
             var telescopeDecResult = "s12*34’56";
             var digitsRA = 2;
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar($"Sr{telescopeRaResult}", false)).Returns("1");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, $"Sr{telescopeRaResult}", false)).Returns("1");
 
             _utilMock.Setup(x => x.HoursToHMS(_testProperties.rightAscension, ":", ":", ":", digitsRA)).Returns(telescopeRaResult);
             _utilMock.Setup(x => x.HMSToHours(telescopeRaResult)).Returns(_testProperties.rightAscension);
@@ -3389,7 +3391,7 @@ namespace Meade.net.Telescope.UnitTests
 
             Assert.That(_telescope.TargetRightAscension, Is.EqualTo(_testProperties.rightAscension));
             Assert.That(_telescope.TargetDeclination, Is.EqualTo(_testProperties.declination));
-            _sharedResourcesWrapperMock.Verify(x => x.SendChar("MS", false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendChar(_traceLoggerMock.Object, "MS", false), Times.Once);
         }
 
         [Test]
@@ -3411,15 +3413,15 @@ namespace Meade.net.Telescope.UnitTests
             _utilMock.Setup(x => x.DegreesToDMS(_testProperties.declination, "*", ":", ":", 2)).Returns(_testProperties.telescopeRaResult);
             _utilMock.Setup(x => x.DMSToDegrees(_testProperties.telescopeRaResult)).Returns(_testProperties.declination);
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("GG", false)).Returns("-1.0");
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar("Sd+HH:MM:SS", false)).Returns("1");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "GG", false)).Returns("-1.0");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, "Sd+HH:MM:SS", false)).Returns("1");
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendChar("MS", false)).Returns("0");
+            _sharedResourcesWrapperMock.Setup(x => x.SendChar(_traceLoggerMock.Object, "MS", false)).Returns("0");
 
             var preTestItterations = 1;
             var slewCounter = 0;
             var iterations = 10;
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("D", false)).Returns(() =>
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "D", false)).Returns(() =>
             {
                 slewCounter++;
                 if (slewCounter <= preTestItterations)
@@ -3435,7 +3437,7 @@ namespace Meade.net.Telescope.UnitTests
 
             Assert.That(_telescope.TargetRightAscension, Is.EqualTo(_testProperties.rightAscension));
             Assert.That(_telescope.TargetDeclination, Is.EqualTo(_testProperties.declination));
-            _sharedResourcesWrapperMock.Verify(x => x.SendChar("MS", false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendChar(_traceLoggerMock.Object, "MS", false), Times.Once);
             _utilMock.Verify(x => x.WaitForMilliseconds(It.IsAny<int>()), Times.Exactly(iterations - preTestItterations));
         }
 
@@ -3460,9 +3462,9 @@ namespace Meade.net.Telescope.UnitTests
             _testProperties.telescopeAzimuth = 200;
             _testProperties.hourAngle = 3;
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("GG", false)).Returns("-1.0");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "GG", false)).Returns("-1.0");
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("Gg", false)).Returns(telescopeLongitude);
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "Gg", false)).Returns(telescopeLongitude);
             _utilMock.Setup(x => x.DMSToDegrees(telescopeLongitude)).Returns(telescopeLongitudeValue);
 
 
@@ -3492,7 +3494,7 @@ namespace Meade.net.Telescope.UnitTests
             var telescopeLongitude = "350";
             var telescopeLongitudeValue = 350;
 
-            _sharedResourcesWrapperMock.Setup(x => x.SendString("GG", false)).Returns("-1.0");
+            _sharedResourcesWrapperMock.Setup(x => x.SendString(_traceLoggerMock.Object, "GG", false)).Returns("-1.0");
 
             _utilMock.Setup(x => x.DMSToDegrees(telescopeLongitude)).Returns(telescopeLongitudeValue);
 
@@ -3521,12 +3523,12 @@ namespace Meade.net.Telescope.UnitTests
 
             _telescope.AbortSlew();
 
-            _sharedResourcesWrapperMock.Verify(x => x.SendBlind("Q", false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendBlind(_traceLoggerMock.Object, "Q", false), Times.Once);
 
             var isSloSlewing = _telescope.Slewing;
 
             Assert.That(isSloSlewing, Is.False);
-            _sharedResourcesWrapperMock.Verify(x => x.SendString("D", false), Times.Once);
+            _sharedResourcesWrapperMock.Verify(x => x.SendString(_traceLoggerMock.Object, "D", false), Times.Once);
         }
 
         [Test]
diff --git a/Meade.net.Telescope/Telescope.cs b/Meade.net.Telescope/Telescope.cs
index a8a3c58..967beea 100644
--- a/Meade.net.Telescope/Telescope.cs
+++ b/Meade.net.Telescope/Telescope.cs
@@ -128,7 +128,7 @@ namespace ASCOM.Meade.net
         }
 
         public Telescope(IUtil util, IUtilExtra utilExtra, IAstroUtils astroUtilities,
-            ISharedResourcesWrapper sharedResourcesWrapper, IAstroMaths astroMaths, IClock clock, INOVAS31 novas) : base(
+            ISharedResourcesWrapper sharedResourcesWrapper, IAstroMaths astroMaths, IClock clock, INOVAS31 novas, ITraceLogger traceLogger) : base(
             sharedResourcesWrapper)
         {
             _clock = clock;
@@ -138,7 +138,7 @@ namespace ASCOM.Meade.net
             _astroMaths = astroMaths;
             _novas = novas;
 
-            Initialise(nameof(Telescope));
+            Initialise(nameof(Telescope), traceLogger);
         }
 
         //
@@ -213,81 +213,81 @@ namespace ASCOM.Meade.net
                         {
                             //Read the screen
                             case "readdisplay":
-                                var output = SharedResourcesWrapper.SendString("ED");
+                                var output = SharedResourcesWrapper.SendString(Tl, "ED");
                                 return output;
 
                             //top row of buttons
                             case "enter":
-                                SharedResourcesWrapper.SendBlind("EK13");
+                                SharedResourcesWrapper.SendBlind(Tl,"EK13");
                                 break;
                             case "longenter":
-                                SharedResourcesWrapper.SendBlind("EK10");
+                                SharedResourcesWrapper.SendBlind(Tl, "EK10");
                                 break;
                             case "mode":
-                                SharedResourcesWrapper.SendBlind("EK9");
+                                SharedResourcesWrapper.SendBlind(Tl, "EK9");
                                 break;
                             case "longmode":
-                                SharedResourcesWrapper.SendBlind("EK11");
+                                SharedResourcesWrapper.SendBlind(Tl, "EK11");
                                 break;
                             case "goto":
-                                SharedResourcesWrapper.SendBlind("EK24");
+                                SharedResourcesWrapper.SendBlind(Tl, "EK24");
                                 break;
                             case "longgoto":
-                                SharedResourcesWrapper.SendBlind("EK25");
+                                SharedResourcesWrapper.SendBlind(Tl, "EK25");
                                 break;
                             case "0": //light and 0
-                                SharedResourcesWrapper.SendBlind("EK48");
+                                SharedResourcesWrapper.SendBlind(Tl, "EK48");
                                 break;
                             case "1":
-                                SharedResourcesWrapper.SendBlind("EK49");
+                                SharedResourcesWrapper.SendBlind(Tl, "EK49");
                                 break;
                             case "2":
-                                SharedResourcesWrapper.SendBlind("EK50");
+                                SharedResourcesWrapper.SendBlind(Tl, "EK50");
                                 break;
                             case "3":
-                                SharedResourcesWrapper.SendBlind("EK51");
+                                SharedResourcesWrapper.SendBlind(Tl, "EK51");
                                 break;
                             case "4":
-                                SharedResourcesWrapper.SendBlind("EK52");
+                                SharedResourcesWrapper.SendBlind(Tl, "EK52");
                                 break;
                             case "5":
-                                SharedResourcesWrapper.SendBlind("EK53");
+                                SharedResourcesWrapper.SendBlind(Tl, "EK53");
                                 break;
                             case "6":
-                                SharedResourcesWrapper.SendBlind("EK54");
+                                SharedResourcesWrapper.SendBlind(Tl, "EK54");
                                 break;
                             case "7":
-                                SharedResourcesWrapper.SendBlind("EK55");
+                                SharedResourcesWrapper.SendBlind(Tl, "EK55");
                                 break;
                             case "8":
-                                SharedResourcesWrapper.SendBlind("EK56");
+                                SharedResourcesWrapper.SendBlind(Tl, "EK56");
                                 break;
                             case "9":
-                                SharedResourcesWrapper.SendBlind("EK57");
+                                SharedResourcesWrapper.SendBlind(Tl, "EK57");
                                 break;
 
                             case "up":
-                                SharedResourcesWrapper.SendBlind("EK94");
+                                SharedResourcesWrapper.SendBlind(Tl, "EK94");
                                 break;
                             case "down":
-                                SharedResourcesWrapper.SendBlind("EK118");
+                                SharedResourcesWrapper.SendBlind(Tl, "EK118");
                                 break;
                             case "back":
                             case "left":
-                                SharedResourcesWrapper.SendBlind("EK87");
+                                SharedResourcesWrapper.SendBlind(Tl, "EK87");
                                 break;
                             case "forward":
                             case "right":
-                                SharedResourcesWrapper.SendBlind("EK69");
+                                SharedResourcesWrapper.SendBlind(Tl, "EK69");
                                 break;
                             case "scrollup":
-                                SharedResourcesWrapper.SendBlind("EK85");
+                                SharedResourcesWrapper.SendBlind(Tl, "EK85");
                                 break;
                             case "scrolldown":
-                                SharedResourcesWrapper.SendBlind("EK68");
+                                SharedResourcesWrapper.SendBlind(Tl, "EK68");
                                 break;
                             case "?":
-                                SharedResourcesWrapper.SendBlind("EK63");
+                                SharedResourcesWrapper.SendBlind(Tl, "EK63");
                                 break;
                             default:
                                 LogMessage("", "Action {0}, parameters {1} not implemented", actionName,
@@ -385,7 +385,7 @@ namespace ASCOM.Meade.net
                 CheckConnected("CommandBlind");
                 // Call CommandString and return as soon as it finishes
                 //this.CommandString(command, raw);
-                SharedResourcesWrapper.SendBlind(command, raw);
+                SharedResourcesWrapper.SendBlind(Tl, command, raw);
                 // or
                 //throw new ASCOM.MethodNotImplementedException("CommandBlind");
                 // DO NOT have both these sections!  One or the other
@@ -404,7 +404,7 @@ namespace ASCOM.Meade.net
             {
                 LogMessage("CommandBool", $"raw: {raw} command {command}");
                 CheckConnected("CommandBool");
-                var result = SharedResourcesWrapper.SendBool(command, raw);
+                var result = SharedResourcesWrapper.SendBool(Tl, command, raw);
                 LogMessage("CommandBool", $"Completed: {result}");
                 return result;
             }
@@ -429,11 +429,11 @@ namespace ASCOM.Meade.net
                 // https://bitbucket.org/cjdskunkworks/meadeautostar497/issues/24/get-set-tracking#comment-60586901
                 if (command == (raw ? ":GW#" : "GW"))
                 {
-                    result = SharedResourcesWrapper.SendChars(command, raw, count: 3);
+                    result = SharedResourcesWrapper.SendChars(Tl, command, raw, count: 3);
                 }
                 else
                 {
-                    result = SharedResourcesWrapper.SendString(command, raw);
+                    result = SharedResourcesWrapper.SendString(Tl, command, raw);
                 }
 
                 LogMessage("CommandString", $"Completed: {result}");
@@ -453,8 +453,8 @@ namespace ASCOM.Meade.net
 
             // Clean up the tracelogger and util objects
             Tl.Enabled = false;
-            Tl.Dispose();
-            Tl = null;
+            //Tl.Dispose();
+            //Tl = null;
         }
 
         public bool Connected
@@ -805,7 +805,7 @@ namespace ASCOM.Meade.net
                     return;
                 }
 
-                var result = SharedResourcesWrapper.SendString("GZ");
+                var result = SharedResourcesWrapper.SendString(Tl, "GZ");
                 LogMessage("SetLongFormat", $"Get - Azimuth {result}");
                 //:GZ# Get telescope azimuth
                 //Returns: DDD*MM.T or DDD*MM'SS#
@@ -816,12 +816,12 @@ namespace ASCOM.Meade.net
                 if (SharedResourcesWrapper.IsLongFormat != setLongFormat)
                 {
                     _utilities.WaitForMilliseconds(500);
-                    SharedResourcesWrapper.SendBlind("U");
+                    SharedResourcesWrapper.SendBlind(Tl, "U");
                     //:U# Toggle between low/hi precision positions
                     //Low - RA displays and messages HH:MM.T sDD*MM
                     //High - Dec / Az / El displays and messages HH:MM: SS sDD*MM:SS
                     //    Returns Nothing
-                    result = SharedResourcesWrapper.SendString("GZ");
+                    result = SharedResourcesWrapper.SendString(Tl, "GZ");
                     SharedResourcesWrapper.IsLongFormat = result.Length > 6;
                     LogMessage("SetLongFormat", $"Get - Azimuth {result}");
                     if (SharedResourcesWrapper.IsLongFormat == setLongFormat)
@@ -844,7 +844,7 @@ namespace ASCOM.Meade.net
         private bool TogglePrecision()
         {
             LogMessage("TogglePrecision", "Toggling slewing precision");
-            var result = SharedResourcesWrapper.SendChar("P");
+            var result = SharedResourcesWrapper.SendChar(Tl,"P");
             //:P# Toggles High Precsion Pointing. When High precision pointing is enabled scope will first allow the operator to center a nearby bright star before moving to the actual target.
             //Returns: <string>
             //"HIGH PRECISION" Current setting after this command.
@@ -883,7 +883,7 @@ namespace ASCOM.Meade.net
             {
                 CheckConnectedAndValidateSite(site, "SelectSite");
 
-                SharedResourcesWrapper.SendBlind($"W{site}");
+                SharedResourcesWrapper.SendBlind(Tl, $"W{site}");
                 //:W<n>#
                 //Set current site to<n>, an ASCII digit in the range 1..4
                 //Returns: Nothing
@@ -951,7 +951,7 @@ namespace ASCOM.Meade.net
                         Resources.Telescope_GetSiteName_Site_out_of_range);
             }
 
-            var result = SharedResourcesWrapper.SendChar(command);
+            var result = SharedResourcesWrapper.SendChar(Tl, command);
             if (result != "1")
             {
                 throw new InvalidOperationException("Failed to set site name.");
@@ -965,22 +965,22 @@ namespace ASCOM.Meade.net
             switch (site)
             {
                 case 1:
-                    return SharedResourcesWrapper.SendString("GM");
+                    return SharedResourcesWrapper.SendString(Tl, "GM");
                 //:GM# Get Site 1 Name
                 //Returns: <string>#
                 //A '#' terminated string with the name of the requested site.
                 case 2:
-                    return SharedResourcesWrapper.SendString("GN");
+                    return SharedResourcesWrapper.SendString(Tl, "GN");
                 //:GN# Get Site 2 Name
                 //Returns: <string>#
                 //A '#' terminated string with the name of the requested site.
                 case 3:
-                    return SharedResourcesWrapper.SendString("GO");
+                    return SharedResourcesWrapper.SendString(Tl, "GO");
                 //:GO# Get Site 3 Name
                 //Returns: <string>#
                 //A '#' terminated string with the name of the requested site.
                 case 4:
-                    return SharedResourcesWrapper.SendString("GP");
+                    return SharedResourcesWrapper.SendString(Tl, "GP");
                 //:GP# Get Site 4 Name
                 //Returns: <string>#
                 //A '#' terminated string with the name of the requested site.
@@ -1016,11 +1016,11 @@ namespace ASCOM.Meade.net
                 {
                     //string name = "Short driver name - please customise";
 
-                    //var telescopeProduceName = _sharedResourcesWrapper.SendString("GVP");
+                    //var telescopeProduceName = _sharedResourcesWrapper.SendString(Tl, "GVP");
                     ////:GVP# Get Telescope Product Name
                     ////Returns: <string>#
 
-                    //var firmwareVersion = _sharedResourcesWrapper.SendString("GVN");
+                    //var firmwareVersion = _sharedResourcesWrapper.SendString(Tl, "GVN");
                     ////:GVN# Get Telescope Firmware Number
                     ////Returns: dd.d#
 
@@ -1049,7 +1049,7 @@ namespace ASCOM.Meade.net
                 CheckParked();
 
                 LogMessage("AbortSlew", "Aborting slew");
-                SharedResourcesWrapper.SendBlind("Q");
+                SharedResourcesWrapper.SendBlind(Tl, "Q");
                 //:Q# Halt all current slewing
                 //Returns:Nothing
 
@@ -1138,13 +1138,13 @@ namespace ASCOM.Meade.net
                     switch (value)
                     {
                         case AlignmentModes.algAltAz:
-                            SharedResourcesWrapper.SendBlind("AA");
+                            SharedResourcesWrapper.SendBlind(Tl, "AA");
                             //:AA# Sets telescope the AltAz alignment mode
                             //Returns: nothing
                             break;
                         case AlignmentModes.algPolar:
                         case AlignmentModes.algGermanPolar:
-                            SharedResourcesWrapper.SendBlind("AP");
+                            SharedResourcesWrapper.SendBlind(Tl, "AP");
                             //:AP# Sets telescope to Polar alignment mode
                             //Returns: nothing
                             break;
@@ -1174,7 +1174,7 @@ namespace ASCOM.Meade.net
             //D If scope is currently in the Downloader[Autostar II & Autostar]
             //L If scope in Land Mode
             //P If scope in Polar Mode
-            var alignmentString = SharedResourcesWrapper.SendChar(ack.ToString());
+            var alignmentString = SharedResourcesWrapper.SendChar(Tl, ack.ToString());
             return alignmentString;
         }
 
@@ -1265,7 +1265,7 @@ namespace ASCOM.Meade.net
                 CheckParked();
 
                 //firmware bug in 44Eg, :GA# is returning the dec, not the altitude!
-                var result = SharedResourcesWrapper.SendString("GA");
+                var result = SharedResourcesWrapper.SendString(Tl, "GA");
                 //:GA# Get Telescope Altitude
                 //Returns: sDD* MM# or sDD*MM'SS#
                 //The current scope altitude. The returned format depending on the current precision setting.
@@ -1430,7 +1430,7 @@ namespace ASCOM.Meade.net
             {
                 CheckParked();
 
-                var result = SharedResourcesWrapper.SendString("GZ");
+                var result = SharedResourcesWrapper.SendString(Tl, "GZ");
                 //:GZ# Get telescope azimuth
                 //Returns: DDD*MM#T or DDD*MM'SS#
                 //The current telescope Azimuth depending on the selected precision.
@@ -1787,7 +1787,7 @@ namespace ASCOM.Meade.net
                     {
                         CheckParked();
 
-                        var result = SharedResourcesWrapper.SendString("GD");
+                        var result = SharedResourcesWrapper.SendString(Tl, "GD");
                         //:GD# Get Telescope Declination.
                         //Returns: sDD*MM# or sDD*MM'SS#
                         //Depending upon the current precision setting for the telescope.
@@ -1972,7 +1972,7 @@ namespace ASCOM.Meade.net
             }
 
             LogMessage($"{propertyName} Set", $"Setting new guiderate {value.ToString(CultureInfo.CurrentCulture)} arc seconds/second ({value.ToString(CultureInfo.CurrentCulture)} degrees/second)");
-            SharedResourcesWrapper.SendBlind($"Rg{value:00.0}");
+            SharedResourcesWrapper.SendBlind(Tl, $"Rg{value:00.0}");
             //:RgSS.S#
             //Set guide rate to +/ -SS.S to arc seconds per second.This rate is added to or subtracted from the current tracking
             //Rates when the CCD guider or handbox guider buttons are pressed when the guide rate is selected.Rate shall not exceed
@@ -2097,22 +2097,22 @@ namespace ASCOM.Meade.net
                         //do nothing, it's ok this time as we're halting the slew.
                         break;
                     case 1:
-                        SharedResourcesWrapper.SendBlind("RG");
+                        SharedResourcesWrapper.SendBlind(Tl, "RG");
                         //:RG# Set Slew rate to Guiding Rate (slowest)
                         //Returns: Nothing
                         break;
                     case 2:
-                        SharedResourcesWrapper.SendBlind("RC");
+                        SharedResourcesWrapper.SendBlind(Tl, "RC");
                         //:RC# Set Slew rate to Centering rate (2nd slowest)
                         //Returns: Nothing
                         break;
                     case 3:
-                        SharedResourcesWrapper.SendBlind("RM");
+                        SharedResourcesWrapper.SendBlind(Tl, "RM");
                         //:RM# Set Slew rate to Find Rate (2nd Fastest)
                         //Returns: Nothing
                         break;
                     case 4:
-                        SharedResourcesWrapper.SendBlind("RS");
+                        SharedResourcesWrapper.SendBlind(Tl, "RS");
                         //:RS# Set Slew rate to max (fastest)
                         //Returns: Nothing
                         break;
@@ -2132,21 +2132,21 @@ namespace ASCOM.Meade.net
                                 }
 
                                 SharedResourcesWrapper.MovingPrimary = false;
-                                SharedResourcesWrapper.SendBlind("Qe");
+                                SharedResourcesWrapper.SendBlind(Tl, "Qe");
                                 //:Qe# Halt eastward Slews
                                 //Returns: Nothing
-                                SharedResourcesWrapper.SendBlind("Qw");
+                                SharedResourcesWrapper.SendBlind(Tl, "Qw");
                                 //:Qw# Halt westward Slews
                                 //Returns: Nothing
                                 break;
                             case ComparisonResult.Greater:
-                                SharedResourcesWrapper.SendBlind("Me");
+                                SharedResourcesWrapper.SendBlind(Tl, "Me");
                                 //:Me# Move Telescope East at current slew rate
                                 //Returns: Nothing
                                 SharedResourcesWrapper.MovingPrimary = true;
                                 break;
                             case ComparisonResult.Lower:
-                                SharedResourcesWrapper.SendBlind("Mw");
+                                SharedResourcesWrapper.SendBlind(Tl, "Mw");
                                 //:Mw# Move Telescope West at current slew rate
                                 //Returns: Nothing
                                 SharedResourcesWrapper.MovingPrimary = true;
@@ -2164,21 +2164,21 @@ namespace ASCOM.Meade.net
                                 }
 
                                 SharedResourcesWrapper.MovingSecondary = false;
-                                SharedResourcesWrapper.SendBlind("Qn");
+                                SharedResourcesWrapper.SendBlind(Tl, "Qn");
                                 //:Qn# Halt northward Slews
                                 //Returns: Nothing
-                                SharedResourcesWrapper.SendBlind("Qs");
+                                SharedResourcesWrapper.SendBlind(Tl, "Qs");
                                 //:Qs# Halt southward Slews
                                 //Returns: Nothing
                                 break;
                             case ComparisonResult.Greater:
-                                SharedResourcesWrapper.SendBlind("Mn");
+                                SharedResourcesWrapper.SendBlind(Tl, "Mn");
                                 //:Mn# Move Telescope North at current slew rate
                                 //Returns: Nothing
                                 SharedResourcesWrapper.MovingSecondary = true;
                                 break;
                             case ComparisonResult.Lower:
-                                SharedResourcesWrapper.SendBlind("Ms");
+                                SharedResourcesWrapper.SendBlind(Tl, "Ms");
                                 //:Ms# Move Telescope South at current slew rate
                                 //Returns: Nothing
                                 SharedResourcesWrapper.MovingSecondary = true;
@@ -2251,7 +2251,7 @@ namespace ASCOM.Meade.net
 
                 if (SharedResourcesWrapper.ProductName != TelescopeList.LX200CLASSIC)
                 {
-                    SharedResourcesWrapper.SendBlind("hP");
+                    SharedResourcesWrapper.SendBlind(Tl, "hP");
                     //:hP# Autostar, Autostar II and LX 16" Slew to Park Position
                     //Returns: Nothing
                 }
@@ -2333,7 +2333,7 @@ namespace ASCOM.Meade.net
                         }
 
                         LogMessage("PulseGuide", "Using new pulse guiding technique");
-                        SharedResourcesWrapper.SendBlind($"Mg{d}{duration:0000}");
+                        SharedResourcesWrapper.SendBlind(Tl, $"Mg{d}{duration:0000}");
                         //:MgnDDDD#
                         //:MgsDDDD#
                         //:MgeDDDD#
@@ -2419,7 +2419,7 @@ namespace ASCOM.Meade.net
                     {
                         CheckParked();
 
-                        var result = SharedResourcesWrapper.SendString("GR");
+                        var result = SharedResourcesWrapper.SendString(Tl, "GR");
                         //:GR# Get Telescope RA
                         //Returns: HH:MM.T# or HH:MM:SS#
                         //Depending which precision is set for the telescope
@@ -2627,7 +2627,7 @@ namespace ASCOM.Meade.net
                     {
                         CheckParked();
 
-                        var latitude = SharedResourcesWrapper.SendString("Gt");
+                        var latitude = SharedResourcesWrapper.SendString(Tl, "Gt");
                         //:Gt# Get Current Site Latitude
                         //Returns: sDD* MM#
                         //The latitude of the current site. Positive inplies North latitude.
@@ -2674,7 +2674,7 @@ namespace ASCOM.Meade.net
                     int m = Convert.ToInt32(60 * (absValue - d));
                     var commandString = $"St{sign}{d:00}*{m:00}";
 
-                    var result = SharedResourcesWrapper.SendChar(commandString);
+                    var result = SharedResourcesWrapper.SendChar(Tl, commandString);
                     //:StsDD*MM#
                     //Sets the current site latitude to sDD* MM#
                     //Returns:
@@ -2702,7 +2702,7 @@ namespace ASCOM.Meade.net
                     {
                         CheckParked();
 
-                        var longitude = SharedResourcesWrapper.SendString("Gg");
+                        var longitude = SharedResourcesWrapper.SendString(Tl, "Gg");
                         //:Gg# Get Current Site Longitude
                         //Returns: sDDD*MM#
                         //The current site Longitude. East Longitudes are expressed as negative
@@ -2753,7 +2753,7 @@ namespace ASCOM.Meade.net
 
                     var commandstring = $"Sg{d:000}*{m:00}";
 
-                    var result = SharedResourcesWrapper.SendChar(commandstring);
+                    var result = SharedResourcesWrapper.SendChar(Tl, commandstring);
                     //:SgDDD*MM#
                     //Set current site's longitude to DDD*MM an ASCII position string
                     //Returns:
@@ -2907,7 +2907,7 @@ namespace ASCOM.Meade.net
                     var command = $"Sa{s}{dms}";
 
                     LogMessage("TargetAltitude Set", $"{command}");
-                    var response = SharedResourcesWrapper.SendBool(command);
+                    var response = SharedResourcesWrapper.SendBool(Tl, command);
                     //:SasDD*MM#
                     //  Set target object altitude to sDD*MM# or sDD*MM’SS# [LX 16”, Autostar, Autostar II]
                     //    Returns:
@@ -2944,7 +2944,7 @@ namespace ASCOM.Meade.net
                     var command = $"Sz{dms}";
 
                     LogMessage("TargetAzimuth Set", $"{command}");
-                    var response = SharedResourcesWrapper.SendBool(command);
+                    var response = SharedResourcesWrapper.SendBool(Tl, command);
                     //:SzDDD*MM#
                     //  Sets the target Object Azimuth[LX 16” and Autostar II only]
                     //    Returns:
@@ -2978,7 +2978,7 @@ namespace ASCOM.Meade.net
                 {
                     case true:
                         LogMessage("DoSlewAsync", "Executing Polar slew");
-                        var response = SharedResourcesWrapper.SendChar("MS");
+                        var response = SharedResourcesWrapper.SendChar(Tl, "MS");
                         //:MS# Slew to Target Object
                         //Returns:
                         //0 Slew is Possible
@@ -3018,7 +3018,7 @@ namespace ASCOM.Meade.net
                         Retry(6, () =>
                         {
                             LogMessage("DoSlewAsync", "Executing Alt Az");
-                            var maResponse = SharedResourcesWrapper.SendChar("MA");
+                            var maResponse = SharedResourcesWrapper.SendChar(Tl, "MA");
                             //:MA# Autostar, LX 16", Autostar II - Slew to target Alt and Az
                             //Returns:
                             //0 - No fault
@@ -3242,7 +3242,7 @@ namespace ASCOM.Meade.net
             string result;
             try
             {
-                result = SharedResourcesWrapper.SendString("D");
+                result = SharedResourcesWrapper.SendString(Tl, "D");
             }
             catch (TimeoutException)
             {
@@ -3343,7 +3343,7 @@ namespace ASCOM.Meade.net
                 CheckConnected("SyncToTarget");
                 CheckParked();
 
-                var result = SharedResourcesWrapper.SendString("CM");
+                var result = SharedResourcesWrapper.SendString(Tl, "CM");
                 //:CM# Synchronizes the telescope's position with the currently selected database object's coordinates.
                 //Returns:
                 //LX200's - a "#" terminated string with the name of the object that was synced.
@@ -3432,7 +3432,7 @@ namespace ASCOM.Meade.net
                     var command = $"Sd{s}{dms}";
 
                     LogMessage("TargetDeclination Set", $"{command}");
-                    var result = SharedResourcesWrapper.SendChar(command);
+                    var result = SharedResourcesWrapper.SendChar(Tl, command);
                     //:SdsDD*MM#
                     //Set target object declination to sDD*MM or sDD*MM:SS depending on the current precision setting
                     //Returns:
@@ -3501,7 +3501,7 @@ namespace ASCOM.Meade.net
 
                     var command = $"Sr{hms}";
                     LogMessage("TargetRightAscension Set", $"{command}");
-                    var response = SharedResourcesWrapper.SendChar(command);
+                    var response = SharedResourcesWrapper.SendChar(Tl, command);
                     //:SrHH:MM.T#
                     //:SrHH:MM:SS#
                     //Set target object RA to HH:MM.T or HH: MM: SS depending on the current precision setting.
@@ -3564,7 +3564,7 @@ namespace ASCOM.Meade.net
                     if (!value)
                     {
                         SharedResources.AlignmentMode = AlignmentMode;
-                        SharedResourcesWrapper.SendBlind("AL");
+                        SharedResourcesWrapper.SendBlind(Tl, "AL");
                     }
                     else
                     {
@@ -3635,22 +3635,22 @@ namespace ASCOM.Meade.net
                     switch (value)
                     {
                         case DriveRates.driveSidereal:
-                            SharedResourcesWrapper.SendBlind("TQ");
+                            SharedResourcesWrapper.SendBlind(Tl, "TQ");
                             //:TQ# Selects sidereal tracking rate
                             //Returns: Nothing
                             break;
                         case DriveRates.driveLunar:
-                            SharedResourcesWrapper.SendBlind("TL");
+                            SharedResourcesWrapper.SendBlind(Tl, "TL");
                             //:TL# Set Lunar Tracking Rage
                             //Returns: Nothing
                             break;
                         case DriveRates.driveSolar:
-                            SharedResourcesWrapper.SendBlind("TS");
+                            SharedResourcesWrapper.SendBlind(Tl, "TS");
                             //    //:TS# Select Solar tracking rate. [LS Only]
                             //    //Returns: Nothing
                             break;
                         //case DriveRates.driveKing:
-                        //    SharedResourcesWrapper.SendBlind("TM");
+                        //    SharedResourcesWrapper.SendBlind(Tl, "TM");
                         //    //:TM# Select custom tracking rate [ no-op in Autostar II]
                         //    //Returns: Nothing
                         //    break;
@@ -3692,7 +3692,7 @@ namespace ASCOM.Meade.net
 
         private TimeSpan GetUtcCorrection()
         {
-            string utcOffSet = SharedResourcesWrapper.SendString("GG");
+            string utcOffSet = SharedResourcesWrapper.SendString(Tl, "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
@@ -3723,11 +3723,11 @@ namespace ASCOM.Meade.net
 
                         var telescopeDateDetails = new TelescopeDateDetails
                         {
-                            TelescopeDate = SharedResourcesWrapper.SendString("GC"),
+                            TelescopeDate = SharedResourcesWrapper.SendString(Tl, "GC"),
                             //:GC# Get current date.
                             //Returns: MM/DD/YY#
                             //The current local calendar date for the telescope.
-                            TelescopeTime = SharedResourcesWrapper.SendString("GL"),
+                            TelescopeTime = SharedResourcesWrapper.SendString(Tl, "GL"),
                             //:GL# Get Local Time in 24 hour format
                             //Returns: HH:MM:SS#
                             //The Local Time in 24 - hour Format
@@ -3780,7 +3780,7 @@ namespace ASCOM.Meade.net
                     var localDateTime = value - utcCorrection;
 
                     string localStingCommand = $"SL{localDateTime:HH:mm:ss}";
-                    var timeResult = SharedResourcesWrapper.SendChar(localStingCommand);
+                    var timeResult = SharedResourcesWrapper.SendChar(Tl, localStingCommand);
                     //:SLHH:MM:SS#
                     //Set the local Time
                     //Returns:
@@ -3792,7 +3792,7 @@ namespace ASCOM.Meade.net
                     }
 
                     string localDateCommand = $"SC{localDateTime:MM/dd/yy}";
-                    var dateResult = SharedResourcesWrapper.SendChar(localDateCommand);
+                    var dateResult = SharedResourcesWrapper.SendChar(Tl, localDateCommand);
                     //:SCMM/DD/YY#
                     //Change Handbox Date to MM/DD/YY
                     //Returns: <D><string>
@@ -3833,7 +3833,7 @@ namespace ASCOM.Meade.net
                 {
                     case TelescopeList.RCX400:
                     case TelescopeList.LX200GPS:
-                        SharedResourcesWrapper.SendChar("I");
+                        SharedResourcesWrapper.SendChar(Tl, "I");
                         //:I# LX200 GPS Only - Causes the telescope to cease current operations and restart at its power on initialization.
                         //Returns: X once the handset restart has completed
 
@@ -3871,7 +3871,7 @@ namespace ASCOM.Meade.net
             var localDateTime = _clock.UtcNow - utcCorrection;
 
             //localDateTime: HH: mm: ss
-            var result = SharedResourcesWrapper.SendChar($"hI{localDateTime:yyMMddHHmmss}");
+            var result = SharedResourcesWrapper.SendChar(Tl, $"hI{localDateTime:yyMMddHHmmss}");
             //:hIYYMMDDHHMMSS#
             //Bypass handbox entry of daylight savings, date and time.Use the values supplied in this command.This feature is
             //intended to allow use of the Autostar II from permanent installations where GPS reception is not possible, such as within
diff --git a/Meade.net.UnitTests/SharedResourcesUnitTests.cs b/Meade.net.UnitTests/SharedResourcesUnitTests.cs
index c0e8442..6eef33d 100644
--- a/Meade.net.UnitTests/SharedResourcesUnitTests.cs
+++ b/Meade.net.UnitTests/SharedResourcesUnitTests.cs
@@ -38,7 +38,7 @@ namespace Meade.net.UnitTests
         public void SendBlind_WhenCalled_Then_ClearsBuffersAndSendsMessage(bool raw, string expectedMessage)
         {
             var sendMessage = "Test";
-            SharedResources.SendBlind(sendMessage, raw);
+            SharedResources.SendBlind(_traceLoggerMock.Object, sendMessage, raw);
 
             _serialMock.Verify(x=> x.ClearBuffers(), Times.Once);
             _serialMock.Verify(x=>x.Transmit(expectedMessage), Times.Once);
diff --git a/Meade.net.focuser/Focuser.cs b/Meade.net.focuser/Focuser.cs
index 75ae1cc..9753bb6 100644
--- a/Meade.net.focuser/Focuser.cs
+++ b/Meade.net.focuser/Focuser.cs
@@ -57,11 +57,11 @@ namespace ASCOM.Meade.net
             Initialise(nameof(Focuser));
         }
 
-        public Focuser(IUtil util, ISharedResourcesWrapper sharedResourcesWrapper) : base(sharedResourcesWrapper)
+        public Focuser(IUtil util, ISharedResourcesWrapper sharedResourcesWrapper, ITraceLogger traceLogger) : base(sharedResourcesWrapper)
         {
             _utilities = util;
 
-            Initialise(nameof(Focuser));
+            Initialise(nameof(Focuser), traceLogger);
         }
 
         //
@@ -78,17 +78,17 @@ namespace ASCOM.Meade.net
         /// </summary>
         public void SetupDialog()
         {
-            Tl.LogMessage("SetupDialog", "Opening setup dialog");
+            Tl.LogMessage("SetupDialog", "Opening setup dialog", false);
             SharedResourcesWrapper.SetupDialog();
             ReadProfile();
-            Tl.LogMessage("SetupDialog", "complete");
+            Tl.LogMessage("SetupDialog", "complete", false);
         }
 
         public ArrayList SupportedActions
         {
             get
             {
-                Tl.LogMessage("SupportedActions Get", "Returning empty arraylist");
+                Tl.LogMessage("SupportedActions Get", "Returning empty arraylist", false);
                 return new ArrayList();
             }
         }
@@ -105,7 +105,7 @@ namespace ASCOM.Meade.net
             CheckConnected("CommandBlind");
             // Call CommandString and return as soon as it finishes
             //this.CommandString(command, raw);
-            SharedResourcesWrapper.SendBlind(command, raw);
+            SharedResourcesWrapper.SendBlind(Tl, command, raw);
             // or
             //throw new ASCOM.MethodNotImplementedException("CommandBlind");
             // DO NOT have both these sections!  One or the other
@@ -116,7 +116,7 @@ namespace ASCOM.Meade.net
         {
             LogMessage("CommandBool", "raw: {0} command {0}", raw, command);
             CheckConnected("CommandBool");
-            var result = SharedResourcesWrapper.SendBool(command, raw);
+            var result = SharedResourcesWrapper.SendBool(Tl, command, raw);
             LogMessage("CommandBool", "Completed: {0}", result);
             return result;
             // or
@@ -131,7 +131,7 @@ namespace ASCOM.Meade.net
             // 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
-            var result = SharedResourcesWrapper.SendString(command, raw);
+            var result = SharedResourcesWrapper.SendString(Tl, command, raw);
             LogMessage("CommandBool", "Completed: {0}", result);
             return result;
             //throw new ASCOM.MethodNotImplementedException("CommandString");
@@ -141,8 +141,8 @@ namespace ASCOM.Meade.net
         {
             // Clean up the tracelogger and util objects
             Tl.Enabled = false;
-            Tl.Dispose();
-            Tl = null;
+            //Tl.Dispose();
+            //Tl = null;
         }
 
         public bool Connected
@@ -204,7 +204,7 @@ namespace ASCOM.Meade.net
             {
                 //string name = "Short driver name - please customise";
                 string name = DriverDescription;
-                Tl.LogMessage("Name Get", name);
+                Tl.LogMessage("Name Get", name, false);
                 return name;
             }
         }
@@ -219,20 +219,20 @@ namespace ASCOM.Meade.net
             {
                 CheckConnected("Absolute Get");
 
-                Tl.LogMessage("Absolute Get", false.ToString());
+                Tl.LogMessage("Absolute Get", false.ToString(), false);
                 return false; // This is a relative focuser
             }
         }
 
         public void Halt()
         {
-            Tl.LogMessage("Halt", "Halting");
+            Tl.LogMessage("Halt", "Halting", false);
 
             CheckConnected("Halt");
 
             //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(Tl, "FQ");
             //:FQ# Halt Focuser Motion
             //Returns: Nothing
         }
@@ -241,7 +241,7 @@ namespace ASCOM.Meade.net
         {
             get
             {
-                Tl.LogMessage("IsMoving Get", false.ToString());
+                Tl.LogMessage("IsMoving Get", false.ToString(), false);
                 return false; // This focuser always moves instantaneously so no need for IsMoving ever to be True
             }
         }
@@ -250,12 +250,12 @@ namespace ASCOM.Meade.net
         {
             get
             {
-                Tl.LogMessage("Link Get", Connected.ToString());
+                Tl.LogMessage("Link Get", Connected.ToString(), false);
                 return Connected; // Direct function to the connected method, the Link method is just here for backwards compatibility
             }
             set
             {
-                Tl.LogMessage("Link Set", value.ToString());
+                Tl.LogMessage("Link Set", value.ToString(), false);
                 Connected = value; // Direct function to the connected method, the Link method is just here for backwards compatibility
             }
         }
@@ -265,7 +265,7 @@ namespace ASCOM.Meade.net
         {
             get
             {
-                Tl.LogMessage("MaxIncrement Get", _maxIncrement.ToString());
+                Tl.LogMessage("MaxIncrement Get", _maxIncrement.ToString(), false);
                 return _maxIncrement; // Maximum change in one move
             }
         }
@@ -276,14 +276,14 @@ namespace ASCOM.Meade.net
         {
             get
             {
-                Tl.LogMessage("MaxStep Get", _maxStep.ToString());
+                Tl.LogMessage("MaxStep Get", _maxStep.ToString(), false);
                 return _maxStep;
             }
         }
 
         public void Move(int position)
         {
-            Tl.LogMessage("Move", position.ToString());
+            Tl.LogMessage("Move", position.ToString(), false);
             CheckConnected("Move");
 
             if (position < -MaxIncrement || position > MaxIncrement)
@@ -311,7 +311,7 @@ namespace ASCOM.Meade.net
             //ApplyBacklashCompensation(direction);
             if (direction & backlashCompensationSteps != 0)
             {
-                Tl.LogMessage("Move", "Applying backlash compensation");
+                Tl.LogMessage("Move", "Applying backlash compensation", false);
                 MoveFocuser(!direction, backlashCompensationSteps);
             }
 
@@ -325,7 +325,7 @@ namespace ASCOM.Meade.net
             if (!_profileProperties.DynamicBreaking)
                 return;
 
-            Tl.LogMessage("Move", "Applying dynamic breaking");
+            Tl.LogMessage("Move", "Applying dynamic breaking", false);
 
             PerformFocuserMove(directionOut);
             Halt();
@@ -354,7 +354,7 @@ namespace ASCOM.Meade.net
 
         private void PerformFocuserMove(bool directionOut)
         {
-            SharedResourcesWrapper.SendBlind(directionOut ? "F+" : "F-");
+            SharedResourcesWrapper.SendBlind(Tl, directionOut ? "F+" : "F-");
             //:F+# Start Focuser moving inward (toward objective)
             //Returns: None
 
@@ -368,7 +368,7 @@ namespace ASCOM.Meade.net
         {
             get
             {
-                Tl.LogMessage("StepSize Get", "Not implemented");
+                Tl.LogMessage("StepSize Get", "Not implemented", false);
                 throw new PropertyNotImplementedException("StepSize", false);
             }
         }
@@ -377,13 +377,13 @@ namespace ASCOM.Meade.net
         {
             get
             {
-                Tl.LogMessage("TempComp Get", false.ToString());
+                Tl.LogMessage("TempComp Get", false.ToString(), false);
                 return false;
             }
             // ReSharper disable once ValueParameterNotUsed
             set
             {
-                Tl.LogMessage("TempComp Set", "Not implemented");
+                Tl.LogMessage("TempComp Set", "Not implemented", false);
                 throw new PropertyNotImplementedException("TempComp", false);
             }
         }
@@ -392,7 +392,7 @@ namespace ASCOM.Meade.net
         {
             get
             {
-                Tl.LogMessage("TempCompAvailable Get", false.ToString());
+                Tl.LogMessage("TempCompAvailable Get", false.ToString(), false);
                 return false; // Temperature compensation is not available in this driver
             }
         }
@@ -401,7 +401,7 @@ namespace ASCOM.Meade.net
         {
             get
             {
-                Tl.LogMessage("Temperature Get", "Not implemented");
+                Tl.LogMessage("Temperature Get", "Not implemented", false);
                 throw new PropertyNotImplementedException("Temperature", false);
             }
         }
diff --git a/Meade.net/MeadeTelescopeBase.cs b/Meade.net/MeadeTelescopeBase.cs
index b7b2963..35e38c1 100644
--- a/Meade.net/MeadeTelescopeBase.cs
+++ b/Meade.net/MeadeTelescopeBase.cs
@@ -3,6 +3,7 @@ using System.Reflection;
 using System.Runtime.InteropServices;
 using ASCOM.Meade.net.Wrapper;
 using ASCOM.Utilities;
+using ASCOM.Utilities.Interfaces;
 
 namespace ASCOM.Meade.net
 {
@@ -12,7 +13,7 @@ namespace ASCOM.Meade.net
         /// <summary>
         /// Variable to hold the trace logger object (creates a diagnostic log file with information that you specify)
         /// </summary>
-        protected static TraceLogger Tl;
+        protected static ITraceLogger Tl;
 
         /// <summary>
         /// Driver description that displays in the ASCOM Chooser.
@@ -32,9 +33,9 @@ namespace ASCOM.Meade.net
             SharedResourcesWrapper = sharedResourcesWrapper;
         }
 
-        protected void Initialise(string className)
+        protected void Initialise(string className, ITraceLogger traceLogger = null)
         {
-            Tl = new TraceLogger("", $"Meade.Generic.{className}");
+            Tl = traceLogger ?? new TraceLogger("", $"Meade.Generic.{className}");
 
             ReadProfile(); // Read device configuration from the ASCOM Profile store
 
@@ -79,7 +80,7 @@ namespace ASCOM.Meade.net
         public static void LogMessage(string identifier, string message, params object[] args)
         {
             var msg = string.Format(message, args);
-            Tl.LogMessage(identifier, msg);
+            Tl.LogMessage(identifier, msg, false);
         }
 
         /// <summary>
@@ -91,7 +92,7 @@ namespace ASCOM.Meade.net
         {
             get
             {
-                Tl.LogMessage("Description Get", DriverDescription);
+                Tl.LogMessage("Description Get", DriverDescription, false);
                 return DriverDescription;
             }
         }
diff --git a/Meade.net/SharedResources.cs b/Meade.net/SharedResources.cs
index a40be75..db51f2e 100644
--- a/Meade.net/SharedResources.cs
+++ b/Meade.net/SharedResources.cs
@@ -80,7 +80,7 @@ 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, bool raw = false)
+        public static void SendBlind(ITraceLogger traceLogger, string message, bool raw = false)
         {
             lock (LockObject)
             {
diff --git a/Meade.net/Wrapper/SharedResourcesWrapper.cs b/Meade.net/Wrapper/SharedResourcesWrapper.cs
index 052350a..d5231a2 100644
--- a/Meade.net/Wrapper/SharedResourcesWrapper.cs
+++ b/Meade.net/Wrapper/SharedResourcesWrapper.cs
@@ -13,11 +13,11 @@ namespace ASCOM.Meade.net.Wrapper
 
         string FirmwareVersion { get; }
         
-        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 SendChars(string message, bool raw = false, int count = 1);
+        string SendString(ITraceLogger traceLogger, string message, bool raw = false);
+        void SendBlind(ITraceLogger traceLogger, string message, bool raw = false);
+        bool SendBool(ITraceLogger traceLogger, string command, bool raw = false);
+        string SendChar(ITraceLogger traceLogger, string message, bool raw = false);
+        string SendChars(ITraceLogger traceLogger, string message, bool raw = false, int count = 1);
 
         string ReadTerminated();
 
@@ -66,27 +66,27 @@ namespace ASCOM.Meade.net.Wrapper
 
         public string FirmwareVersion => SharedResources.FirmwareVersion;
 
-        public string SendString(string message, bool raw = false)
+        public string SendString(ITraceLogger traceLogger, string message, bool raw = false)
         {
             return SharedResources.SendString(message, raw);
         }
 
-        public void SendBlind(string message, bool raw = false)
+        public void SendBlind(ITraceLogger traceLogger, string message, bool raw = false)
         {
-            SharedResources.SendBlind(message, raw);
+            SharedResources.SendBlind(traceLogger, message, raw);
         }
 
-        public bool SendBool(string command, bool raw = false)
+        public bool SendBool(ITraceLogger traceLogger, string command, bool raw = false)
         {
             return SharedResources.SendBool(command, raw);
         }
 
-        public string SendChar(string message, bool raw = false)
+        public string SendChar(ITraceLogger traceLogger, string message, bool raw = false)
         {
             return SharedResources.SendChar(message, raw);
         }
 
-        public string SendChars(string message, bool raw = false, int count = 1)
+        public string SendChars(ITraceLogger traceLogger, string message, bool raw = false, int count = 1)
         {
             return SharedResources.SendChars(message, raw, count);
         }

From 72879902407ffa70b39de340410a7a1bb002ee06 Mon Sep 17 00:00:00 2001
From: Colin Dawson <me@cjdawson.com>
Date: Mon, 25 Jul 2022 16:07:55 +0100
Subject: [PATCH 19/21] Added messages to include information about what is
 being sent via the serial port.

---
 .../TelescopeUnitTests.cs                     |  4 +-
 Meade.net.Telescope/Telescope.cs              |  6 +--
 .../SharedResourcesUnitTests.cs               |  4 +-
 Meade.net/SharedResources.cs                  | 41 ++++++++++++-------
 Meade.net/Wrapper/SharedResourcesWrapper.cs   |  8 ++--
 5 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs b/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
index 6c7565f..53f48eb 100644
--- a/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
+++ b/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
@@ -2679,10 +2679,10 @@ namespace Meade.net.Telescope.UnitTests
         }
 
         [TestCase(DriveRates.driveSidereal, "60.1")]
-        [TestCase(DriveRates.driveSolar, "60.0")]
+        [TestCase(DriveRates.driveSidereal, "60.0")]
         [TestCase(DriveRates.driveLunar, "57.9")]
         [TestCase(DriveRates.driveSidereal, "+60.1")]
-        [TestCase(DriveRates.driveSolar, "+60.0")]
+        [TestCase(DriveRates.driveSidereal, "+60.0")]
         [TestCase(DriveRates.driveLunar, "+57.9")]
         [TestCase(DriveRates.driveLunar, "57.3")]
         [TestCase(DriveRates.driveLunar, "58.9")]
diff --git a/Meade.net.Telescope/Telescope.cs b/Meade.net.Telescope/Telescope.cs
index 967beea..86a2acb 100644
--- a/Meade.net.Telescope/Telescope.cs
+++ b/Meade.net.Telescope/Telescope.cs
@@ -3597,10 +3597,10 @@ namespace ASCOM.Meade.net
 
                     DriveRates result;
 
-                    if (rateDouble.Equals(60.1))
+                    if (rateDouble.Between(59.9, 60.1))
                         result = DriveRates.driveSidereal;
-                    else if (rateDouble.Equals(60.0))
-                        result = DriveRates.driveSolar;
+                    //else if (rateDouble.Equals(60.0))
+                    //    result = DriveRates.driveSolar;
                     else if (rateDouble.Between(57.3, 58.9))
                         result = DriveRates.driveLunar;
                     else
diff --git a/Meade.net.UnitTests/SharedResourcesUnitTests.cs b/Meade.net.UnitTests/SharedResourcesUnitTests.cs
index 6eef33d..8ca906c 100644
--- a/Meade.net.UnitTests/SharedResourcesUnitTests.cs
+++ b/Meade.net.UnitTests/SharedResourcesUnitTests.cs
@@ -53,7 +53,7 @@ namespace Meade.net.UnitTests
 
             _serialMock.Setup(x => x.ReceiveCounted(1)).Returns(expectedResult);
 
-            var result = SharedResources.SendChar(command, raw);
+            var result = SharedResources.SendChar(_traceLoggerMock.Object, command, raw);
 
             _serialMock.Verify(x => x.ClearBuffers(), Times.Once);
             _serialMock.Verify(x => x.Transmit(expectedCommand), Times.Once);
@@ -70,7 +70,7 @@ namespace Meade.net.UnitTests
 
             _serialMock.Setup(x => x.ReceiveTerminated("#")).Returns(expectedResult);
 
-            var result = SharedResources.SendString(transmitMessage, includePrefix);
+            var result = SharedResources.SendString(_traceLoggerMock.Object, transmitMessage, includePrefix);
 
             _serialMock.Verify(x => x.ClearBuffers(), Times.Once);
             _serialMock.Verify(x => x.Transmit(expectedMessage), Times.Once);
diff --git a/Meade.net/SharedResources.cs b/Meade.net/SharedResources.cs
index db51f2e..9757ab3 100644
--- a/Meade.net/SharedResources.cs
+++ b/Meade.net/SharedResources.cs
@@ -99,21 +99,25 @@ namespace ASCOM.Meade.net
         /// <param name="message"></param>
         /// <param name="raw"></param>
         /// <returns></returns>
-        public static string SendString(string message, bool raw = false)
+        public static string SendString(ITraceLogger traceLogger, string message, bool raw = false)
         {
             lock (LockObject)
             {
                 SharedSerial.ClearBuffers();
 
                 var encodedMessage = raw ? message : $"#:{message}#";
+                traceLogger.LogMessage("SendString", $"Transmitting {encodedMessage}", false);
                 SharedSerial.Transmit(encodedMessage);
 
                 try
                 {
-                    return SharedSerial.ReceiveTerminated("#").TrimEnd('#');
+                    var result = SharedSerial.ReceiveTerminated("#").TrimEnd('#');
+                    traceLogger.LogMessage("SendString", $"Received {result}", false);
+                    return result;
                 }
                 catch (COMException ex)
                 {
+                    traceLogger.LogIssue("SendString", ex.Message);
                     if (ex.Message.Contains("Timed out waiting for received data"))
                         throw new TimeoutException(ex.Message, ex);
 
@@ -122,34 +126,41 @@ namespace ASCOM.Meade.net
             }
         }
 
-        public static bool SendBool(string command, bool raw = false)
+        public static bool SendBool(ITraceLogger traceLogger, string command, bool raw = false)
         {
-            var result = SendChar(command, raw);
+            var result = SendChar(traceLogger, command, raw);
 
             return result == "1";
         }
 
-        public static string SendChar(string command, bool raw = false)
+        public static string SendChar(ITraceLogger traceLogger, string command, bool raw = false)
         {
-            return SendChars(command, raw, count: 1);
+            return SendChars(traceLogger, command, raw, count: 1);
         }
 
-        public static string SendChars(string command, bool raw = false, int count = 1)
+        public static string SendChars(ITraceLogger traceLogger, string command, bool raw = false, int count = 1)
         {
             lock (LockObject)
             {
                 SharedSerial.ClearBuffers();
 
                 var encodedMessage = raw ? command : $"#:{command}#";
+                traceLogger.LogMessage("SendChars", $"Transmitting {encodedMessage}", false);
                 SharedSerial.Transmit(encodedMessage);
 
                 try
                 {
-                    return SharedSerial.ReceiveCounted(count);
+                    var result = SharedSerial.ReceiveCounted(count);
+                    traceLogger.LogMessage("SendChars", $"Received {result}", false);
+                    return result;
                 }
-                catch (COMException ex) when (ex.Message.Contains("Timed out waiting for received data"))
+                catch (COMException ex)
                 {
-                    throw new TimeoutException(ex.Message, ex);
+                    traceLogger.LogIssue("SendString", ex.Message);
+                    if (ex.Message.Contains("Timed out waiting for received data"))
+                        throw new TimeoutException(ex.Message, ex);
+
+                    throw;
                 }
             }
         }
@@ -404,7 +415,7 @@ namespace ASCOM.Meade.net
                             //Test if communication is working.
                             try
                             {
-                                string utcOffSet = SendString("GG");
+                                string utcOffSet = SendString( traceLogger, "GG");
                             }
                             catch (Exception)
                             {
@@ -433,7 +444,7 @@ namespace ASCOM.Meade.net
                                 //SendBlind($"SB{newSpeedIndex}");
                                 try
                                 {
-                                    var speedChanged = SendChar($"SB{newSpeedIndex}");
+                                    var speedChanged = SendChar(traceLogger, $"SB{newSpeedIndex}");
                                     if (speedChanged == "1")
                                     {
                                         SharedSerial.Connected = false;
@@ -458,8 +469,8 @@ namespace ASCOM.Meade.net
                         
                         try
                         {
-                            ProductName = SendString("GVP");
-                            FirmwareVersion = SendString("GVN");
+                            ProductName = SendString(traceLogger, "GVP");
+                            FirmwareVersion = SendString(traceLogger, "GVN");
                         }
                         catch (Exception ex)
                         {
@@ -479,7 +490,7 @@ namespace ASCOM.Meade.net
 
                         try
                         {
-                            string utcOffSet = SendString("GG");
+                            string utcOffSet = SendString(traceLogger, "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
diff --git a/Meade.net/Wrapper/SharedResourcesWrapper.cs b/Meade.net/Wrapper/SharedResourcesWrapper.cs
index d5231a2..4f2d5c1 100644
--- a/Meade.net/Wrapper/SharedResourcesWrapper.cs
+++ b/Meade.net/Wrapper/SharedResourcesWrapper.cs
@@ -68,7 +68,7 @@ namespace ASCOM.Meade.net.Wrapper
 
         public string SendString(ITraceLogger traceLogger, string message, bool raw = false)
         {
-            return SharedResources.SendString(message, raw);
+            return SharedResources.SendString(traceLogger, message, raw);
         }
 
         public void SendBlind(ITraceLogger traceLogger, string message, bool raw = false)
@@ -78,17 +78,17 @@ namespace ASCOM.Meade.net.Wrapper
 
         public bool SendBool(ITraceLogger traceLogger, string command, bool raw = false)
         {
-            return SharedResources.SendBool(command, raw);
+            return SharedResources.SendBool(traceLogger, command, raw);
         }
 
         public string SendChar(ITraceLogger traceLogger, string message, bool raw = false)
         {
-            return SharedResources.SendChar(message, raw);
+            return SharedResources.SendChar(traceLogger, message, raw);
         }
 
         public string SendChars(ITraceLogger traceLogger, string message, bool raw = false, int count = 1)
         {
-            return SharedResources.SendChars(message, raw, count);
+            return SharedResources.SendChars(traceLogger, message, raw, count);
         }
 
         public string ReadTerminated()

From 9666811eff5c608cbc8196b94f1f7cdd79a2a89a Mon Sep 17 00:00:00 2001
From: Colin Dawson <me@cjdawson.com>
Date: Mon, 25 Jul 2022 16:08:50 +0100
Subject: [PATCH 20/21] Added messages to include information about what is
 being sent via the serial port.

---
 Meade.net/SharedResources.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Meade.net/SharedResources.cs b/Meade.net/SharedResources.cs
index 9757ab3..58ceb2b 100644
--- a/Meade.net/SharedResources.cs
+++ b/Meade.net/SharedResources.cs
@@ -86,6 +86,7 @@ namespace ASCOM.Meade.net
             {
                 SharedSerial.ClearBuffers();
                 var encodedMessage = raw ? message : $"#:{message}#";
+                traceLogger.LogMessage("SendBlind", $"Transmitting {encodedMessage}", false);
                 SharedSerial.Transmit(encodedMessage);
             }
         }

From 349397b70f5414d2fbe69ba0205c657ec9f23b17 Mon Sep 17 00:00:00 2001
From: Colin Dawson <me@cjdawson.com>
Date: Mon, 25 Jul 2022 21:57:52 +0100
Subject: [PATCH 21/21] Fixed logging message

---
 Meade.net.Telescope/Telescope.cs | 3 ++-
 Meade.net/SharedResources.cs     | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Meade.net.Telescope/Telescope.cs b/Meade.net.Telescope/Telescope.cs
index 86a2acb..a224e77 100644
--- a/Meade.net.Telescope/Telescope.cs
+++ b/Meade.net.Telescope/Telescope.cs
@@ -1971,7 +1971,8 @@ namespace ASCOM.Meade.net
                 throw new InvalidValueException(propertyName, value.ToString(CultureInfo.CurrentCulture), $"{0.ToString(CultureInfo.CurrentCulture)} to {15.0417.ToString(CultureInfo.CurrentCulture)}\"/sec");
             }
 
-            LogMessage($"{propertyName} Set", $"Setting new guiderate {value.ToString(CultureInfo.CurrentCulture)} arc seconds/second ({value.ToString(CultureInfo.CurrentCulture)} degrees/second)");
+            var degreesPerSecond = ArcSecondPerSecondToDegreesPerSecond(value);
+            LogMessage($"{propertyName} Set", $"Setting new guiderate {value.ToString(CultureInfo.CurrentCulture)} arc seconds/second ({degreesPerSecond.ToString(CultureInfo.CurrentCulture)} degrees/second)");
             SharedResourcesWrapper.SendBlind(Tl, $"Rg{value:00.0}");
             //:RgSS.S#
             //Set guide rate to +/ -SS.S to arc seconds per second.This rate is added to or subtracted from the current tracking
diff --git a/Meade.net/SharedResources.cs b/Meade.net/SharedResources.cs
index 58ceb2b..dbf74cd 100644
--- a/Meade.net/SharedResources.cs
+++ b/Meade.net/SharedResources.cs
@@ -18,7 +18,6 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Runtime.InteropServices;
-using System.Text;
 using System.Threading;
 using System.Windows.Forms;
 using ASCOM.DeviceInterface;