Refactor to use ProfileProperties instead of assigning individual variables.

Added support for ApertureArea and ApertureDiameter

Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs

@@ -636,12 +636,9 @@ namespace Meade.net.Telescope.UnitTests
 
         public void IsNewPulseGuidingSupported_ThenIsSupported_ThenReturnsTrue(string guidingStyle, string productName, string firmware, bool isSupported)
         {
-            _sharedResourcesWrapperMock.Setup(x => x.ProductName).Returns(productName);
-            _sharedResourcesWrapperMock.Setup(x => x.FirmwareVersion).Returns(firmware);
-
             _profileProperties.GuidingStyle = guidingStyle;
 
-            _telescope.Connected = true;
+            ConnectTelescope(productName, firmware);
 
             var result = _telescope.IsNewPulseGuidingSupported();
 
@@ -853,29 +850,19 @@ namespace Meade.net.Telescope.UnitTests
         }
 
         [Test]
-        public void ApertureArea_Get_ThrowsNotImplementedException()
+        public void ApertureArea_Get_ReturnsExpectedResult()
-        {
-            var excpetion = Assert.Throws<PropertyNotImplementedException>(() =>
         {
             var result = _telescope.ApertureArea;
-                Assert.Fail($"{result} should not have returned");
-            });
 
-            Assert.That(excpetion.Property, Is.EqualTo("ApertureArea"));
+            Assert.That(result, Is.EqualTo(_profileProperties.ApertureArea / 1000));
-            Assert.That(excpetion.AccessorSet, Is.False);
         }
 
         [Test]
         public void ApertureDiameter_Get_ThrowsNotImplementedException()
-        {
-            var excpetion = Assert.Throws<PropertyNotImplementedException>(() =>
         {
             var result = _telescope.ApertureDiameter;
-                Assert.Fail($"{result} should not have returned");
-            });
 
-            Assert.That(excpetion.Property, Is.EqualTo("ApertureDiameter"));
+            Assert.That(result, Is.EqualTo(_profileProperties.ApertureDiameter / 1000));
-            Assert.That(excpetion.AccessorSet, Is.False);
         }
 
         [Test]
@@ -1434,7 +1421,7 @@ namespace Meade.net.Telescope.UnitTests
         {
             var result = _telescope.FocalLength;
 
-            Assert.That(result, Is.EqualTo(_profileProperties.FocalLength));
+            Assert.That(result, Is.EqualTo(_profileProperties.FocalLength/1000));
         }
 
         [Test]

Meade.net.Telescope/Telescope.cs

@@ -419,12 +419,12 @@ namespace ASCOM.Meade.net
                     {
                         ReadProfile();
 
-                        LogMessage("Connected Set", "Connecting to port {0}", _ComPort);
+                        LogMessage("Connected Set", "Connecting to port {0}", _profileProperties.ComPort);
                         var connectionInfo = SharedResourcesWrapper.Connect("Serial", DriverId, Tl);
                         try
                         {
                             LogMessage("Connected Set",
-                                $"Connected to port {_ComPort}. Product: {SharedResourcesWrapper.ProductName} Version:{SharedResourcesWrapper.FirmwareVersion}");
+                                $"Connected to port {_profileProperties.ComPort}. Product: {SharedResourcesWrapper.ProductName} Version:{SharedResourcesWrapper.FirmwareVersion}");
 
                             _userNewerPulseGuiding = IsNewPulseGuidingSupported();
 
@@ -444,7 +444,7 @@ namespace ASCOM.Meade.net
 
                                 if (CanSetGuideRates)
                                 {
-                                    SetNewGuideRate(_GuideRate, "Connect");
+                                    SetNewGuideRate(_profileProperties.GuideRateArcSecondsPerSecond, "Connect");
                                 }
 
                                 SetTelescopePrecision("Connect");
@@ -454,28 +454,28 @@ namespace ASCOM.Meade.net
                                 SharedResourcesWrapper.TargetDeclination = InvalidParameter;
                                 SharedResourcesWrapper.TargetRightAscension = InvalidParameter;
 
-                                LogMessage("Connected Set", $"SendDateTime: {_SendDateTime}");
+                                LogMessage("Connected Set", $"SendDateTime: {_profileProperties.SendDateTime}");
-                                if (_SendDateTime)
+                                if (_profileProperties.SendDateTime)
                                 {
                                     if (SharedResourcesWrapper.ProductName == TelescopeList.LX200GPS)
                                     {
                                         LogMessage("Connected Set",
-                                            $"LX200GPS Detecting if daylight savings message on screen: {_SendDateTime}");
+                                            $"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: {_SendDateTime}");
+                                                $"LX200GPS Setting Date time and bypassing settings screens: {_profileProperties.SendDateTime}");
                                             BypassHandboxEntryForAutostarII();
                                         }
                                         else
                                         {
                                             LogMessage("Connected Set",
-                                                $"LX200GPS Sending current date and time: {_SendDateTime}");
+                                                $"LX200GPS Sending current date and time: {_profileProperties.SendDateTime}");
                                             SendCurrentDateTime("Connect");
                                             LogMessage("Connected Set",
-                                                $"LX200GPS Attempting manual bypass of prompts: {_SendDateTime}");
+                                                $"LX200GPS Attempting manual bypass of prompts: {_profileProperties.SendDateTime}");
                                             ApplySkipAutoStarPrompts("Connect");
                                         }
 
@@ -514,12 +514,12 @@ namespace ASCOM.Meade.net
                     }
                     catch (Exception ex)
                     {
-                        LogMessage("Connected Set", "Error connecting to port {0} - {1}", _ComPort, ex.Message);
+                        LogMessage("Connected Set", "Error connecting to port {0} - {1}", _profileProperties.ComPort, ex.Message);
                     }
                 }
                 else
                 {
-                    LogMessage("Connected Set", "Disconnecting from port {0}", _ComPort);
+                    LogMessage("Connected Set", "Disconnecting from port {0}", _profileProperties.ComPort);
                     SharedResourcesWrapper.Disconnect("Serial", DriverId);
                     IsConnected = false;
                 }
