diff --git a/Meade.net.Telescope/Telescope.cs b/Meade.net.Telescope/Telescope.cs index a364626..be25c15 100644 --- a/Meade.net.Telescope/Telescope.cs +++ b/Meade.net.Telescope/Telescope.cs @@ -660,6 +660,14 @@ namespace ASCOM.Meade.net private void ApplySkipAutoStarPrompts() { + if (_profileProperties.IntroPromptBypassOverride) + { + LogMessage("ApplySkipAutoStarPrompts", "This session will not attempt to skip the autostar intro prompts"); + return; + } + + LogMessage("ApplySkipAutoStarPrompts", "Attempting to skip the autostar intro prompts"); + switch (SharedResourcesWrapper.ProductName) { case TelescopeList.LX200GPS: diff --git a/Meade.net/MeadeTelescopeBase.cs b/Meade.net/MeadeTelescopeBase.cs index 35e38c1..78b72d2 100644 --- a/Meade.net/MeadeTelescopeBase.cs +++ b/Meade.net/MeadeTelescopeBase.cs @@ -63,6 +63,7 @@ namespace ASCOM.Meade.net LogMessage("ReadProfile", $"Site Elevation: {_profileProperties.SiteElevation}"); LogMessage("ReadProfile", $"Settle Time after slew: {_profileProperties.SettleTime}"); LogMessage("ReadProfile", $"Send date and time on connect: {_profileProperties.SendDateTime}"); + LogMessage("ReadProfile", $"Override attempt to bypass intro prompts: {_profileProperties.IntroPromptBypassOverride}"); LogMessage("ReadProfile", $"Parked Behaviour: {_profileProperties.ParkedBehaviour}"); LogMessage("ReadProfile", $"Parked Alt: {_profileProperties.ParkedAlt}"); LogMessage("ReadProfile", $"Parked Az: {_profileProperties.ParkedAz}"); diff --git a/Meade.net/ProfileProperties.cs b/Meade.net/ProfileProperties.cs index 6a3833d..be6844d 100644 --- a/Meade.net/ProfileProperties.cs +++ b/Meade.net/ProfileProperties.cs @@ -26,5 +26,6 @@ namespace ASCOM.Meade.net public double FocalLength { get; set; } public double ApertureArea { get; set; } public double ApertureDiameter { get; set; } + public bool IntroPromptBypassOverride { get; set; } } } \ No newline at end of file diff --git a/Meade.net/SetupDialogForm.cs b/Meade.net/SetupDialogForm.cs index d41d3f9..8f50bdd 100644 --- a/Meade.net/SetupDialogForm.cs +++ b/Meade.net/SetupDialogForm.cs @@ -177,6 +177,7 @@ namespace ASCOM.Meade.net nudSettleTime.Value = profileProperties.SettleTime; cbxSendDateTime.Checked = profileProperties.SendDateTime; + cbxIntroPromptBypassOverride.Checked = profileProperties.IntroPromptBypassOverride; try { @@ -256,6 +257,7 @@ namespace ASCOM.Meade.net SiteElevation = double.Parse(txtElevation.Text), SettleTime = Convert.ToInt16(nudSettleTime.Value), SendDateTime = cbxSendDateTime.Checked, + IntroPromptBypassOverride = cbxIntroPromptBypassOverride.Checked, ParkedBehaviour = EnumExtensionMethods.GetValueFromDescription(cboParkedBehaviour.SelectedItem.ToString()), ParkedAlt = double.Parse(txtParkedAlt.Text), ParkedAz = double.Parse(txtParkedAz.Text), diff --git a/Meade.net/SetupDialogForm.designer.cs b/Meade.net/SetupDialogForm.designer.cs index 182c198..e68beb5 100644 --- a/Meade.net/SetupDialogForm.designer.cs +++ b/Meade.net/SetupDialogForm.designer.cs @@ -92,6 +92,7 @@ namespace ASCOM.Meade.net this.txtApertureArea = new System.Windows.Forms.TextBox(); this.label30 = new System.Windows.Forms.Label(); this.button1 = new System.Windows.Forms.Button(); + this.cbxIntroPromptBypassOverride = new System.Windows.Forms.CheckBox(); ((System.ComponentModel.ISupportInitialize)(this.picASCOM)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudSettleTime)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numDatabits)).BeginInit(); @@ -452,10 +453,18 @@ namespace ASCOM.Meade.net this.button1.UseVisualStyleBackColor = true; this.button1.Click += new System.EventHandler(this.button1_Click); // + // cbxIntroPromptBypassOverride + // + resources.ApplyResources(this.cbxIntroPromptBypassOverride, "cbxIntroPromptBypassOverride"); + this.cbxIntroPromptBypassOverride.Name = "cbxIntroPromptBypassOverride"; + this.toolTip1.SetToolTip(this.cbxIntroPromptBypassOverride, resources.GetString("cbxIntroPromptBypassOverride.ToolTip")); + this.cbxIntroPromptBypassOverride.UseVisualStyleBackColor = true; + // // SetupDialogForm // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.cbxIntroPromptBypassOverride); this.Controls.Add(this.button1); this.Controls.Add(this.label29); this.Controls.Add(this.txtApertureArea); @@ -590,5 +599,6 @@ namespace ASCOM.Meade.net private TextBox txtApertureArea; private Label label30; private Button button1; + private CheckBox cbxIntroPromptBypassOverride; } } \ No newline at end of file diff --git a/Meade.net/SetupDialogForm.resx b/Meade.net/SetupDialogForm.resx index c64acf9..d5803b2 100644 --- a/Meade.net/SetupDialogForm.resx +++ b/Meade.net/SetupDialogForm.resx @@ -145,7 +145,7 @@ $this - 57 + 58 Bottom, Right @@ -172,7 +172,7 @@ $this - 56 + 57 12, 9 @@ -196,7 +196,7 @@ $this - 55 + 56 Top, Right @@ -223,7 +223,7 @@ $this - 54 + 55 True @@ -250,7 +250,7 @@ $this - 53 + 54 True @@ -277,7 +277,7 @@ $this - 52 + 53 97, 87 @@ -298,7 +298,7 @@ $this - 51 + 52 True @@ -325,11 +325,8 @@ $this - 50 + 51 - - 17, 17 - 388, 259 @@ -342,6 +339,9 @@ 10.0 + + 17, 17 + LX-200GPS only @@ -355,7 +355,7 @@ $this - 49 + 50 True @@ -382,7 +382,7 @@ $this - 48 + 49 True @@ -409,7 +409,7 @@ $this - 47 + 48 True @@ -436,7 +436,7 @@ $this - 46 + 47 Unchanged @@ -466,7 +466,7 @@ $this - 45 + 46 True @@ -496,7 +496,7 @@ $this - 44 + 45 Auto @@ -526,7 +526,7 @@ $this - 43 + 44 True @@ -556,7 +556,7 @@ $this - 42 + 43 True @@ -589,7 +589,7 @@ $this - 41 + 42 388, 377 @@ -613,7 +613,7 @@ $this - 39 + 40 True @@ -643,7 +643,7 @@ $this - 40 + 41 True @@ -673,7 +673,7 @@ $this - 38 + 39 True @@ -706,7 +706,7 @@ $this - 37 + 38 True @@ -733,7 +733,7 @@ $this - 36 + 37 True @@ -760,7 +760,7 @@ $this - 35 + 36 True @@ -793,11 +793,8 @@ $this - 34 + 35 - - 17, 17 - True @@ -829,7 +826,7 @@ $this - 16 + 17 True @@ -856,7 +853,7 @@ $this - 33 + 34 388, 186 @@ -877,7 +874,7 @@ $this - 32 + 33 True @@ -904,7 +901,7 @@ $this - 31 + 32 True @@ -931,7 +928,7 @@ $this - 30 + 31 388, 218 @@ -952,7 +949,7 @@ $this - 29 + 30 True @@ -979,7 +976,7 @@ $this - 28 + 29 True @@ -1006,7 +1003,7 @@ $this - 27 + 28 97, 163 @@ -1027,7 +1024,7 @@ $this - 26 + 27 97, 137 @@ -1048,7 +1045,7 @@ $this - 25 + 26 97, 190 @@ -1069,7 +1066,7 @@ $this - 24 + 25 97, 217 @@ -1090,7 +1087,7 @@ $this - 23 + 24 97, 244 @@ -1111,7 +1108,7 @@ $this - 22 + 23 True @@ -1138,7 +1135,7 @@ $this - 21 + 22 True @@ -1165,7 +1162,7 @@ $this - 20 + 21 True @@ -1192,7 +1189,7 @@ $this - 19 + 20 True @@ -1219,7 +1216,7 @@ $this - 18 + 19 True @@ -1252,7 +1249,7 @@ $this - 17 + 18 No Coordinates @@ -1264,7 +1261,7 @@ Report coordinates as - 671, 124 + 671, 136 126, 21 @@ -1282,13 +1279,13 @@ $this - 15 + 16 True - 574, 127 + 574, 139 91, 13 @@ -1309,13 +1306,13 @@ $this - 14 + 15 True - 668, 154 + 668, 166 19, 13 @@ -1336,13 +1333,13 @@ $this - 13 + 14 True - 668, 180 + 668, 192 19, 13 @@ -1363,10 +1360,10 @@ $this - 12 + 13 - 697, 151 + 697, 163 100, 20 @@ -1384,10 +1381,10 @@ $this - 11 + 12 - 697, 177 + 697, 189 100, 20 @@ -1405,7 +1402,7 @@ $this - 10 + 11 True @@ -1435,7 +1432,7 @@ $this - 9 + 10 388, 87 @@ -1456,7 +1453,7 @@ $this - 8 + 9 True @@ -1486,7 +1483,7 @@ $this - 7 + 8 True @@ -1516,7 +1513,7 @@ $this - 4 + 5 388, 111 @@ -1537,7 +1534,7 @@ $this - 5 + 6 True @@ -1567,7 +1564,7 @@ $this - 6 + 7 True @@ -1597,7 +1594,7 @@ $this - 1 + 2 388, 136 @@ -1618,7 +1615,7 @@ $this - 2 + 3 True @@ -1648,7 +1645,7 @@ $this - 3 + 4 112, 399 @@ -1672,6 +1669,39 @@ $this + 1 + + + True + + + NoControl + + + 671, 114 + + + 158, 17 + + + 58 + + + Do not bypass Intro prompts + + + Send Current Date and Time (will also skip the opening dialogs on the LX200GPS) + + + cbxIntroPromptBypassOverride + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + 0 diff --git a/Meade.net/SharedResources.cs b/Meade.net/SharedResources.cs index 03fcf3d..3789275 100644 --- a/Meade.net/SharedResources.cs +++ b/Meade.net/SharedResources.cs @@ -206,6 +206,7 @@ namespace ASCOM.Meade.net private const string HandShakeName = "Hand Shake"; private const string ParityName = "Parity"; private const string SendDateTimeName = "Send Date and time on connect"; + private const string OverrideBypassIntroPromptsName = "Override bypass intro prompts"; private const string ParkedBehaviourName = "Parked Behaviour"; private const string ParkedAltName = "Parked Altitude"; private const string ParkedAzimuthName = "Parked Azimuth"; @@ -237,6 +238,7 @@ namespace ASCOM.Meade.net driverProfile.WriteValue(DriverId, SiteElevationName, profileProperties.SiteElevation.ToString(CultureInfo.InvariantCulture)); driverProfile.WriteValue(DriverId, SettleTimeName, profileProperties.SettleTime.ToString()); driverProfile.WriteValue(DriverId, SendDateTimeName, profileProperties.SendDateTime.ToString()); + driverProfile.WriteValue(DriverId, OverrideBypassIntroPromptsName, profileProperties.IntroPromptBypassOverride.ToString()); driverProfile.WriteValue(DriverId, ParkedBehaviourName, profileProperties.ParkedBehaviour.GetDescription()); driverProfile.WriteValue(DriverId, ParkedAltName, profileProperties.ParkedAlt.ToString(CultureInfo.InvariantCulture)); driverProfile.WriteValue(DriverId, ParkedAzimuthName, profileProperties.ParkedAz.ToString(CultureInfo.InvariantCulture)); @@ -264,6 +266,7 @@ namespace ASCOM.Meade.net private const string HandShakeDefault = "None"; private const string ParityDefault = "None"; private const string SendDateTimeDefault = "false"; + private const string OverrideBypassIntroPromptsDefault = "false"; private const string ParkedBehaviourDefault = "No Coordinates"; private const string ParkedAltDefault = "0"; private const string ParkedAzimuthDefault = "180"; @@ -296,6 +299,7 @@ namespace ASCOM.Meade.net profileProperties.Speed = Convert.ToInt32(driverProfile.GetValue(DriverId, SpeedName, string.Empty, SpeedDefault)); profileProperties.Parity = driverProfile.GetValue(DriverId, ParityName, string.Empty, ParityDefault); profileProperties.SendDateTime = Convert.ToBoolean(driverProfile.GetValue(DriverId, SendDateTimeName, string.Empty, SendDateTimeDefault)); + profileProperties.IntroPromptBypassOverride = Convert.ToBoolean(driverProfile.GetValue(DriverId, OverrideBypassIntroPromptsName, string.Empty, OverrideBypassIntroPromptsDefault)); profileProperties.ParkedBehaviour = EnumExtensionMethods.GetValueFromDescription(driverProfile.GetValue(DriverId, ParkedBehaviourName, string.Empty, ParkedBehaviourDefault)); profileProperties.ParkedAlt = double.Parse(driverProfile.GetValue(DriverId, ParkedAltName, string.Empty, ParkedAltDefault), NumberFormatInfo.InvariantInfo);