v5.7.2

Author: Urepom

AOG 5.7.1_setup.iss renamed to AOG 5.7.2_setup.iss

@@ -8,7 +8,7 @@
 
 [Setup]
 AppName=AgOpenGPS
-AppVersion=5.7.1
+AppVersion=5.7.2
 AppPublisher=Urepom - Maxime EMPROU
 ;SignTool=Urepom - Maxime EMPROU 
 AppPublisherURL=ttt
@@ -19,7 +19,7 @@ UninstallDisplayIcon={app}\MyProg.exe
 Compression=lzma2
 SolidCompression=yes
 OutputDir=C:\Users\maxim\Documents\GitHub\AgOpenGPS_Urepom_Design
-OutputBaseFilename=AgOpenGPS 5.7.1 Urepom_Setup
+OutputBaseFilename=AgOpenGPS 5.7.2 Urepom_Setup
 DisableDirPage=no
 DisableProgramGroupPage=no
 ; "ArchitecturesAllowed=x64" specifies that Setup cannot run on

AgOpenGPS_v5/AgIO.exe

@@ -685,6 +685,9 @@
             <setting name="UP_SetTimerRincFerti" serializeAs="String">
                 <value>30</value>
             </setting>
+            <setting name="setTool_isSectionOffWhenOut" serializeAs="String">
+                <value>True</value>
+            </setting>
         </AgOpenGPS.Properties.Settings>
   </userSettings>
 </configuration>

AgOpenGPS_v5/AgOpenGPS.exe

@@ -61,6 +61,7 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
+    <Reference Include="System.Data" />
     <Reference Include="System.Management" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Deployment" />
@@ -91,6 +92,12 @@
     <Compile Include="Forms\FormCommSetGPS.Designer.cs">
       <DependentUpon>FormCommSetGPS.cs</DependentUpon>
     </Compile>
+    <Compile Include="Forms\FormPGN.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\FormPGN.Designer.cs">
+      <DependentUpon>FormPGN.cs</DependentUpon>
+    </Compile>
     <Compile Include="Forms\FormSerialMonitor.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -139,6 +146,12 @@
     <Compile Include="Forms\FormEthernet.designer.cs">
       <DependentUpon>FormEthernet.cs</DependentUpon>
     </Compile>
+    <Compile Include="Forms\FormUDPMonitor .cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\FormUDPMonitor .Designer.cs">
+      <DependentUpon>FormUDPMonitor .cs</DependentUpon>
+    </Compile>
     <Compile Include="Forms\FormYes.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -322,6 +335,8 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="AgIO_ico.ico" />
+    <None Include="btnImages\SerialMonitor.png" />
+    <None Include="btnImages\EthernetSetup.png" />
     <None Include="btnImages\B_Ferti.png" />
     <None Include="btnImages\Help.png" />
     <None Include="btnImages\ConSt_Mandatory.png" />

AgOpenGPS_v5/AgOpenGPS.exe.config

@@ -36,6 +36,8 @@ public partial class FormLoop : Form
         //Stringbuilder
         public StringBuilder logNMEASentence = new StringBuilder();
         public StringBuilder logMonitorSentence = new StringBuilder();
+        public StringBuilder logUDPSentence = new StringBuilder();
+        public bool isLogNMEA, isLogMonitorOn, isUDPMonitorOn, isGPSLogOn, isNTRIPLogOn;
 
         private StringBuilder sbRTCM = new StringBuilder();
 
@@ -50,7 +52,7 @@ public partial class FormLoop : Form
 
         public string lastSentence;
 
-        public bool isPluginUsed;
+        public bool isPluginUsed, isNTRIPToggle;
 
         //usually 256 - send ntrip to serial in chunks
         public int packetSizeNTRIP;
@@ -60,7 +62,6 @@ public partial class FormLoop : Form
 
         //is the fly out displayed
         public bool isViewAdvanced = false;