@@ -528,7 +528,7 @@ namespace ASCOM.Meade.net
 
         private void SendCurrentDateTime(string connect)
         {
-            if (_SendDateTime)
+            if (_profileProperties.SendDateTime)
             {
                 UTCDate = _clock.UtcNow;
             }
@@ -570,7 +570,7 @@ namespace ASCOM.Meade.net
 
         private void SetTelescopePrecision(string propertyName)
         {
-            switch (_Precision.ToLower())
+            switch (_profileProperties.Precision.ToLower())
             {
                 case "high":
                     TelescopePointingPrecision(true);
@@ -588,7 +588,7 @@ namespace ASCOM.Meade.net
 
         public bool IsNewPulseGuidingSupported()
         {
-            switch (_GuidingStyle)
+            switch (_profileProperties.GuidingStyle.ToLower())
             {
                 case "guide rate slew":
                     return false;
@@ -1161,8 +1161,9 @@ namespace ASCOM.Meade.net
         {
             get
             {
-                LogMessage("ApertureArea Get", "Not implemented");
+                var apertureArea = _profileProperties.ApertureArea / 1000;
-                throw new PropertyNotImplementedException("ApertureArea", false);
+                LogMessage("ApertureArea Get", $"{apertureArea}");
+                return apertureArea;
             }
         }
 
@@ -1170,8 +1171,9 @@ namespace ASCOM.Meade.net
         {
             get
             {
-                LogMessage("ApertureDiameter Get", "Not implemented");
+                var apertureDiameter = _profileProperties.ApertureDiameter / 1000;
-                throw new PropertyNotImplementedException("ApertureDiameter", false);
+                LogMessage("ApertureDiameter Get", $"{apertureDiameter}");
+                return apertureDiameter;
             }
         }
 
@@ -1500,8 +1502,9 @@ namespace ASCOM.Meade.net
         {
             get
             {
-                LogMessage("FocalLength Get", "Not implemented");
+                var focalLength = _profileProperties.FocalLength / 1000;
-                return _focalLength;
+                LogMessage("FocalLength Get", $"{focalLength}");
+                return focalLength;
             }
         }
 
@@ -1528,7 +1531,7 @@ namespace ASCOM.Meade.net
 
             //info from RickB says that 15.04107 is a better value for
 
-            _GuideRate = value;
+            _profileProperties.GuideRateArcSecondsPerSecond = value;
 
             WriteProfile();
         }
@@ -1547,8 +1550,8 @@ namespace ASCOM.Meade.net
         {
             get
             {
-                var degreesPerSecond = ArcSecondPerSecondToDegreesPerSecond(_GuideRate);
+                var degreesPerSecond = ArcSecondPerSecondToDegreesPerSecond(_profileProperties.GuideRateArcSecondsPerSecond);
-                LogMessage("GuideRateDeclination Get", $"{_GuideRate} arc seconds / second = {degreesPerSecond} degrees per second");
+                LogMessage("GuideRateDeclination Get", $"{_profileProperties.GuideRateArcSecondsPerSecond} arc seconds / second = {degreesPerSecond} degrees per second");
                 return degreesPerSecond;
             }
             set
@@ -1562,8 +1565,8 @@ namespace ASCOM.Meade.net
         {
             get
             {
-                double degreesPerSecond = ArcSecondPerSecondToDegreesPerSecond(_GuideRate);
+                double degreesPerSecond = ArcSecondPerSecondToDegreesPerSecond(_profileProperties.GuideRateArcSecondsPerSecond);
-                LogMessage("GuideRateRightAscension Get", $"{_GuideRate} arc seconds / second = {degreesPerSecond} degrees per second");
+                LogMessage("GuideRateRightAscension Get", $"{_profileProperties.GuideRateArcSecondsPerSecond} arc seconds / second = {degreesPerSecond} degrees per second");
                 return degreesPerSecond;
             }
             set
@@ -1698,7 +1701,7 @@ namespace ASCOM.Meade.net
                 return;
 
             ParkedPosition parkedPosition;
-            switch (_ParkedBehaviour)
+            switch (_profileProperties.ParkedBehaviour)
             {
                 case ParkedBehaviour.LastGoodPosition:
                     parkedPosition = new ParkedPosition
@@ -1715,12 +1718,17 @@ namespace ASCOM.Meade.net
                     var utcDateTime = UTCDate;
                     var latitude = SiteLatitude;
                     var longitude = SiteLongitude;
-                    var raDec = _astroMaths.ConvertHozToEq(utcDateTime, latitude, longitude, _ParkedAltAz);
+                    var parkedAltAz = new HorizonCoordinates()
+                    {
+                        Altitude = _profileProperties.ParkedAlt,
+                        Azimuth = _profileProperties.ParkedAz
+                    };
+                    var raDec = _astroMaths.ConvertHozToEq(utcDateTime, latitude, longitude, parkedAltAz);
 
                     parkedPosition = new ParkedPosition
                     {
-                        Altitude = _ParkedAltAz.Altitude,
+                        Altitude = parkedAltAz.Altitude,
-                        Azimuth = _ParkedAltAz.Azimuth,
+                        Azimuth = parkedAltAz.Azimuth,
                         RightAscension = raDec.RightAscension,
                         Declination = raDec.Declination,
                         SiteLatitude = latitude,
@@ -1981,8 +1989,8 @@ namespace ASCOM.Meade.net
             {
                 CheckConnected("SiteElevation Get");
 
-                LogMessage("SiteElevation",  $"Get {_SiteElevation}");
+                LogMessage("SiteElevation",  $"Get {_profileProperties.SiteElevation}");
-                return _SiteElevation;
+                return _profileProperties.SiteElevation;
             }
             // ReSharper disable once ValueParameterNotUsed
             set
@@ -1990,14 +1998,14 @@ namespace ASCOM.Meade.net
                 CheckConnected("SiteElevation Set");
 
                 LogMessage("SiteElevation", $"Set: {value}");
-                if (Math.Abs(value - _SiteElevation) < 0.1)
+                if (Math.Abs(value - _profileProperties.SiteElevation) < 0.1)
                 {
                     LogMessage("SiteElevation", "Set: no change detected");
                     return;
                 }
 
-                LogMessage("SiteElevation", $"Set: {value} was {_SiteElevation}");
+                LogMessage("SiteElevation", $"Set: {value} was {_profileProperties.SiteElevation}");
-                _SiteElevation = value;
+                _profileProperties.SiteElevation = value;
                 UpdateSiteElevation();
             }
         }
@@ -2025,7 +2033,7 @@ namespace ASCOM.Meade.net
 
                     throw new InvalidOperationException("unable to get site latitude from telescope.");
                 }
-                catch (ParkedException) when (_ParkedBehaviour != ParkedBehaviour.NoCoordinates && SharedResourcesWrapper.ParkedPosition is var parkedPosition)
+                catch (ParkedException) when (_profileProperties.ParkedBehaviour != ParkedBehaviour.NoCoordinates && SharedResourcesWrapper.ParkedPosition is var parkedPosition)
                 {
                     return parkedPosition.SiteLatitude;
                 }
@@ -2083,7 +2091,7 @@ namespace ASCOM.Meade.net
 
                     return siteLongitude;
                 }
-                catch (ParkedException) when (_ParkedBehaviour != ParkedBehaviour.NoCoordinates && SharedResourcesWrapper.ParkedPosition is var parkedPosition)
+                catch (ParkedException) when (_profileProperties.ParkedBehaviour != ParkedBehaviour.NoCoordinates && SharedResourcesWrapper.ParkedPosition is var parkedPosition)
                 {
                     return parkedPosition.SiteLongitude;
                 }
@@ -2354,7 +2362,7 @@ namespace ASCOM.Meade.net
 
         private TimeSpan GetTotalSlewingSettleTime()
         {
-            return TimeSpan.FromSeconds( SlewSettleTime + _ProfileSettleTime );
+            return TimeSpan.FromSeconds( SlewSettleTime + _profileProperties.SettleTime );
         }
 
         private bool GetSlewing()
@@ -2779,7 +2787,7 @@ namespace ASCOM.Meade.net
                 }
                 catch (ParkedException)
                 {
-                    if (_ParkedBehaviour == ParkedBehaviour.NoCoordinates)
+                    if (_profileProperties.ParkedBehaviour == ParkedBehaviour.NoCoordinates)
                         throw;
 
                     return _clock.UtcNow;
@@ -2962,10 +2970,10 @@ namespace ASCOM.Meade.net
             var profileProperties = SharedResourcesWrapper.ReadProfile();
 
 
-            if (Math.Abs(profileProperties.GuideRateArcSecondsPerSecond - _GuideRate) > 0.0000001)
+            if (Math.Abs(profileProperties.GuideRateArcSecondsPerSecond - _profileProperties.GuideRateArcSecondsPerSecond) > 0.0000001)
             {
                 changed = true;
-                profileProperties.GuideRateArcSecondsPerSecond = _GuideRate;
+                profileProperties.GuideRateArcSecondsPerSecond = _profileProperties.GuideRateArcSecondsPerSecond;
             }
 
             if (changed)

Meade.net.UnitTests/SharedResourcesUnitTests.cs

@@ -172,6 +172,8 @@ namespace Meade.net.UnitTests
             string ParkedAltDefault = "0";
             string ParkedAzimuthDefault = "180";
             string FocalLengthDefault = "2000";
+            string ApertureAreaDefault = "32685";
+            string ApertureDiameterDefault = "203";
 
             Mock<IProfileWrapper> profileWrapperMock = new Mock<IProfileWrapper>();
             profileWrapperMock.SetupAllProperties();
@@ -227,6 +229,15 @@ namespace Meade.net.UnitTests
                     x.GetValue(DriverId, "Focal Length (mm)", string.Empty, FocalLengthDefault))
                 .Returns(() => FocalLengthDefault);
 
+            profileWrapperMock.Setup(x =>
+                    x.GetValue(DriverId, "Aperture Area (mm²)", string.Empty, ApertureAreaDefault))
+                .Returns(() => ApertureAreaDefault);
+
+            profileWrapperMock.Setup(x =>
+                    x.GetValue(DriverId, "Aperture Diameter (mm)", string.Empty, ApertureDiameterDefault))
+                .Returns(() => ApertureDiameterDefault);
+            
+
             profileWrapperMock.Setup(x =>
                     x.GetValue(DriverId, "Send Date and time on connect", string.Empty, "false"))
                 .Returns(() => SendDateTimeDefault);
@@ -301,6 +312,8 @@ namespace Meade.net.UnitTests
             string ParkedAltDefault = "0";
             string ParkedAzimuthDefault = "180";
             string FocalLengthDefault = "2000";
+            string ApertureAreaDefault = "32685";
+            string ApertureDiameterDefault = "203";
 
             Mock<IProfileWrapper> profileWrapperMock = new Mock<IProfileWrapper>();
             profileWrapperMock.SetupAllProperties();
@@ -347,6 +360,15 @@ namespace Meade.net.UnitTests
                     x.GetValue(DriverId, "Focal Length (mm)", string.Empty, FocalLengthDefault))
                 .Returns(() => FocalLengthDefault);
 
+            profileWrapperMock.Setup(x =>
+                    x.GetValue(DriverId, "Aperture Area (mm²)", string.Empty, ApertureAreaDefault))
+                .Returns(() => ApertureAreaDefault);
+
+            profileWrapperMock.Setup(x =>
+                    x.GetValue(DriverId, "Aperture Diameter (mm)", string.Empty, ApertureDiameterDefault))
+                .Returns(() => ApertureDiameterDefault);
+
+
             Mock<IProfileFactory> profileFactoryMock = new Mock<IProfileFactory>();
             profileFactoryMock.Setup(x => x.Create()).Returns(profileWrapperMock.Object);
 
@@ -385,6 +407,8 @@ namespace Meade.net.UnitTests
             string ParkedAltDefault = "0";
             string ParkedAzimuthDefault = "180";
             string FocalLengthDefault = "2000";
+            string ApertureAreaDefault = "32685";
+            string ApertureDiameterDefault = "203";
 
             Mock<IProfileWrapper> profileWrapperMock = new Mock<IProfileWrapper>();
             profileWrapperMock.SetupAllProperties();
@@ -429,6 +453,12 @@ namespace Meade.net.UnitTests
             profileWrapperMock.Setup(x =>
                     x.GetValue(DriverId, "Focal Length (mm)", string.Empty, FocalLengthDefault))
                 .Returns(() => FocalLengthDefault);
+            profileWrapperMock.Setup(x =>
+                    x.GetValue(DriverId, "Aperture Area (mm²)", string.Empty, ApertureAreaDefault))
+                .Returns(() => ApertureAreaDefault);
+            profileWrapperMock.Setup(x =>
+                    x.GetValue(DriverId, "Aperture Diameter (mm)", string.Empty, ApertureDiameterDefault))
+                .Returns(() => ApertureDiameterDefault);
 
             Mock<IProfileFactory> profileFactoryMock = new Mock<IProfileFactory>();
             profileFactoryMock.Setup(x => x.Create()).Returns(profileWrapperMock.Object);
@@ -482,6 +512,8 @@ namespace Meade.net.UnitTests
             string ParkedAltDefault = "0";
             string ParkedAzimuthDefault = "180";
             string FocalLengthDefault = "2000";
+            string ApertureAreaDefault = "32685";
+            string ApertureDiameterDefault = "203";
 
             Mock<IProfileWrapper> profileWrapperMock = new Mock<IProfileWrapper>();
             profileWrapperMock.SetupAllProperties();
@@ -526,6 +558,12 @@ namespace Meade.net.UnitTests
             profileWrapperMock.Setup(x =>
                     x.GetValue(DriverId, "Focal Length (mm)", string.Empty, FocalLengthDefault))
                 .Returns(() => FocalLengthDefault);
+            profileWrapperMock.Setup(x =>
+                    x.GetValue(DriverId, "Aperture Area (mm²)", string.Empty, ApertureAreaDefault))
+                .Returns(() => ApertureAreaDefault);
+            profileWrapperMock.Setup(x =>
+                    x.GetValue(DriverId, "Aperture Diameter (mm)", string.Empty, ApertureDiameterDefault))
+                .Returns(() => ApertureDiameterDefault);
 
             Mock<IProfileFactory> profileFactoryMock = new Mock<IProfileFactory>();
             profileFactoryMock.Setup(x => x.Create()).Returns(profileWrapperMock.Object);
@@ -576,6 +614,8 @@ namespace Meade.net.UnitTests
             string ParkedAltDefault = "0";
             string ParkedAzimuthDefault = "180";
             string FocalLengthDefault = "2000";
+            string ApertureAreaDefault = "32685";
+            string ApertureDiameterDefault = "203";
 
             Mock<IProfileWrapper> profileWrapperMock = new Mock<IProfileWrapper>();
             profileWrapperMock.SetupAllProperties();
@@ -619,6 +659,12 @@ namespace Meade.net.UnitTests
             profileWrapperMock.Setup(x =>
                     x.GetValue(DriverId, "Focal Length (mm)", string.Empty, FocalLengthDefault))
                 .Returns(() => FocalLengthDefault);
+            profileWrapperMock.Setup(x =>
+                    x.GetValue(DriverId, "Aperture Area (mm²)", string.Empty, ApertureAreaDefault))
+                .Returns(() => ApertureAreaDefault);
+            profileWrapperMock.Setup(x =>
+                    x.GetValue(DriverId, "Aperture Diameter (mm)", string.Empty, ApertureDiameterDefault))
+                .Returns(() => ApertureDiameterDefault);
 
             Mock<IProfileFactory> profileFactoryMock = new Mock<IProfileFactory>();
             profileFactoryMock.Setup(x => x.Create()).Returns(profileWrapperMock.Object);

Meade.net.focuser/Focuser.cs

@@ -176,12 +176,12 @@ namespace ASCOM.Meade.net
                     }
                     catch (Exception ex)
                     {
-                        LogMessage("Connected Set", "Error connecting to port {0} - {1}", _ComPort, ex.Message);
+                        LogMessage("Connected Set", "Error connecting to port {0} - {1}", _profileProperties.ComPort, ex.Message);
                     }
                 }
                 else
                 {
-                    LogMessage("Connected Set", "Disconnecting from port {0}", _ComPort);
+                    LogMessage("Connected Set", "Disconnecting from port {0}", _profileProperties.ComPort);
                     SharedResourcesWrapper.Disconnect("Serial", DriverId);
                     IsConnected = false;
                 }
