From eb8af4165524e7742979b1b4a51be6588ce92805 Mon Sep 17 00:00:00 2001 From: Peter Simpson <38855929+Peter-Simpson@users.noreply.github.com> Date: Wed, 23 Aug 2023 12:21:50 +0100 Subject: [PATCH] Fully revert telescope simulator to version 3. --- .../TelescopeSimulator/SetupDialogForm.cs | 6 --- .../SetupDialogForm.designer.cs | 40 ------------------- .../TelescopeSimulator/TelescopeHardware.cs | 4 +- .../TelescopeSimulator/frmMain.cs | 2 - 4 files changed, 2 insertions(+), 50 deletions(-) diff --git a/Drivers and Simulators/Telescope Simulator .NET/TelescopeSimulator/SetupDialogForm.cs b/Drivers and Simulators/Telescope Simulator .NET/TelescopeSimulator/SetupDialogForm.cs index 1eacb3c21..c78629850 100644 --- 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/Drivers and Simulators/Telescope Simulator .NET/TelescopeSimulator/SetupDialogForm.designer.cs b/Drivers and Simulators/Telescope Simulator .NET/TelescopeSimulator/SetupDialogForm.designer.cs index d209ba631..fd9ee6cdb 100644 --- a/Drivers and Simulators/Telescope Simulator .NET/TelescopeSimulator/SetupDialogForm.designer.cs +++ b/Drivers and Simulators/Telescope Simulator .NET/TelescopeSimulator/SetupDialogForm.designer.cs @@ -104,8 +104,6 @@ private void InitializeComponent() this.checkBoxRefraction = new System.Windows.Forms.CheckBox(); this.labelVersion = new System.Windows.Forms.Label(); this.labelTime = new System.Windows.Forms.Label(); - this.NumInterfaceVersion = new System.Windows.Forms.NumericUpDown(); - this.label10 = new System.Windows.Forms.Label(); this.groupBox1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.picASCOM)).BeginInit(); @@ -118,7 +116,6 @@ private void InitializeComponent() this.tableLayoutPanel4.SuspendLayout(); this.tableLayoutPanel5.SuspendLayout(); this.tableLayoutPanel6.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.NumInterfaceVersion)).BeginInit(); this.SuspendLayout(); // // cmdOK @@ -1007,46 +1004,12 @@ private void InitializeComponent() this.labelTime.TabIndex = 19; this.labelTime.Text = ""; // - // NumInterfaceVersion - // - this.NumInterfaceVersion.Location = new System.Drawing.Point(388, 148); - this.NumInterfaceVersion.Maximum = new decimal(new int[] { - 4, - 0, - 0, - 0}); - this.NumInterfaceVersion.Minimum = new decimal(new int[] { - 3, - 0, - 0, - 0}); - this.NumInterfaceVersion.Name = "NumInterfaceVersion"; - this.NumInterfaceVersion.Size = new System.Drawing.Size(40, 20); - this.NumInterfaceVersion.TabIndex = 20; - this.NumInterfaceVersion.Value = new decimal(new int[] { - 3, - 0, - 0, - 0}); - // - // label10 - // - this.label10.AutoSize = true; - this.label10.ForeColor = System.Drawing.Color.White; - this.label10.Location = new System.Drawing.Point(434, 151); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(86, 13); - this.label10.TabIndex = 21; - this.label10.Text = "Interface version"; - // // SetupDialogForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.Black; this.ClientSize = new System.Drawing.Size(628, 495); - this.Controls.Add(this.label10); - this.Controls.Add(this.NumInterfaceVersion); this.Controls.Add(this.labelTime); this.Controls.Add(this.labelVersion); this.Controls.Add(this.checkBoxRefraction); @@ -1091,7 +1054,6 @@ private void InitializeComponent() this.tableLayoutPanel5.PerformLayout(); this.tableLayoutPanel6.ResumeLayout(false); this.tableLayoutPanel6.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.NumInterfaceVersion)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -1175,7 +1137,5 @@ private void InitializeComponent() private System.Windows.Forms.TextBox textBoxAperture; private System.Windows.Forms.CheckBox checkBoxNoSyncPastMeridian; private System.Windows.Forms.CheckBox chkCanDestinationSideofPier; - private System.Windows.Forms.NumericUpDown NumInterfaceVersion; - private System.Windows.Forms.Label label10; } } \ No newline at end of file diff --git a/Drivers and Simulators/Telescope Simulator .NET/TelescopeSimulator/TelescopeHardware.cs b/Drivers and Simulators/Telescope Simulator .NET/TelescopeSimulator/TelescopeHardware.cs index 83aa7c7a8..7f32ec988 100644 --- 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 index bdfcd1795..d10b69093 100644 --- 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; }