-        public bool isLogNMEA, isLogMonitorOn;
 
         //used to hide the window and not update text fields and most counters
         public bool isAppInFocus = true, isLostFocus;
@@ -344,10 +345,6 @@ private void oneSecondLoopTimer_Tick(object sender, EventArgs e)
 
             secondsSinceStart = (DateTime.Now - Process.GetCurrentProcess().StartTime).TotalSeconds;
 
-            //Hello Alarm logic
-            DoHelloAlarmLogic();
-
-            DoTraffic();
 
             if (focusSkipCounter != 0)
             {
@@ -358,9 +355,6 @@ private void oneSecondLoopTimer_Tick(object sender, EventArgs e)
             //do all the NTRIP routines
             DoNTRIPSecondRoutine();
 
-            //send a hello to modules
-            SendUDPMessage(helloFromAgIO, epModule);
-            //helloFromAgIO[7] = 0;
 
             #region Sleep
 
@@ -424,10 +418,32 @@ private void oneSecondLoopTimer_Tick(object sender, EventArgs e)
                 }
                 btnResetTimer.Text = ((int)(180 - (secondsSinceStart - threeMinuteTimer))).ToString();
             }
+
+            if (focusSkipCounter != 0)
+            {
+                if (ntripCounter > 30)
+                {
+                    isNTRIPToggle = !isNTRIPToggle;
+                    if (isNTRIPToggle) lblNTRIPBytes.BackColor = Color.CornflowerBlue;
+                    else lblNTRIPBytes.BackColor = Color.DarkOrange;
+                }
+                else
+                {
+                    lblNTRIPBytes.BackColor = Color.Transparent;
+                }
+            }
         }
 
         private void TwoSecondLoop()
         {
+            //Hello Alarm logic
+            DoHelloAlarmLogic();
+
+            DoTraffic();
+
+            //send a hello to modules
+            SendUDPMessage(helloFromAgIO, epModule);
+
             if (isLogNMEA)
             {
                 using (StreamWriter writer = new StreamWriter("zAgIO_log.txt", true))
@@ -719,7 +735,7 @@ private void DoTraffic()
 
             if (focusSkipCounter != 0)
             {
-                lblFromGPS.Text = traffic.cntrGPSOut == 0 ? "---" : (traffic.cntrGPSOut).ToString();
+                lblFromGPS.Text = traffic.cntrGPSOut == 0 ? "---" : ((traffic.cntrGPSOut >> 1)).ToString();
 
                 //reset all counters
                 traffic.cntrGPSOut = 0;
@@ -885,6 +901,11 @@ private void btnGPSData_Click(object sender, EventArgs e)
             form.Show(this);
         }
 
+        private void lblModFertiComm_Click(object sender, EventArgs e)
+        {
+
+        }
+
         private void toolStripEthernet_Click(object sender, EventArgs e)
         {
             SettingsEthernet();

AgOpenGPS_v5/AgOpenGPS.pdb

@@ -127,7 +127,7 @@
     <value>243, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="cboxIsFertiModule.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="cboxIsIMUModule.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
         vAAADrwBlbxySQAABgdJREFUeF7tmflTE2cYx+0903+jM/3JVlprtUU8iiCXlPHiUMdWBVEMCAIiSLnv
@@ -159,7 +159,7 @@
         z1joA8AAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="cboxIsIMUModule.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="cboxIsMachineModule.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
         vAAADrwBlbxySQAABgdJREFUeF7tmflTE2cYx+0903+jM/3JVlprtUU8iiCXlPHiUMdWBVEMCAIiSLnv
@@ -191,7 +191,7 @@
         z1joA8AAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="cboxIsMachineModule.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="cboxIsFertiModule.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
         vAAADrwBlbxySQAABgdJREFUeF7tmflTE2cYx+0903+jM/3JVlprtUU8iiCXlPHiUMdWBVEMCAIiSLnv
@@ -224,7 +224,7 @@
 </value>
   </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>47</value>
+    <value>25</value>
   </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>