diff --git a/SourceCode/AgDiag/Source/Forms/SerialComm.Designer.cs b/SourceCode/AgDiag/Source/Forms/SerialComm.Designer.cs index e5e84b86f..0be609296 100644 --- a/SourceCode/AgDiag/Source/Forms/SerialComm.Designer.cs +++ b/SourceCode/AgDiag/Source/Forms/SerialComm.Designer.cs @@ -164,7 +164,7 @@ public class CPGN_EE /// PGN - 238 - EE /// raiseTime=5 lowerTime=6 enableHyd= 7 set0 = 8 /// - public byte[] pgn = new byte[] { 0x80, 0x81, 0x7f, 0xEF, 3, 0, 0, 0, 0xCC }; + public byte[] pgn = new byte[] { 0x80, 0x81, 0x7f, 0xEE, 3, 0, 0, 0, 0xCC }; public int raiseTime = 5; public int lowerTime = 6; public int enableHyd = 7; diff --git a/SourceCode/AgIO/Source/App.config b/SourceCode/AgIO/Source/App.config index 84311c5c9..b00edba18 100644 --- a/SourceCode/AgIO/Source/App.config +++ b/SourceCode/AgIO/Source/App.config @@ -139,8 +139,8 @@ False - - + + False diff --git a/SourceCode/AgIO/Source/Forms/FormLoop.cs b/SourceCode/AgIO/Source/Forms/FormLoop.cs index 8f4b69f9d..3ed88999e 100644 --- a/SourceCode/AgIO/Source/Forms/FormLoop.cs +++ b/SourceCode/AgIO/Source/Forms/FormLoop.cs @@ -25,7 +25,7 @@ public FormLoop() public bool isKeyboardOn = true; - public bool isGPSSentencesOn = false; + public bool isGPSSentencesOn = false, isSendNMEAToUDP; public double secondsSinceStart, lastSecond; @@ -47,6 +47,8 @@ private void FormLoop_Load(object sender, EventArgs e) if (Settings.Default.setUDP_isOn) LoadUDPNetwork(); LoadLoopback(); + isSendNMEAToUDP = Properties.Settings.Default.setUDP_isSendNMEAToUDP; + lblGPS1Comm.Text = "---"; lblIMUComm.Text = "---"; lblMod1Comm.Text = "---"; diff --git a/SourceCode/AgIO/Source/Forms/FormUDP.Designer.cs b/SourceCode/AgIO/Source/Forms/FormUDP.Designer.cs index e0950053e..228dd2b25 100644 --- a/SourceCode/AgIO/Source/Forms/FormUDP.Designer.cs +++ b/SourceCode/AgIO/Source/Forms/FormUDP.Designer.cs @@ -51,11 +51,14 @@ private void InitializeComponent() this.label8 = new System.Windows.Forms.Label(); this.cboxIsUDPOn = new System.Windows.Forms.CheckBox(); this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.cboxIsSendNMEAToUDP = new System.Windows.Forms.CheckBox(); this.groupBox4.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.nudThisPort)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudAutoSteerPort)).BeginInit(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); + this.groupBox3.SuspendLayout(); this.SuspendLayout(); // // groupBox4 @@ -199,7 +202,7 @@ private void InitializeComponent() this.btnSerialCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSerialCancel.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnSerialCancel.Image = global::AgIO.Properties.Resources.Cancel64; - this.btnSerialCancel.Location = new System.Drawing.Point(363, 332); + this.btnSerialCancel.Location = new System.Drawing.Point(363, 460); this.btnSerialCancel.Name = "btnSerialCancel"; this.btnSerialCancel.Size = new System.Drawing.Size(88, 76); this.btnSerialCancel.TabIndex = 71; @@ -214,7 +217,7 @@ private void InitializeComponent() this.btnSerialOK.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnSerialOK.ForeColor = System.Drawing.SystemColors.ControlText; this.btnSerialOK.Image = global::AgIO.Properties.Resources.OK64; - this.btnSerialOK.Location = new System.Drawing.Point(476, 330); + this.btnSerialOK.Location = new System.Drawing.Point(476, 458); this.btnSerialOK.Name = "btnSerialOK"; this.btnSerialOK.Size = new System.Drawing.Size(102, 76); this.btnSerialOK.TabIndex = 70; @@ -343,19 +346,47 @@ private void InitializeComponent() // groupBox2 // this.groupBox2.Controls.Add(this.cboxIsUDPOn); - this.groupBox2.Location = new System.Drawing.Point(18, 306); + this.groupBox2.Location = new System.Drawing.Point(18, 331); this.groupBox2.Name = "groupBox2"; this.groupBox2.Size = new System.Drawing.Size(257, 100); this.groupBox2.TabIndex = 93; this.groupBox2.TabStop = false; this.groupBox2.Text = "Networking"; // + // groupBox3 + // + this.groupBox3.Controls.Add(this.cboxIsSendNMEAToUDP); + this.groupBox3.Location = new System.Drawing.Point(318, 331); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Size = new System.Drawing.Size(257, 100); + this.groupBox3.TabIndex = 94; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "Send NMEA to Network"; + // + // cboxIsSendNMEAToUDP + // + this.cboxIsSendNMEAToUDP.Appearance = System.Windows.Forms.Appearance.Button; + this.cboxIsSendNMEAToUDP.AutoSize = true; + this.cboxIsSendNMEAToUDP.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; + this.cboxIsSendNMEAToUDP.Checked = true; + this.cboxIsSendNMEAToUDP.CheckState = System.Windows.Forms.CheckState.Checked; + this.cboxIsSendNMEAToUDP.FlatAppearance.CheckedBackColor = System.Drawing.Color.PaleGreen; + this.cboxIsSendNMEAToUDP.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.cboxIsSendNMEAToUDP.Font = new System.Drawing.Font("Tahoma", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cboxIsSendNMEAToUDP.Location = new System.Drawing.Point(78, 37); + this.cboxIsSendNMEAToUDP.Name = "cboxIsSendNMEAToUDP"; + this.cboxIsSendNMEAToUDP.Size = new System.Drawing.Size(163, 45); + this.cboxIsSendNMEAToUDP.TabIndex = 92; + this.cboxIsSendNMEAToUDP.Text = "UDP NMEA"; + this.cboxIsSendNMEAToUDP.UseVisualStyleBackColor = true; + // // FormUDP // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 19F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(590, 417); + this.ClientSize = new System.Drawing.Size(590, 545); this.ControlBox = false; + this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); this.Controls.Add(this.label7); @@ -380,6 +411,8 @@ private void InitializeComponent() this.groupBox1.PerformLayout(); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); + this.groupBox3.ResumeLayout(false); + this.groupBox3.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -410,5 +443,7 @@ private void InitializeComponent() private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.Label label11; private System.Windows.Forms.Label label8; + private System.Windows.Forms.GroupBox groupBox3; + private System.Windows.Forms.CheckBox cboxIsSendNMEAToUDP; } } \ No newline at end of file diff --git a/SourceCode/AgIO/Source/Forms/FormUDP.cs b/SourceCode/AgIO/Source/Forms/FormUDP.cs index 697d2ffad..1e08981d0 100644 --- a/SourceCode/AgIO/Source/Forms/FormUDP.cs +++ b/SourceCode/AgIO/Source/Forms/FormUDP.cs @@ -44,6 +44,7 @@ private void btnSerialOK_Click(object sender, EventArgs e) //Properties.Settings.Default.setIP_rateMachinePort = (int)nudRateMachinePort.Value; Properties.Settings.Default.setUDP_isOn = cboxIsUDPOn.Checked; + Properties.Settings.Default.setUDP_isSendNMEAToUDP = cboxIsSendNMEAToUDP.Checked; Properties.Settings.Default.Save(); @@ -67,6 +68,7 @@ private void FormUDp_Load(object sender, EventArgs e) //nudRateMachinePort.Value = Properties.Settings.Default.setIP_rateMachinePort; cboxIsUDPOn.Checked = Properties.Settings.Default.setUDP_isOn; + cboxIsSendNMEAToUDP.Checked = Properties.Settings.Default.setUDP_isSendNMEAToUDP; } //get the ipv4 address only diff --git a/SourceCode/AgIO/Source/Forms/NMEA.Designer.cs b/SourceCode/AgIO/Source/Forms/NMEA.Designer.cs index 862d2c87b..95e67b7d3 100644 --- a/SourceCode/AgIO/Source/Forms/NMEA.Designer.cs +++ b/SourceCode/AgIO/Source/Forms/NMEA.Designer.cs @@ -244,9 +244,14 @@ public void ParseNMEA(ref string buffer) CK_A += nmeaPGN[j]; } + //checksum nmeaPGN[48] = (byte)CK_A; + //Send nmea to AgOpenGPS SendToLoopBackMessageAOG(nmeaPGN); + + //Send nmea to autosteer module 8888 + if (isSendNMEAToUDP) SendUDPMessage(nmeaPGN); } } diff --git a/SourceCode/AgIO/Source/Forms/UDP.designer.cs b/SourceCode/AgIO/Source/Forms/UDP.designer.cs index 797a104bd..e0e2ee9c9 100644 --- a/SourceCode/AgIO/Source/Forms/UDP.designer.cs +++ b/SourceCode/AgIO/Source/Forms/UDP.designer.cs @@ -214,7 +214,10 @@ private void ReceiveFromLoopBack(int port, byte[] data) traffic.cntrPGNFromAOG += data.Length; //Send out to udp network - if (isUDPNetworkConnected) SendUDPMessage(data); + if (isUDPNetworkConnected) + { + SendUDPMessage(data); + } //send out to VR Loopback SendToLoopBackMessageVR(data); diff --git a/SourceCode/AgIO/Source/Properties/Settings.Designer.cs b/SourceCode/AgIO/Source/Properties/Settings.Designer.cs index 0ecb58f50..0dfcbe1ec 100644 --- a/SourceCode/AgIO/Source/Properties/Settings.Designer.cs +++ b/SourceCode/AgIO/Source/Properties/Settings.Designer.cs @@ -541,14 +541,25 @@ public bool setRadio_isOn { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public System.Collections.Generic.List setRadio_Channels { + public global::System.Collections.Generic.List setRadio_Channels { get { - return ((System.Collections.Generic.List)(this["setRadio_Channels"])); + return ((global::System.Collections.Generic.List)(this["setRadio_Channels"])); } set { this["setRadio_Channels"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool setUDP_isSendNMEAToUDP { + get { + return ((bool)(this["setUDP_isSendNMEAToUDP"])); + } + set { + this["setUDP_isSendNMEAToUDP"] = value; + } + } } } diff --git a/SourceCode/AgIO/Source/Properties/Settings.settings b/SourceCode/AgIO/Source/Properties/Settings.settings index fb293b018..11054a966 100644 --- a/SourceCode/AgIO/Source/Properties/Settings.settings +++ b/SourceCode/AgIO/Source/Properties/Settings.settings @@ -131,8 +131,11 @@ False - + + + False + \ No newline at end of file diff --git a/SourceCode/GPS/AgOpenGPS.csproj b/SourceCode/GPS/AgOpenGPS.csproj index a464aacb7..ff2da7da8 100644 --- a/SourceCode/GPS/AgOpenGPS.csproj +++ b/SourceCode/GPS/AgOpenGPS.csproj @@ -768,6 +768,7 @@ + diff --git a/SourceCode/GPS/Forms/Controls.Designer.cs b/SourceCode/GPS/Forms/Controls.Designer.cs index d947f239a..d78e599a9 100644 --- a/SourceCode/GPS/Forms/Controls.Designer.cs +++ b/SourceCode/GPS/Forms/Controls.Designer.cs @@ -194,7 +194,11 @@ private void btnCycleLines_Click(object sender, EventArgs e) { if (isTT) { - MessageBox.Show(gStr.h_btnCycleLines, gStr.gsHelp); + if (!ct.isContourBtnOn) + MessageBox.Show(gStr.h_btnCycleLines, gStr.gsHelp); + else + MessageBox.Show(gStr.h_btnLockToContour, gStr.gsHelp); + ResetHelpBtn(); return; } diff --git a/SourceCode/GPS/Forms/Form_Help.Designer.cs b/SourceCode/GPS/Forms/Form_Help.Designer.cs index 9de13a393..0890c373a 100644 --- a/SourceCode/GPS/Forms/Form_Help.Designer.cs +++ b/SourceCode/GPS/Forms/Form_Help.Designer.cs @@ -34,10 +34,12 @@ private void InitializeComponent() this.linkLabelCombineForum = new System.Windows.Forms.LinkLabel(); this.lblVersion = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.btnManual = new System.Windows.Forms.Button(); this.btnVideo = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button(); - this.label4 = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // // label6 @@ -104,6 +106,25 @@ private void InitializeComponent() this.label5.TabIndex = 556; this.label5.Text = "What is AgOpenGPS"; // + // label4 + // + this.label4.AutoSize = true; + this.label4.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label4.Location = new System.Drawing.Point(28, 109); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(136, 19); + this.label4.TabIndex = 34; + this.label4.Text = "PDF Manual For"; + // + // pictureBox1 + // + this.pictureBox1.Image = global::AgOpenGPS.Properties.Resources.AgOpenYouTubeChannel; + this.pictureBox1.Location = new System.Drawing.Point(484, 100); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(184, 183); + this.pictureBox1.TabIndex = 557; + this.pictureBox1.TabStop = false; + // // btnManual // this.btnManual.BackColor = System.Drawing.Color.Transparent; @@ -145,30 +166,21 @@ private void InitializeComponent() this.button1.FlatAppearance.BorderSize = 0; this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button1.Image = global::AgOpenGPS.Properties.Resources.OK64; - this.button1.Location = new System.Drawing.Point(602, 281); + this.button1.Location = new System.Drawing.Point(578, 327); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(110, 70); this.button1.TabIndex = 10; this.button1.UseVisualStyleBackColor = true; // - // label4 - // - this.label4.AutoSize = true; - this.label4.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label4.Location = new System.Drawing.Point(28, 109); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(136, 19); - this.label4.TabIndex = 34; - this.label4.Text = "PDF Manual For"; - // // Form_Help // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScroll = true; this.BackColor = System.Drawing.SystemColors.Control; - this.ClientSize = new System.Drawing.Size(713, 356); + this.ClientSize = new System.Drawing.Size(689, 402); this.ControlBox = false; + this.Controls.Add(this.pictureBox1); this.Controls.Add(this.label5); this.Controls.Add(this.btnManual); this.Controls.Add(this.btnVideo); @@ -185,6 +197,7 @@ private void InitializeComponent() this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "AgOpenGPS Help"; this.Load += new System.EventHandler(this.Form_About_Load); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -201,5 +214,6 @@ private void InitializeComponent() private System.Windows.Forms.Button btnManual; private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label4; + private System.Windows.Forms.PictureBox pictureBox1; } } \ No newline at end of file diff --git a/SourceCode/GPS/Forms/Settings/ConfigHelp.Designer.cs b/SourceCode/GPS/Forms/Settings/ConfigHelp.Designer.cs index cefb1aa14..060fc012f 100644 --- a/SourceCode/GPS/Forms/Settings/ConfigHelp.Designer.cs +++ b/SourceCode/GPS/Forms/Settings/ConfigHelp.Designer.cs @@ -193,7 +193,7 @@ private void nudOffset_HelpRequested(object sender, HelpEventArgs hlpevent) MessageBox.Show(gStr.hc_nudOffset, gStr.gsHelp); } - private void nudOverlap_ValueChanged(object sender, EventArgs e) + private void nudOverlap_HelpRequested(object sender, HelpEventArgs hlpevent) { MessageBox.Show(gStr.hc_nudOverlap, gStr.gsHelp); } diff --git a/SourceCode/GPS/Forms/Settings/FormConfig.Designer.cs b/SourceCode/GPS/Forms/Settings/FormConfig.Designer.cs index dbfc2f994..25af1061a 100644 --- a/SourceCode/GPS/Forms/Settings/FormConfig.Designer.cs +++ b/SourceCode/GPS/Forms/Settings/FormConfig.Designer.cs @@ -4400,8 +4400,8 @@ private void InitializeComponent() 0, 0, 0}); - this.nudOverlap.ValueChanged += new System.EventHandler(this.nudOverlap_ValueChanged); this.nudOverlap.Click += new System.EventHandler(this.nudOverlap_Click); + this.nudOverlap.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.nudOverlap_HelpRequested); // // pictureBox3 // diff --git a/SourceCode/GPS/Properties/Resources.Designer.cs b/SourceCode/GPS/Properties/Resources.Designer.cs index 0d0d04396..3d5e1570d 100644 --- a/SourceCode/GPS/Properties/Resources.Designer.cs +++ b/SourceCode/GPS/Properties/Resources.Designer.cs @@ -160,6 +160,16 @@ internal static System.Drawing.Bitmap AgIO { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap AgOpenYouTubeChannel { + get { + object obj = ResourceManager.GetObject("AgOpenYouTubeChannel", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream. /// diff --git a/SourceCode/GPS/Properties/Resources.resx b/SourceCode/GPS/Properties/Resources.resx index c65ae924c..433fa9860 100644 --- a/SourceCode/GPS/Properties/Resources.resx +++ b/SourceCode/GPS/Properties/Resources.resx @@ -136,15 +136,12 @@ ..\btnImages\first.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\btnImages\BoundaryCurveLine.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\btnImages\FileNewAndGo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\btnImages\Config\ConS_VehicleLines.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\btnImages\SemiCircle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\btnImages\VehFileSave.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -178,6 +175,9 @@ ..\btnImages\ArrowLeft.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\btnImages\ABLineCycle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\btnImages\Config\ConS_Respnse.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -187,9 +187,6 @@ ..\btnImages\FileOpen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\btnImages\RadiusWheelBase4WD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\SteerOff.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -244,12 +241,6 @@ ..\btnImages\vehiclePage4WD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\btnImages\VehFileSaveAs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\btnImages\ToolChkFront.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\btnImages\ManualOff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -259,9 +250,6 @@ ..\btnImages\Config\Tractor\z_TractorValtra.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\btnImages\ABLineOff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\btnImages\Config\Con_ImplementMenu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -325,9 +313,6 @@ ..\btnImages\Config\ConD_Speedometer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\btnImages\ComPorts.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\btnImages\PointDelete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -400,9 +385,6 @@ ..\btnImages\FilePrevious.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\btnImages\Config\4WD\z_4WDRearChallenger.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\btnImages\SectionsExample.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -448,8 +430,8 @@ ..\btnImages\skull.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\btnImages\Cancel64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\btnImages\AutoSteerOff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\btnImages\FileSaveAs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -481,8 +463,8 @@ ..\btnImages\WindowMaximize.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\btnImages\Color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\btnImages\VehFileSaveAs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\btnImages\UpArrow64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -517,12 +499,15 @@ ..\btnImages\Images\z_Lift.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\btnImages\BoundaryDeleteAll.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\btnImages\Config\ConS_VehicleConfig.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\btnImages\Camera3D64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\btnImages\FlagYel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\btnImages\FieldClose.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -607,9 +592,6 @@ ..\btnImages\SectionWidth.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\btnImages\Config\ConD_AutoDayNight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\btnImages\Images\z_Harvester.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -676,8 +658,8 @@ ..\btnImages\KeyHole.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\btnImages\Camera3D64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\btnImages\SemiCircle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\btnImages\ABLineEdit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -712,6 +694,9 @@ ..\btnImages\GoogleEarth.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\btnImages\JobNameTime.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\HydDown.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -757,8 +742,8 @@ ..\btnImages\AutoStop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\btnImages\Config\Brand\JohnDeere.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\btnImages\ABLineOff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\btnImages\Images\z_SteerDot.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -802,6 +787,9 @@ ..\btnImages\SnapLeft.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\btnImages\Config\ConF_SteerSound.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\btnImages\Images\z_SpeedoNeedle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -814,8 +802,8 @@ ..\btnImages\Config\ConS_SourcesRoll.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\btnImages\WindowMinimize.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\btnImages\BoundaryCurveLine.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\btnImages\FlagGrn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -832,6 +820,9 @@ ..\btnImages\ToolAcceptChange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\btnImages\Help.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\btnImages\Config\Tractor\z_TractorNH.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -883,9 +874,18 @@ ..\btnImages\HeadlandDeletePoints.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\btnImages\Images\z_4WDRear.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\btnImages\Config\Tractor\z_TractorAoG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\btnImages\OpManual.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\btnImages\Arduino.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\btnImages\Config\Con_VehicleMenu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -943,8 +943,8 @@ ..\btnImages\MakeBoundaryContour.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\btnImages\FileNewAndGo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\btnImages\Config\4WD\z_4WDRearChallenger.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\btnImages\SectionMasterOff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -961,12 +961,18 @@ ..\btnImages\ColorBackGnd.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\btnImages\AutoSteerOff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\btnImages\Config\ConD_AutoDayNight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\btnImages\ContourOn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\btnImages\Config\4WD\z_4WDRearCase.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\btnImages\Config\Brand\JohnDeere.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\btnImages\JobNameCalendar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -988,18 +994,15 @@ ..\btnImages\Config\Harvester\z_HarvesterAoG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\btnImages\ABLineCycle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\btnImages\Color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\btnImages\Config\ConS_ImplementSection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\btnImages\Steer\Sf_Stanley.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\btnImages\AutoSteerOn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\btnImages\VideoLink.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\btnImages\OK64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1051,23 +1054,23 @@ ..\btnImages\Extents.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\btnImages\SnapRight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\btnImages\vehiclePageTractor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\btnImages\Config\ConS_ModulesMachine.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\btnImages\FlagYel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\btnImages\ToolChkFront.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\btnImages\WindowMinimize.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\btnImages\Sort.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\btnImages\Arduino.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\btnImages\Cancel64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\btnImages\Images\z_LateralManual.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1084,17 +1087,17 @@ ..\btnImages\Config\Tractor\z_TractorSteyr.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\btnImages\ContourOn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\btnImages\ComPorts.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\btnImages\Config\Harvester\z_HarvesterNH.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\btnImages\Steer\Sf_Stanley.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\btnImages\BoundaryDeleteAll.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\btnImages\Config\ConF_SteerSound.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\btnImages\VideoLink.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\btnImages\Config\Tractor\z_TractorDeutz.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1108,8 +1111,8 @@ ..\btnImages\ABTramLine.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\btnImages\JobNameTime.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\btnImages\Config\ConS_ImplementSection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\btnImages\TiltUp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1117,16 +1120,16 @@ ..\btnImages\Images\z_Speedo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\btnImages\Images\z_4WDRear.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\btnImages\RadiusWheelBase4WD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\btnImages\Custom.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\btnImages\Help.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\btnImages\SnapRight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\btnImages\OpManual.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\btnImages\QR\AgOpenYouTubeChannel.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/SourceCode/GPS/btnImages/QR/AgOpenYouTubeChannel.jpg b/SourceCode/GPS/btnImages/QR/AgOpenYouTubeChannel.jpg new file mode 100644 index 000000000..318a9c313 Binary files /dev/null and b/SourceCode/GPS/btnImages/QR/AgOpenYouTubeChannel.jpg differ diff --git a/SourceCode/GPS/gStr.Designer.cs b/SourceCode/GPS/gStr.Designer.cs index e62c524e1..d90b6d567 100644 --- a/SourceCode/GPS/gStr.Designer.cs +++ b/SourceCode/GPS/gStr.Designer.cs @@ -1382,6 +1382,17 @@ public static string h_btnHydLift { } } + /// + /// Looks up a localized string similar to Lock to Line + /// + ///Locks to current contour line till you get to the end of it. Ignores all other lines.. + /// + public static string h_btnLockToContour { + get { + return ResourceManager.GetString("h_btnLockToContour", resourceCulture); + } + } + /// /// Looks up a localized string similar to Manual Section Control Button /// diff --git a/SourceCode/GPS/gStr.resx b/SourceCode/GPS/gStr.resx index cbb812bdf..06f697115 100644 --- a/SourceCode/GPS/gStr.resx +++ b/SourceCode/GPS/gStr.resx @@ -580,6 +580,11 @@ Once a headland is created you can turn the headland on and off with this button Hydraulic Lift On Off Button Once a headland is active, and headland control is on, you can also turn on tool lift control to raise the tool when entering the headland and lower it again just before leaving it to the work area. This button is only visible with a headland created and on. + + + Lock to Line + +Locks to current contour line till you get to the end of it. Ignores all other lines. Manual Section Control Button @@ -1483,16 +1488,16 @@ Touch 2 points on the boundary to make a line. Touch Create Curve or Create AB L Edit Line Touch to edit the line to rename the default. - - - Save and Exit - -Changes are saved with the field and exit the form. Save For Now Line changes not saved with the field, they are lost when loading the field again. But the changes are in effect + + + Save and Exit + +Changes are saved with the field and exit the form. Delete Points on Line