Merge telescope reversion to interface v3 from develop.

ASCOMInitiative · Aug 23, 2023 · 17811f0 · 17811f0
2 parents 00a4b9f + eb8af41
commit 17811f0
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 50 deletions.
diff --git a/Drivers and Simulators/Telescope Simulator .NET/TelescopeSimulator/SetupDialogForm.cs b/Drivers and Simulators/Telescope Simulator .NET/TelescopeSimulator/SetupDialogForm.cs
@@ -92,12 +92,6 @@ private void BrowseToAscom(object sender, EventArgs e)
 
         #region Properties for Settings
 
-        public short InterfaceVersion
-        {
-            get { return (short)NumInterfaceVersion.Value; }
-            set { NumInterfaceVersion.Value = value; }
-        }
-
         public int EquatorialSystem
         {
             get { return int.Parse(comboBoxEquatorialSystem.SelectedValue.ToString(), CultureInfo.CurrentCulture); }

diff --git a/...rs and Simulators/Telescope Simulator .NET/TelescopeSimulator/SetupDialogForm.designer.cs b/...rs and Simulators/Telescope Simulator .NET/TelescopeSimulator/SetupDialogForm.designer.cs
diff --git a/Drivers and Simulators/Telescope Simulator .NET/TelescopeSimulator/TelescopeHardware.cs b/Drivers and Simulators/Telescope Simulator .NET/TelescopeSimulator/TelescopeHardware.cs
@@ -558,7 +558,7 @@ static TelescopeHardware()
                     s_Profile.WriteValue(SharedResources.PROGRAM_ID, "CanDestinationSideOfPier", "true", "Capabilities");
                     s_Profile.WriteValue(SharedResources.PROGRAM_ID, "CanTrackingRates", "true", "Capabilities");
                     s_Profile.WriteValue(SharedResources.PROGRAM_ID, "CanDualAxisPulseGuide", "true", "Capabilities");
-                    s_Profile.WriteValue(SharedResources.PROGRAM_ID, "InterfaceVersion", "4", "Capabilities");
+                    s_Profile.WriteValue(SharedResources.PROGRAM_ID, "InterfaceVersion", "3", "Capabilities");
                 }
 
                 //Load up the values from saved
@@ -667,7 +667,7 @@ static TelescopeHardware()
 
                 dateDelta = int.Parse(s_Profile.GetValue(SharedResources.PROGRAM_ID, "DateDelta"), CultureInfo.InvariantCulture);
 
-                interfaceVersion = short.Parse(s_Profile.GetValue(SharedResources.PROGRAM_ID, "InterfaceVersion", "", "4"), CultureInfo.InvariantCulture);
+                interfaceVersion = short.Parse(s_Profile.GetValue(SharedResources.PROGRAM_ID, "InterfaceVersion", "", "3"), CultureInfo.InvariantCulture);
 
                 if (latitude < 0) { SouthernHemisphere = true; }
 

diff --git a/Drivers and Simulators/Telescope Simulator .NET/TelescopeSimulator/frmMain.cs b/Drivers and Simulators/Telescope Simulator .NET/TelescopeSimulator/frmMain.cs
@@ -70,7 +70,6 @@ public void DoSetupDialog()
                 setupForm.Longitude = TelescopeHardware.Longitude;
                 setupForm.MaximumSlewRate = TelescopeHardware.MaximumSlewRate;
                 setupForm.NoSyncPastMeridian = TelescopeHardware.NoSyncPastMeridian;
-                setupForm.InterfaceVersion = TelescopeHardware.InterfaceVersion;
                 this.BringToFront();
                 DialogResult ans = setupForm.ShowDialog(this);
 
@@ -120,7 +119,6 @@ public void DoSetupDialog()
                     TelescopeHardware.Longitude = setupForm.Longitude;
                     TelescopeHardware.MaximumSlewRate = setupForm.MaximumSlewRate;
                     TelescopeHardware.NoSyncPastMeridian = setupForm.NoSyncPastMeridian;
-                    TelescopeHardware.InterfaceVersion=setupForm.InterfaceVersion;
 
                     this.TopMost = setupForm.OnTop;
                 }