@@ -295,11 +295,11 @@ namespace ASCOM.Meade.net
                 return;
 
             var direction = position > 0;
-            if (_ReverseFocusDirection)
+            if (_profileProperties.ReverseFocusDirection)
                 direction = !direction;
             
             //backlash compensation.
-            var backlashCompensationSteps = direction ? Math.Abs(_BacklashCompensation) : 0;
+            var backlashCompensationSteps = direction ? Math.Abs(_profileProperties.BacklashCompensation) : 0;
 
             var steps = Math.Abs(position) + backlashCompensationSteps;
 
@@ -322,7 +322,7 @@ namespace ASCOM.Meade.net
 
         private void DynamicBreaking(bool directionOut)
         {
-            if (!_UseDynamicBreaking)
+            if (!_profileProperties.DynamicBreaking)
                 return;
 
             Tl.LogMessage("Move", "Applying dynamic breaking");

Meade.net/MeadeTelescopeBase.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Reflection;
 using System.Runtime.InteropServices;
-using ASCOM.Meade.net.AstroMaths;
 using ASCOM.Meade.net.Wrapper;
 using ASCOM.Utilities;
 
@@ -20,21 +19,8 @@ namespace ASCOM.Meade.net
         /// </summary>
         protected static readonly string DriverDescription = "Meade Generic";
 
-        protected static string _ComPort; // Variables to hold the currrent device configuration
-        protected static int _BacklashCompensation;
-        protected static bool _ReverseFocusDirection;
-        protected static bool _UseDynamicBreaking;
-        protected double _GuideRate;
-        protected string _Precision;
-        protected string _GuidingStyle;
-        protected double _SiteElevation;
-        protected short _ProfileSettleTime;
-        protected bool _SendDateTime;
-        protected ParkedBehaviour _ParkedBehaviour;
-        protected HorizonCoordinates _ParkedAltAz;
-        protected double _focalLength;
-
         protected readonly ISharedResourcesWrapper SharedResourcesWrapper;
+        protected ProfileProperties _profileProperties;
 
         public MeadeTelescopeBase()
         {
@@ -63,43 +49,25 @@ namespace ASCOM.Meade.net
         /// </summary>
         protected void ReadProfile()
         {
-            var profileProperties = SharedResourcesWrapper.ReadProfile();
+            _profileProperties = SharedResourcesWrapper.ReadProfile();
-            Tl.Enabled = profileProperties.TraceLogger;
+            Tl.Enabled = _profileProperties.TraceLogger;
-            _ComPort = profileProperties.ComPort;
-            _BacklashCompensation = profileProperties.BacklashCompensation;
-            _ReverseFocusDirection = profileProperties.ReverseFocusDirection;
-            _UseDynamicBreaking = profileProperties.DynamicBreaking;
-            _GuideRate = profileProperties.GuideRateArcSecondsPerSecond;
-            _Precision = profileProperties.Precision;
-            _GuidingStyle = profileProperties.GuidingStyle.ToLower();
-            _SiteElevation = profileProperties.SiteElevation;
-            _ProfileSettleTime = profileProperties.SettleTime;
-            _SendDateTime = profileProperties.SendDateTime;
-            _ParkedBehaviour = profileProperties.ParkedBehaviour;
-
-            _ParkedAltAz = new HorizonCoordinates
-            {
-                Altitude = profileProperties.ParkedAlt,
-                Azimuth = profileProperties.ParkedAz
-            };
-
-            _focalLength = profileProperties.FocalLength;
 
             LogMessage("ReadProfile", $"Trace logger enabled: {Tl.Enabled}");
-            LogMessage("ReadProfile", $"Com Port: {_ComPort}");
+            LogMessage("ReadProfile", $"Com Port: {_profileProperties.ComPort}");
-            LogMessage("ReadProfile", $"Backlash Steps: {_BacklashCompensation}");
+            LogMessage("ReadProfile", $"Backlash Steps: {_profileProperties.BacklashCompensation}");
-            LogMessage("ReadProfile", $"Dynamic breaking: {_UseDynamicBreaking}");
+            LogMessage("ReadProfile", $"Dynamic breaking: {_profileProperties.DynamicBreaking}");
-            LogMessage("ReadProfile", $"Guide Rate: {_GuideRate}");
+            LogMessage("ReadProfile", $"Guide Rate: {_profileProperties.GuideRateArcSecondsPerSecond}");
-            LogMessage("ReadProfile", $"Precision: {_Precision}");
+            LogMessage("ReadProfile", $"Precision: {_profileProperties.Precision}");
-            LogMessage("ReadProfile", $"Guiding Style: {_GuidingStyle}");
+            LogMessage("ReadProfile", $"Guiding Style: {_profileProperties.GuidingStyle}");
-            LogMessage("ReadProfile", $"Site Elevation: {_SiteElevation}");
+            LogMessage("ReadProfile", $"Site Elevation: {_profileProperties.SiteElevation}");
-            LogMessage("ReadProfile", $"Settle Time after slew: {_ProfileSettleTime}");
+            LogMessage("ReadProfile", $"Settle Time after slew: {_profileProperties.SettleTime}");
-            LogMessage("ReadProfile", $"Send date and time on connect: {_SendDateTime}");
+            LogMessage("ReadProfile", $"Send date and time on connect: {_profileProperties.SendDateTime}");
-            LogMessage("ReadProfile", $"Parked Behaviour: {_ParkedBehaviour}");
+            LogMessage("ReadProfile", $"Parked Behaviour: {_profileProperties.ParkedBehaviour}");
-            LogMessage("ReadProfile", $"Parked Alt: {_ParkedAltAz.Altitude}");
+            LogMessage("ReadProfile", $"Parked Alt: {_profileProperties.ParkedAlt}");
-            LogMessage("ReadProfile", $"Parked Az: {_ParkedAltAz.Azimuth}");
+            LogMessage("ReadProfile", $"Parked Az: {_profileProperties.ParkedAz}");
-            LogMessage("ReadProfile", $"Focal Length: {_focalLength}");
+            LogMessage("ReadProfile", $"Focal Length: {_profileProperties.FocalLength}");
-            
+            LogMessage("ReadProfile", $"Aperture Area: {_profileProperties.ApertureArea}");
+            LogMessage("ReadProfile", $"Aperture Area: {_profileProperties.ApertureDiameter}");
         }
 
         /// <summary>
@@ -164,7 +132,7 @@ namespace ASCOM.Meade.net
         protected void UpdateSiteElevation()
         {
             var profileProperties = SharedResourcesWrapper.ReadProfile();
-            profileProperties.SiteElevation = _SiteElevation;
+            profileProperties.SiteElevation = _profileProperties.SiteElevation;
             SharedResourcesWrapper.WriteProfile(profileProperties);
         }
     }

Meade.net/ProfileProperties.cs

@@ -24,5 +24,7 @@ namespace ASCOM.Meade.net
         public double ParkedAlt { get; set; }
         public double ParkedAz { get; set; }
         public double FocalLength { get; set; }
+        public double ApertureArea { get; set; }
+        public double ApertureDiameter { get; set; }
     }
 }

