Merge pull request #549 from AgOpenGPS-Official/SixSixBugFix2

Six six bug fix2
AgOpenGPS-Official · Jan 7, 2025 · c2aa9d7 · c2aa9d7
2 parents b3cecc7 + 7331fd1
commit c2aa9d7
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 67 deletions.
diff --git a/SourceCode/GPS/AgOpenGPS.csproj b/SourceCode/GPS/AgOpenGPS.csproj
@@ -927,6 +927,7 @@
     <EmbeddedResource Include="Culture\gStr.zh-CHS.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>gStr.zh-CHS.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>

diff --git a/SourceCode/GPS/Forms/FormGPS.cs b/SourceCode/GPS/Forms/FormGPS.cs
@@ -583,7 +583,14 @@ private void FormGPS_FormClosing(object sender, FormClosingEventArgs e)
 
             SaveFormGPSWindowSettings();
 
-            Log.EventWriter("Missed Sentence Counter Total: " + missedSentenceCount.ToString());
+            double minutesSinceStart = ((DateTime.Now - Process.GetCurrentProcess().StartTime).TotalSeconds)/60;
+            if (minutesSinceStart < 1)
+            {
+                minutesSinceStart = 1;
+            }
+
+            Log.EventWriter("Missed Sentence Counter Total: " + missedSentenceCount.ToString()
+                + "   Missed Per Minute: " + ((double)missedSentenceCount/minutesSinceStart).ToString("N4"));
 
             Log.EventWriter("Program Exit: " + DateTime.Now.ToString("f", CultureInfo.CreateSpecificCulture(RegistrySettings.culture)) + "\r");
 

diff --git a/SourceCode/GPS/Forms/GUI.Designer.cs b/SourceCode/GPS/Forms/GUI.Designer.cs
diff --git a/SourceCode/GPS/Forms/Settings/FormConfig.Designer.cs b/SourceCode/GPS/Forms/Settings/FormConfig.Designer.cs
diff --git a/SourceCode/GPS/Properties/Resources.Designer.cs b/SourceCode/GPS/Properties/Resources.Designer.cs
diff --git a/SourceCode/GPS/Properties/Resources.resx b/SourceCode/GPS/Properties/Resources.resx
@@ -151,9 +151,6 @@
   <data name="Play" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\btnImages\Play.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ConD_LogNMEA" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\btnImages\Config\ConD_LogNMEA.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="BoundaryCenter" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\btnImages\BoundaryCenter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>

diff --git a/SourceCode/GPS/btnImages/Config/ConD_LogNMEA.png b/SourceCode/GPS/btnImages/Config/ConD_LogNMEA.png