From b4608712613712a24316faba8386aacb9066f7f8 Mon Sep 17 00:00:00 2001 From: Brian Tischler Date: Thu, 23 Nov 2023 08:42:30 -0700 Subject: [PATCH 1/2] Fix tram pass 0 to 1 --- SourceCode/GPS/Classes/CSettings.cs | 16 ++++++++-------- SourceCode/GPS/Forms/Guidance/FormTram.cs | 5 +++++ SourceCode/GPS/Properties/AssemblyInfo.cs | 4 ++-- SourceCode/GPS/Properties/Settings.Designer.cs | 2 +- SourceCode/GPS/Properties/Settings.settings | 2 +- SourceCode/GPS/app.config | 2 +- 6 files changed, 18 insertions(+), 13 deletions(-) diff --git a/SourceCode/GPS/Classes/CSettings.cs b/SourceCode/GPS/Classes/CSettings.cs index f2880f9b2..9d1c70137 100644 --- a/SourceCode/GPS/Classes/CSettings.cs +++ b/SourceCode/GPS/Classes/CSettings.cs @@ -14,20 +14,20 @@ public CFeatureSettings() { } //public bool ; public bool isHeadlandOn = false; - public bool isTramOn = false; + public bool isTramOn = true; public bool isBoundaryOn = true; public bool isBndContourOn = true; - public bool isRecPathOn = false; - public bool isABSmoothOn = false; + public bool isRecPathOn = true; + public bool isABSmoothOn = true; public bool isHideContourOn = true; - public bool isWebCamOn = false; - public bool isOffsetFixOn = false; + public bool isWebCamOn = true; + public bool isOffsetFixOn = true; public bool isAgIOOn = true; public bool isContourOn = true; public bool isYouTurnOn = true; - public bool isSteerModeOn = false; + public bool isSteerModeOn = true; public bool isManualSectionOn = true; public bool isAutoSectionOn = true; @@ -36,8 +36,8 @@ public CFeatureSettings() { } public bool isCurveOn = true; public bool isAutoSteerOn = true; - public bool isUTurnOn = false; - public bool isLateralOn = false; + public bool isUTurnOn = true; + public bool isLateralOn = true; public CFeatureSettings(CFeatureSettings _feature) { diff --git a/SourceCode/GPS/Forms/Guidance/FormTram.cs b/SourceCode/GPS/Forms/Guidance/FormTram.cs index 77bf3ff86..5c7790d28 100644 --- a/SourceCode/GPS/Forms/Guidance/FormTram.cs +++ b/SourceCode/GPS/Forms/Guidance/FormTram.cs @@ -31,6 +31,11 @@ public FormTram(Form callingForm, bool Curve) private void FormTram_Load(object sender, EventArgs e) { + if (Properties.Settings.Default.setTram_passes < 1) + { + Properties.Settings.Default.setTram_passes = 1; + Properties.Settings.Default.Save(); + } nudPasses.Value = Properties.Settings.Default.setTram_passes; nudPasses.ValueChanged += nudPasses_ValueChanged; diff --git a/SourceCode/GPS/Properties/AssemblyInfo.cs b/SourceCode/GPS/Properties/AssemblyInfo.cs index 973b3bf42..9a9dd3679 100644 --- a/SourceCode/GPS/Properties/AssemblyInfo.cs +++ b/SourceCode/GPS/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("5.8.0")] -[assembly: AssemblyFileVersion("5.8.0")] \ No newline at end of file +[assembly: AssemblyVersion("5.8.3")] +[assembly: AssemblyFileVersion("5.8.3")] \ No newline at end of file diff --git a/SourceCode/GPS/Properties/Settings.Designer.cs b/SourceCode/GPS/Properties/Settings.Designer.cs index 99dedcd0c..c8aa9569b 100644 --- a/SourceCode/GPS/Properties/Settings.Designer.cs +++ b/SourceCode/GPS/Properties/Settings.Designer.cs @@ -493,7 +493,7 @@ public double setTram_snapAdj { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("0")] + [global::System.Configuration.DefaultSettingValueAttribute("1")] public int setTram_passes { get { return ((int)(this["setTram_passes"])); diff --git a/SourceCode/GPS/Properties/Settings.settings b/SourceCode/GPS/Properties/Settings.settings index 62213583f..3db6b7434 100644 --- a/SourceCode/GPS/Properties/Settings.settings +++ b/SourceCode/GPS/Properties/Settings.settings @@ -120,7 +120,7 @@ 1 - 0 + 1 0 diff --git a/SourceCode/GPS/app.config b/SourceCode/GPS/app.config index 222d64d50..62503a534 100644 --- a/SourceCode/GPS/app.config +++ b/SourceCode/GPS/app.config @@ -125,7 +125,7 @@ 1 - 0 + 1 0 From 4380209784981ae2ff1afd20ee00c05ac01eaf5e Mon Sep 17 00:00:00 2001 From: Brian Tischler Date: Thu, 23 Nov 2023 09:06:16 -0700 Subject: [PATCH 2/2] Fix help for Resume field --- SourceCode/GPS/Forms/Controls.Designer.cs | 16 ++++++++++++++++ SourceCode/GPS/Forms/FormGPS.Designer.cs | 16 ++++++++-------- .../GPS/Forms/Settings/FormConfig.Designer.cs | 2 +- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/SourceCode/GPS/Forms/Controls.Designer.cs b/SourceCode/GPS/Forms/Controls.Designer.cs index ba8f965eb..bc9f76f1e 100644 --- a/SourceCode/GPS/Forms/Controls.Designer.cs +++ b/SourceCode/GPS/Forms/Controls.Designer.cs @@ -606,6 +606,14 @@ private void btnFlag_Click(object sender, EventArgs e) private void btnResumeField_Click(object sender, EventArgs e) { + if (isTT) + { + MessageBox.Show("Resumes Last Field Used", "Resume Field"); + ResetHelpBtn(); + return; + } + + if (isJobStarted) { if (autoBtnState == btnStates.Auto) @@ -1208,6 +1216,14 @@ private void SetLanguage(string lang, bool Restart) private void btnStanleyPure_Click(object sender, EventArgs e) { + if (isTT) + { + MessageBox.Show(gStr.h_btnStanleyPure, "Steer Mode"); + ResetHelpBtn(); + return; + } + + isStanleyUsed = !isStanleyUsed; if (isStanleyUsed) diff --git a/SourceCode/GPS/Forms/FormGPS.Designer.cs b/SourceCode/GPS/Forms/FormGPS.Designer.cs index 065c1fa62..bbbad5718 100644 --- a/SourceCode/GPS/Forms/FormGPS.Designer.cs +++ b/SourceCode/GPS/Forms/FormGPS.Designer.cs @@ -774,7 +774,7 @@ private void InitializeComponent() this.btnResetSteerAngle.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnResetSteerAngle.Font = new System.Drawing.Font("Tahoma", 9.75F); this.btnResetSteerAngle.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.btnResetSteerAngle.Location = new System.Drawing.Point(222, 4); + this.btnResetSteerAngle.Location = new System.Drawing.Point(221, 4); this.btnResetSteerAngle.Name = "btnResetSteerAngle"; this.btnResetSteerAngle.Size = new System.Drawing.Size(43, 31); this.btnResetSteerAngle.TabIndex = 162; @@ -799,10 +799,10 @@ private void InitializeComponent() this.hsbarSteerAngle.Dock = System.Windows.Forms.DockStyle.Fill; this.hsbarSteerAngle.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.hsbarSteerAngle.LargeChange = 20; - this.hsbarSteerAngle.Location = new System.Drawing.Point(269, 1); + this.hsbarSteerAngle.Location = new System.Drawing.Point(268, 1); this.hsbarSteerAngle.Maximum = 800; this.hsbarSteerAngle.Name = "hsbarSteerAngle"; - this.hsbarSteerAngle.Size = new System.Drawing.Size(159, 37); + this.hsbarSteerAngle.Size = new System.Drawing.Size(158, 37); this.hsbarSteerAngle.TabIndex = 179; this.hsbarSteerAngle.Value = 400; this.hsbarSteerAngle.Scroll += new System.Windows.Forms.ScrollEventHandler(this.hsbarSteerAngle_Scroll); @@ -815,7 +815,7 @@ private void InitializeComponent() this.hsbarStepDistance.Location = new System.Drawing.Point(59, 1); this.hsbarStepDistance.Minimum = -25; this.hsbarStepDistance.Name = "hsbarStepDistance"; - this.hsbarStepDistance.Size = new System.Drawing.Size(159, 37); + this.hsbarStepDistance.Size = new System.Drawing.Size(158, 37); this.hsbarStepDistance.TabIndex = 178; this.hsbarStepDistance.Scroll += new System.Windows.Forms.ScrollEventHandler(this.hsbarStepDistance_Scroll); // @@ -1567,7 +1567,7 @@ private void InitializeComponent() this.panelSim.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.panelSim.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 53F)); this.panelSim.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 65F)); - this.panelSim.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 47F)); + this.panelSim.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 49F)); this.panelSim.Controls.Add(this.btnSimForward, 6, 0); this.panelSim.Controls.Add(this.btnSimSetSpeedToZero, 5, 0); this.panelSim.Controls.Add(this.btnSimReverse, 4, 0); @@ -1591,7 +1591,7 @@ private void InitializeComponent() this.btnSimForward.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSimForward.Font = new System.Drawing.Font("Tahoma", 9.75F); this.btnSimForward.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.btnSimForward.Location = new System.Drawing.Point(552, 4); + this.btnSimForward.Location = new System.Drawing.Point(550, 4); this.btnSimForward.Name = "btnSimForward"; this.btnSimForward.Size = new System.Drawing.Size(38, 31); this.btnSimForward.TabIndex = 454; @@ -1610,7 +1610,7 @@ private void InitializeComponent() this.btnSimSetSpeedToZero.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSimSetSpeedToZero.Font = new System.Drawing.Font("Tahoma", 9.75F); this.btnSimSetSpeedToZero.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.btnSimSetSpeedToZero.Location = new System.Drawing.Point(486, 4); + this.btnSimSetSpeedToZero.Location = new System.Drawing.Point(484, 4); this.btnSimSetSpeedToZero.Name = "btnSimSetSpeedToZero"; this.btnSimSetSpeedToZero.Size = new System.Drawing.Size(59, 31); this.btnSimSetSpeedToZero.TabIndex = 453; @@ -1626,7 +1626,7 @@ private void InitializeComponent() this.btnSimReverse.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSimReverse.Font = new System.Drawing.Font("Tahoma", 9.75F); this.btnSimReverse.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.btnSimReverse.Location = new System.Drawing.Point(432, 4); + this.btnSimReverse.Location = new System.Drawing.Point(430, 4); this.btnSimReverse.Name = "btnSimReverse"; this.btnSimReverse.Size = new System.Drawing.Size(47, 31); this.btnSimReverse.TabIndex = 455; diff --git a/SourceCode/GPS/Forms/Settings/FormConfig.Designer.cs b/SourceCode/GPS/Forms/Settings/FormConfig.Designer.cs index 7510f58af..0b3f1e527 100644 --- a/SourceCode/GPS/Forms/Settings/FormConfig.Designer.cs +++ b/SourceCode/GPS/Forms/Settings/FormConfig.Designer.cs @@ -2887,7 +2887,7 @@ private void InitializeComponent() this.nudMaxSteerSpeed.InterceptArrowKeys = false; this.nudMaxSteerSpeed.Location = new System.Drawing.Point(354, 501); this.nudMaxSteerSpeed.Maximum = new decimal(new int[] { - 30, + 50, 0, 0, 0});