Meade.net/SetupDialogForm.cs

@@ -197,6 +197,24 @@ namespace ASCOM.Meade.net
                 txtFocalLength.Text = "2000";
             }
 
+            try
+            {
+                txtApertureArea.Text = profileProperties.ApertureArea.ToString(CultureInfo.CurrentCulture);
+            }
+            catch (Exception)
+            {
+                txtApertureArea.Text = "32685";
+            }
+
+            try
+            {
+                txtApertureDiameter.Text = profileProperties.ApertureDiameter.ToString(CultureInfo.CurrentCulture);
+            }
+            catch (Exception)
+            {
+                txtApertureDiameter.Text = "203";
+            }
+
             UpdateParkedItemsEnabled();
         }
 
@@ -224,7 +242,9 @@ namespace ASCOM.Meade.net
                 ParkedBehaviour = EnumExtensionMethods.GetValueFromDescription<ParkedBehaviour>(cboParkedBehaviour.SelectedItem.ToString()),
                 ParkedAlt = double.Parse(txtParkedAlt.Text),
                 ParkedAz = double.Parse(txtParkedAz.Text),
-                FocalLength = double.Parse(txtFocalLength.Text)
+                FocalLength = double.Parse(txtFocalLength.Text),
+                ApertureArea = double.Parse(txtApertureArea.Text),
+                ApertureDiameter = double.Parse(txtApertureDiameter.Text)
             };
 
             return profileProperties;

Meade.net/SetupDialogForm.designer.cs

@@ -85,6 +85,12 @@ namespace ASCOM.Meade.net
             this.label25 = new System.Windows.Forms.Label();
             this.txtFocalLength = new System.Windows.Forms.TextBox();
             this.label26 = new System.Windows.Forms.Label();
+            this.label27 = new System.Windows.Forms.Label();
+            this.txtApertureDiameter = new System.Windows.Forms.TextBox();
+            this.label28 = new System.Windows.Forms.Label();
+            this.label29 = new System.Windows.Forms.Label();
+            this.txtApertureArea = new System.Windows.Forms.TextBox();
+            this.label30 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.picASCOM)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.nudSettleTime)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numDatabits)).BeginInit();
@@ -408,10 +414,46 @@ namespace ASCOM.Meade.net
             resources.ApplyResources(this.label26, "label26");
             this.label26.Name = "label26";
             // 
+            // label27
+            // 
+            resources.ApplyResources(this.label27, "label27");
+            this.label27.Name = "label27";
+            // 
+            // txtApetureDiameter
+            // 
+            resources.ApplyResources(this.txtApertureDiameter, "txtApertureDiameter");
+            this.txtApertureDiameter.Name = "txtApertureDiameter";
+            // 
+            // label28
+            // 
+            resources.ApplyResources(this.label28, "label28");
+            this.label28.Name = "label28";
+            // 
+            // label29
+            // 
+            resources.ApplyResources(this.label29, "label29");
+            this.label29.Name = "label29";
+            // 
+            // txtApetureArea
+            // 
+            resources.ApplyResources(this.txtApertureArea, "txtApertureArea");
+            this.txtApertureArea.Name = "txtApertureArea";
+            // 
+            // label30
+            // 
+            resources.ApplyResources(this.label30, "label30");
+            this.label30.Name = "label30";
+            // 
             // SetupDialogForm
             // 
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.label29);
+            this.Controls.Add(this.txtApertureArea);
+            this.Controls.Add(this.label30);
+            this.Controls.Add(this.label27);
+            this.Controls.Add(this.txtApertureDiameter);
+            this.Controls.Add(this.label28);
             this.Controls.Add(this.label26);
             this.Controls.Add(this.txtFocalLength);
             this.Controls.Add(this.label25);
@@ -532,5 +574,11 @@ namespace ASCOM.Meade.net
         private Label label25;
         private TextBox txtFocalLength;
         private Label label26;
+        private Label label27;
+        private TextBox txtApertureDiameter;
+        private Label label28;
+        private Label label29;
+        private TextBox txtApertureArea;
+        private Label label30;
     }
 }

Meade.net/SetupDialogForm.resx

@@ -145,7 +145,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;cmdOK.ZOrder" xml:space="preserve">
-    <value>50</value>
+    <value>56</value>
   </data>
   <data name="cmdCancel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Right</value>
@@ -172,7 +172,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;cmdCancel.ZOrder" xml:space="preserve">
-    <value>49</value>
+    <value>55</value>
   </data>
   <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
     <value>12, 9</value>
@@ -196,7 +196,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
-    <value>48</value>
+    <value>54</value>
   </data>
   <data name="picASCOM.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Right</value>
@@ -223,7 +223,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;picASCOM.ZOrder" xml:space="preserve">
-    <value>47</value>
+    <value>53</value>
   </data>
   <data name="label2.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -250,13 +250,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
-    <value>46</value>
+    <value>52</value>
   </data>
   <data name="chkTrace.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
   <data name="chkTrace.Location" type="System.Drawing.Point, System.Drawing">
-    <value>97, 305</value>
+    <value>97, 380</value>
   </data>
   <data name="chkTrace.Size" type="System.Drawing.Size, System.Drawing">
     <value>90, 17</value>
@@ -277,7 +277,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;chkTrace.ZOrder" xml:space="preserve">
-    <value>45</value>
+    <value>51</value>
   </data>
   <data name="comboBoxComPort.Location" type="System.Drawing.Point, System.Drawing">
     <value>97, 87</value>
@@ -298,13 +298,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;comboBoxComPort.ZOrder" xml:space="preserve">
-    <value>44</value>
+    <value>50</value>
   </data>
   <data name="label3.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
   <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>290, 187</value>
+    <value>290, 262</value>
   </data>
   <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
     <value>61, 13</value>
@@ -325,13 +325,10 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
-    <value>43</value>
+    <value>49</value>
   </data>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <data name="txtGuideRate.Location" type="System.Drawing.Point, System.Drawing">
-    <value>375, 184</value>
+    <value>388, 259</value>
   </data>
   <data name="txtGuideRate.Size" type="System.Drawing.Size, System.Drawing">
     <value>46, 20</value>
@@ -342,6 +339,9 @@
   <data name="txtGuideRate.Text" xml:space="preserve">
     <value>10.0</value>
   </data>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <data name="txtGuideRate.ToolTip" xml:space="preserve">
     <value>LX-200GPS only</value>
   </data>
@@ -355,13 +355,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;txtGuideRate.ZOrder" xml:space="preserve">
-    <value>42</value>
+    <value>48</value>
   </data>
   <data name="label4.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
   <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>427, 187</value>
+    <value>440, 262</value>
   </data>
   <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
     <value>122, 13</value>
@@ -382,13 +382,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label4.ZOrder" xml:space="preserve">
-    <value>41</value>
+    <value>47</value>
   </data>
   <data name="lblPercentOfSiderealRate.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
   <data name="lblPercentOfSiderealRate.Location" type="System.Drawing.Point, System.Drawing">
-    <value>427, 200</value>
+    <value>440, 275</value>
   </data>
   <data name="lblPercentOfSiderealRate.Size" type="System.Drawing.Size, System.Drawing">
     <value>105, 13</value>
@@ -409,13 +409,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;lblPercentOfSiderealRate.ZOrder" xml:space="preserve">
-    <value>40</value>
+    <value>46</value>
   </data>
   <data name="label5.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
   <data name="label5.Location" type="System.Drawing.Point, System.Drawing">
-    <value>290, 219</value>
+    <value>290, 294</value>
   </data>
   <data name="label5.Size" type="System.Drawing.Size, System.Drawing">
     <value>50, 13</value>
@@ -436,7 +436,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label5.ZOrder" xml:space="preserve">
-    <value>39</value>
+    <value>45</value>
   </data>
   <data name="cboPrecision.Items" xml:space="preserve">
     <value>Unchanged</value>
@@ -448,7 +448,7 @@
     <value>High</value>
   </data>
   <data name="cboPrecision.Location" type="System.Drawing.Point, System.Drawing">
-    <value>375, 216</value>
+    <value>388, 291</value>
   </data>
   <data name="cboPrecision.Size" type="System.Drawing.Size, System.Drawing">
     <value>90, 21</value>
@@ -466,7 +466,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;cboPrecision.ZOrder" xml:space="preserve">
-    <value>38</value>
+    <value>44</value>
   </data>
   <data name="label6.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -475,7 +475,7 @@
     <value>NoControl</value>
   </data>
   <data name="label6.Location" type="System.Drawing.Point, System.Drawing">
-    <value>290, 246</value>
+    <value>290, 321</value>
   </data>
   <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
     <value>67, 13</value>
@@ -496,7 +496,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label6.ZOrder" xml:space="preserve">
-    <value>37</value>
+    <value>43</value>
   </data>
   <data name="cboGuidingStyle.Items" xml:space="preserve">
     <value>Auto</value>
@@ -508,7 +508,7 @@
     <value>Pulse guiding</value>
   </data>
   <data name="cboGuidingStyle.Location" type="System.Drawing.Point, System.Drawing">
-    <value>375, 243</value>
+    <value>388, 318</value>
   </data>
   <data name="cboGuidingStyle.Size" type="System.Drawing.Size, System.Drawing">
     <value>90, 21</value>
@@ -526,7 +526,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;cboGuidingStyle.ZOrder" xml:space="preserve">
-    <value>36</value>
+    <value>42</value>
   </data>
   <data name="label7.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -556,7 +556,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label7.ZOrder" xml:space="preserve">
-    <value>35</value>
+    <value>41</value>
   </data>
   <data name="label8.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -568,7 +568,7 @@
     <value>NoControl</value>
   </data>
   <data name="label8.Location" type="System.Drawing.Point, System.Drawing">
-    <value>290, 284</value>
+    <value>290, 359</value>
   </data>
   <data name="label8.Size" type="System.Drawing.Size, System.Drawing">
     <value>52, 13</value>
@@ -589,10 +589,10 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label8.ZOrder" xml:space="preserve">
-    <value>34</value>
+    <value>40</value>
   </data>
   <data name="txtBacklashSteps.Location" type="System.Drawing.Point, System.Drawing">
-    <value>375, 302</value>
+    <value>388, 377</value>
   </data>
   <data name="txtBacklashSteps.Size" type="System.Drawing.Size, System.Drawing">
     <value>46, 20</value>
@@ -613,7 +613,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;txtBacklashSteps.ZOrder" xml:space="preserve">
-    <value>32</value>
+    <value>38</value>
   </data>
   <data name="label9.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -622,7 +622,7 @@
     <value>NoControl</value>
   </data>
   <data name="label9.Location" type="System.Drawing.Point, System.Drawing">
-    <value>290, 305</value>
+    <value>290, 380</value>
   </data>
   <data name="label9.Size" type="System.Drawing.Size, System.Drawing">
     <value>79, 13</value>
@@ -643,7 +643,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label9.ZOrder" xml:space="preserve">
-    <value>33</value>
+    <value>39</value>
   </data>
   <data name="label10.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -652,7 +652,7 @@
     <value>NoControl</value>
   </data>
   <data name="label10.Location" type="System.Drawing.Point, System.Drawing">
-    <value>427, 305</value>
+    <value>440, 380</value>
   </data>
   <data name="label10.Size" type="System.Drawing.Size, System.Drawing">
     <value>20, 13</value>
@@ -673,7 +673,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label10.ZOrder" xml:space="preserve">
-    <value>31</value>
+    <value>37</value>
   </data>
   <data name="label11.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -706,13 +706,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label11.ZOrder" xml:space="preserve">
-    <value>30</value>
+    <value>36</value>
   </data>
   <data name="cbxReverseDirection.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
   <data name="cbxReverseDirection.Location" type="System.Drawing.Point, System.Drawing">
-    <value>375, 328</value>
+    <value>388, 403</value>
   </data>
   <data name="cbxReverseDirection.Size" type="System.Drawing.Size, System.Drawing">
     <value>109, 17</value>
@@ -733,13 +733,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;cbxReverseDirection.ZOrder" xml:space="preserve">
-    <value>29</value>
+    <value>35</value>
   </data>
   <data name="cbxDynamicBreaking.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
   <data name="cbxDynamicBreaking.Location" type="System.Drawing.Point, System.Drawing">
-    <value>375, 351</value>
+    <value>388, 426</value>
   </data>
   <data name="cbxDynamicBreaking.Size" type="System.Drawing.Size, System.Drawing">
     <value>112, 17</value>
@@ -760,7 +760,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;cbxDynamicBreaking.ZOrder" xml:space="preserve">
-    <value>28</value>
+    <value>34</value>
   </data>
   <data name="cbxRtsDtr.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -793,11 +793,8 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;cbxRtsDtr.ZOrder" xml:space="preserve">
-    <value>27</value>
+    <value>33</value>
   </data>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <data name="cbxSendDateTime.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -829,13 +826,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;cbxSendDateTime.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>15</value>
   </data>
   <data name="label12.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
   <data name="label12.Location" type="System.Drawing.Point, System.Drawing">
-    <value>290, 114</value>
+    <value>290, 189</value>
   </data>
   <data name="label12.Size" type="System.Drawing.Size, System.Drawing">
     <value>72, 13</value>
@@ -856,10 +853,10 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label12.ZOrder" xml:space="preserve">
-    <value>26</value>
+    <value>32</value>
   </data>
   <data name="txtElevation.Location" type="System.Drawing.Point, System.Drawing">
-    <value>375, 111</value>
+    <value>388, 186</value>
   </data>
   <data name="txtElevation.Size" type="System.Drawing.Size, System.Drawing">
     <value>100, 20</value>
@@ -877,13 +874,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;txtElevation.ZOrder" xml:space="preserve">
-    <value>25</value>
+    <value>31</value>
   </data>
   <data name="label13.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
   <data name="label13.Location" type="System.Drawing.Point, System.Drawing">
-    <value>481, 114</value>
+    <value>494, 189</value>
   </data>
   <data name="label13.Size" type="System.Drawing.Size, System.Drawing">
     <value>38, 13</value>
@@ -904,13 +901,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label13.ZOrder" xml:space="preserve">
-    <value>24</value>
+    <value>30</value>
   </data>
   <data name="label14.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
   <data name="label14.Location" type="System.Drawing.Point, System.Drawing">
-    <value>290, 145</value>
+    <value>290, 220</value>
   </data>
   <data name="label14.Size" type="System.Drawing.Size, System.Drawing">
     <value>56, 13</value>
@@ -931,10 +928,10 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label14.ZOrder" xml:space="preserve">
-    <value>23</value>
+    <value>29</value>
   </data>
   <data name="nudSettleTime.Location" type="System.Drawing.Point, System.Drawing">
-    <value>375, 143</value>
+    <value>388, 218</value>
   </data>
   <data name="nudSettleTime.Size" type="System.Drawing.Size, System.Drawing">
     <value>120, 20</value>
@@ -952,13 +949,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;nudSettleTime.ZOrder" xml:space="preserve">
-    <value>22</value>
+    <value>28</value>
   </data>
   <data name="label15.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
   <data name="label15.Location" type="System.Drawing.Point, System.Drawing">
-    <value>501, 145</value>
+    <value>514, 220</value>
   </data>
   <data name="label15.Size" type="System.Drawing.Size, System.Drawing">
     <value>47, 13</value>
@@ -979,7 +976,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label15.ZOrder" xml:space="preserve">
-    <value>21</value>
+    <value>27</value>
   </data>
   <data name="label16.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1006,7 +1003,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label16.ZOrder" xml:space="preserve">
-    <value>20</value>
+    <value>26</value>
   </data>
   <data name="cboStopBits.Location" type="System.Drawing.Point, System.Drawing">
     <value>97, 163</value>
@@ -1027,7 +1024,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;cboStopBits.ZOrder" xml:space="preserve">
-    <value>19</value>
+    <value>25</value>
   </data>
   <data name="numDatabits.Location" type="System.Drawing.Point, System.Drawing">
     <value>97, 137</value>
@@ -1048,7 +1045,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;numDatabits.ZOrder" xml:space="preserve">
-    <value>18</value>
+    <value>24</value>
   </data>
   <data name="cboParity.Location" type="System.Drawing.Point, System.Drawing">
     <value>97, 190</value>
@@ -1069,7 +1066,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;cboParity.ZOrder" xml:space="preserve">
-    <value>17</value>
+    <value>23</value>
   </data>
   <data name="cboSpeed.Location" type="System.Drawing.Point, System.Drawing">
     <value>97, 217</value>
@@ -1090,7 +1087,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;cboSpeed.ZOrder" xml:space="preserve">
-    <value>16</value>
+    <value>22</value>
   </data>
   <data name="cboHandShake.Location" type="System.Drawing.Point, System.Drawing">
     <value>97, 244</value>
@@ -1111,7 +1108,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;cboHandShake.ZOrder" xml:space="preserve">
-    <value>15</value>
+    <value>21</value>
   </data>
   <data name="label17.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1138,7 +1135,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label17.ZOrder" xml:space="preserve">
-    <value>14</value>
+    <value>20</value>
   </data>
   <data name="label18.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1165,7 +1162,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label18.ZOrder" xml:space="preserve">
-    <value>13</value>
+    <value>19</value>
   </data>
   <data name="label19.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1192,7 +1189,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label19.ZOrder" xml:space="preserve">
-    <value>12</value>
+    <value>18</value>
   </data>
   <data name="label20.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1219,7 +1216,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label20.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>17</value>
   </data>
   <data name="label21.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1231,7 +1228,7 @@
     <value>NoControl</value>
   </data>
   <data name="label21.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 284</value>
+    <value>15, 359</value>
   </data>
   <data name="label21.Size" type="System.Drawing.Size, System.Drawing">
     <value>73, 13</value>
@@ -1252,7 +1249,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label21.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>16</value>
   </data>
   <data name="cboParkedBehaviour.Items" xml:space="preserve">
     <value>No Coordinates</value>
@@ -1282,7 +1279,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;cboParkedBehaviour.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>14</value>
   </data>
   <data name="label22.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1309,7 +1306,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label22.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>13</value>
   </data>
   <data name="label23.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1336,7 +1333,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label23.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>12</value>
   </data>
   <data name="label24.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1363,7 +1360,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label24.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>11</value>
   </data>
   <data name="txtParkedAlt.Location" type="System.Drawing.Point, System.Drawing">
     <value>697, 151</value>
@@ -1384,7 +1381,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;txtParkedAlt.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>10</value>
   </data>
   <data name="txtParkedAz.Location" type="System.Drawing.Point, System.Drawing">
     <value>697, 177</value>
@@ -1405,7 +1402,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;txtParkedAz.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>9</value>
   </data>
   <data name="label25.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1435,10 +1432,10 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label25.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>8</value>
   </data>
   <data name="txtFocalLength.Location" type="System.Drawing.Point, System.Drawing">
-    <value>375, 87</value>
+    <value>388, 87</value>
   </data>
   <data name="txtFocalLength.Size" type="System.Drawing.Size, System.Drawing">
     <value>100, 20</value>
@@ -1456,7 +1453,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;txtFocalLength.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>7</value>
   </data>
   <data name="label26.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1465,7 +1462,7 @@
     <value>NoControl</value>
   </data>
   <data name="label26.Location" type="System.Drawing.Point, System.Drawing">
-    <value>481, 90</value>
+    <value>494, 90</value>
   </data>
   <data name="label26.Size" type="System.Drawing.Size, System.Drawing">
     <value>23, 13</value>
@@ -1486,8 +1483,170 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;label26.ZOrder" xml:space="preserve">
+    <value>6</value>
+  </data>
+  <data name="label27.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label27.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="label27.Location" type="System.Drawing.Point, System.Drawing">
+    <value>494, 114</value>
+  </data>
+  <data name="label27.Size" type="System.Drawing.Size, System.Drawing">
+    <value>23, 13</value>
+  </data>
+  <data name="label27.TabIndex" type="System.Int32, mscorlib">
+    <value>53</value>
+  </data>
+  <data name="label27.Text" xml:space="preserve">
+    <value>mm</value>
+  </data>
+  <data name="&gt;&gt;label27.Name" xml:space="preserve">
+    <value>label27</value>
+  </data>
+  <data name="&gt;&gt;label27.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label27.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;label27.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="txtApertureDiameter.Location" type="System.Drawing.Point, System.Drawing">
+    <value>388, 111</value>
+  </data>
+  <data name="txtApertureDiameter.Size" type="System.Drawing.Size, System.Drawing">
+    <value>100, 20</value>
+  </data>
+  <data name="txtApertureDiameter.TabIndex" type="System.Int32, mscorlib">
+    <value>52</value>
+  </data>
+  <data name="&gt;&gt;txtApertureDiameter.Name" xml:space="preserve">
+    <value>txtApertureDiameter</value>
+  </data>
+  <data name="&gt;&gt;txtApertureDiameter.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtApertureDiameter.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;txtApertureDiameter.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="label28.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label28.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="label28.Location" type="System.Drawing.Point, System.Drawing">
+    <value>290, 114</value>
+  </data>
+  <data name="label28.Size" type="System.Drawing.Size, System.Drawing">
+    <value>92, 13</value>
+  </data>
+  <data name="label28.TabIndex" type="System.Int32, mscorlib">
+    <value>51</value>
+  </data>
+  <data name="label28.Text" xml:space="preserve">
+    <value>Aperture Diameter</value>
+  </data>
+  <data name="&gt;&gt;label28.Name" xml:space="preserve">
+    <value>label28</value>
+  </data>
+  <data name="&gt;&gt;label28.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label28.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;label28.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="label29.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label29.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="label29.Location" type="System.Drawing.Point, System.Drawing">
+    <value>494, 139</value>
+  </data>
+  <data name="label29.Size" type="System.Drawing.Size, System.Drawing">
+    <value>23, 13</value>
+  </data>
+  <data name="label29.TabIndex" type="System.Int32, mscorlib">
+    <value>56</value>
+  </data>
+  <data name="label29.Text" xml:space="preserve">
+    <value>mm</value>
+  </data>
+  <data name="&gt;&gt;label29.Name" xml:space="preserve">
+    <value>label29</value>
+  </data>
+  <data name="&gt;&gt;label29.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label29.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;label29.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="txtApertureArea.Location" type="System.Drawing.Point, System.Drawing">
+    <value>388, 136</value>
+  </data>
+  <data name="txtApertureArea.Size" type="System.Drawing.Size, System.Drawing">
+    <value>100, 20</value>
+  </data>
+  <data name="txtApertureArea.TabIndex" type="System.Int32, mscorlib">
+    <value>55</value>
+  </data>
+  <data name="&gt;&gt;txtApertureArea.Name" xml:space="preserve">
+    <value>txtApertureArea</value>
+  </data>
+  <data name="&gt;&gt;txtApertureArea.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtApertureArea.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;txtApertureArea.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="label30.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label30.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="label30.Location" type="System.Drawing.Point, System.Drawing">
+    <value>290, 139</value>
+  </data>
+  <data name="label30.Size" type="System.Drawing.Size, System.Drawing">
+    <value>72, 13</value>
+  </data>
+  <data name="label30.TabIndex" type="System.Int32, mscorlib">
+    <value>54</value>
+  </data>
+  <data name="label30.Text" xml:space="preserve">
+    <value>Aperture Area</value>
+  </data>
+  <data name="&gt;&gt;label30.Name" xml:space="preserve">
+    <value>label30</value>
+  </data>
+  <data name="&gt;&gt;label30.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label30.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;label30.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

Meade.net/SharedResources.cs

@@ -199,6 +199,8 @@ namespace ASCOM.Meade.net
         private const string ParkedAltName = "Parked Altitude";
         private const string ParkedAzimuthName = "Parked Azimuth";
         private const string FocalLengthName = "Focal Length (mm)";
+        private const string ApertureAreaName = "Aperture Area (mm²)";
+        private const string ApertureDiameterName = "Aperture Diameter (mm)";
 
         public static void WriteProfile(ProfileProperties profileProperties)
         {
@@ -228,6 +230,8 @@ namespace ASCOM.Meade.net
                     driverProfile.WriteValue(DriverId, ParkedAltName, profileProperties.ParkedAlt.ToString(CultureInfo.InvariantCulture));
                     driverProfile.WriteValue(DriverId, ParkedAzimuthName, profileProperties.ParkedAz.ToString(CultureInfo.InvariantCulture));
                     driverProfile.WriteValue(DriverId, FocalLengthName, profileProperties.FocalLength.ToString(CultureInfo.InvariantCulture));
+                    driverProfile.WriteValue(DriverId, ApertureAreaName, profileProperties.ApertureArea.ToString(CultureInfo.InvariantCulture));
+                    driverProfile.WriteValue(DriverId, ApertureDiameterName, profileProperties.ApertureDiameter.ToString(CultureInfo.InvariantCulture));
                 }
             }
         }
@@ -253,6 +257,8 @@ namespace ASCOM.Meade.net
         private const string ParkedAltDefault = "0";
         private const string ParkedAzimuthDefault = "180";
         private const string FocalLengthDefault = "2000";
+        private const string ApertureAreaDefault = "32685";
+        private const string ApertureDiameterDefault = "203";
 
         public static ProfileProperties ReadProfile()
         {
@@ -284,6 +290,8 @@ namespace ASCOM.Meade.net
                     profileProperties.ParkedAlt = double.Parse(driverProfile.GetValue(DriverId, ParkedAltName, string.Empty, ParkedAltDefault), NumberFormatInfo.InvariantInfo);
                     profileProperties.ParkedAz = double.Parse(driverProfile.GetValue(DriverId, ParkedAzimuthName, string.Empty, ParkedAzimuthDefault), NumberFormatInfo.InvariantInfo);
                     profileProperties.FocalLength = double.Parse(driverProfile.GetValue(DriverId, FocalLengthName, string.Empty, FocalLengthDefault), NumberFormatInfo.InvariantInfo);
+                    profileProperties.ApertureArea = double.Parse(driverProfile.GetValue(DriverId, ApertureAreaName, string.Empty, ApertureAreaDefault), NumberFormatInfo.InvariantInfo);
+                    profileProperties.ApertureDiameter = double.Parse(driverProfile.GetValue(DriverId, ApertureDiameterName, string.Empty, ApertureDiameterDefault), NumberFormatInfo.InvariantInfo);
                 }
 
                 return profileProperties;