Merge branch 'release/6.6' into develop

AgOpenGPS-Official · Jan 6, 2025 · 72b5ff1 · 72b5ff1
2 parents 02c1865 + 059facc
commit 72b5ff1
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 88 deletions.
diff --git a/SourceCode/GPS/Classes/CSettings.cs b/SourceCode/GPS/Classes/CSettings.cs
@@ -394,7 +394,7 @@ public static void Save()
                 key.SetValue("Language", culture);
                 key.SetValue("WorkingDirectory", workingDirectory);
 
-                Log.EventWriter(vehicleFileName + " Saved to registry key");
+                //Log.EventWriter(vehicleFileName + " Saved to registry key");
             }
             catch (Exception ex)
             {

diff --git a/SourceCode/GPS/Forms/Controls.Designer.cs b/SourceCode/GPS/Forms/Controls.Designer.cs
diff --git a/SourceCode/GPS/Forms/GUI.Designer.cs b/SourceCode/GPS/Forms/GUI.Designer.cs
diff --git a/SourceCode/GPS/Forms/Settings/ConfigVehicle.Designer.cs b/SourceCode/GPS/Forms/Settings/ConfigVehicle.Designer.cs
diff --git a/SourceCode/GPS/Forms/Settings/FormAllSettings.cs b/SourceCode/GPS/Forms/Settings/FormAllSettings.cs
@@ -66,7 +66,7 @@ private void LoadLabels()
             label72.Text = Properties.Settings.Default.setF_isWorkSwitchEnabled.ToString();
             label74.Text = Properties.Settings.Default.setF_isWorkSwitchManualSections.ToString();
             label76.Text = Properties.Settings.Default.setF_minHeadingStepDistance.ToString();
-            label78.Text = Properties.Settings.Default.setF_workingDirectory.ToString();
+            label78.Text = RegistrySettings.culture.ToString();
             label80.Text = Properties.Settings.Default.setGPS_ageAlarm.ToString();
             label82.Text = Properties.Settings.Default.setGPS_dualHeadingOffset.ToString();
             label84.Text = Properties.Settings.Default.setGPS_dualReverseDetectionDistance.ToString();
@@ -106,7 +106,7 @@ private void LoadLabels()
             label154.Text = Properties.Settings.Default.setVehicle_toolOffset.ToString();
             label156.Text = Properties.Settings.Default.setVehicle_toolOverlap.ToString();
             label158.Text = Properties.Settings.Default.setVehicle_toolWidth.ToString();
-            label160.Text = Properties.Settings.Default.setVehicle_vehicleName;
+            label160.Text = RegistrySettings.vehicleFileName;
             label162.Text = Properties.Settings.Default.setVehicle_vehicleType.ToString();
             label164.Text = Properties.Settings.Default.setAS_isSteerInReverse.ToString();
 

diff --git a/SourceCode/GPS/Forms/Settings/FormConfig.cs b/SourceCode/GPS/Forms/Settings/FormConfig.cs
@@ -228,7 +228,7 @@ private void btnOK_Click(object sender, EventArgs e)
         private void tabSummary_Enter(object sender, EventArgs e)
         {
             SectionFeetInchesTotalWidthLabelUpdate();
-            lblSummaryVehicleName.Text = Properties.Settings.Default.setVehicle_vehicleName;
+            lblSummaryVehicleName.Text = RegistrySettings.vehicleFileName;
             UpdateSummary();
         }
 

diff --git a/SourceCode/GPS/Program.cs b/SourceCode/GPS/Program.cs
@@ -24,11 +24,6 @@ private static void Main()
 
             RegistrySettings.Load();
 
-            Properties.Settings.Default.setF_culture = RegistrySettings.culture;
-            Properties.Settings.Default.setF_workingDirectory = RegistrySettings.workingDirectory;
-            Properties.Settings.Default.setVehicle_vehicleName = RegistrySettings.vehicleFileName;
-            Properties.Settings.Default.Save();
-
             if (Mutex.WaitOne(TimeSpan.Zero, true))
             {
                 Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo(RegistrySettings.culture);

diff --git a/SourceCode/GPS/Properties/Settings.Designer.cs b/SourceCode/GPS/Properties/Settings.Designer.cs
diff --git a/SourceCode/GPS/Properties/Settings.settings b/SourceCode/GPS/Properties/Settings.settings
@@ -74,12 +74,6 @@
     <Setting Name="setMenu_isSkyOn" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-    <Setting Name="setF_culture" Type="System.String" Scope="User">
-      <Value Profile="(Default)">en</Value>
-    </Setting>
-    <Setting Name="setF_workingDirectory" Type="System.String" Scope="User">
-      <Value Profile="(Default)">Default</Value>
-    </Setting>
     <Setting Name="setDisplay_lightbarCmPerPixel" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">5</Value>
     </Setting>
@@ -449,9 +443,6 @@
     <Setting Name="setVehicle_isSteerAxleAhead" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
-    <Setting Name="setVehicle_vehicleName" Type="System.String" Scope="User">
-      <Value Profile="(Default)">Default Vehicle</Value>
-    </Setting>
     <Setting Name="setVehicle_slowSpeedCutoff" Type="System.Double" Scope="User">
       <Value Profile="(Default)">0.5</Value>
     </Setting>

diff --git a/SourceCode/GPS/app.config b/SourceCode/GPS/app.config
@@ -79,12 +79,6 @@
             <setting name="setMenu_isSkyOn" serializeAs="String">
                 <value>True</value>
             </setting>
-            <setting name="setF_culture" serializeAs="String">
-                <value>en</value>
-            </setting>
-            <setting name="setF_workingDirectory" serializeAs="String">
-                <value>Default</value>
-            </setting>
             <setting name="setDisplay_lightbarCmPerPixel" serializeAs="String">
                 <value>5</value>
             </setting>
@@ -316,6 +310,9 @@
             <setting name="setDisplay_customSectionColors" serializeAs="String">
                 <value>-62208,-12299010,-16190712,-1505559,-3621034,-16712458,-7330570,-1546731,-24406,-3289866,-2756674,-538377,-134768,-4457734,-1848839,-530985</value>
             </setting>
+            <setting name="setBrand_TBrand" serializeAs="String">
+                <value>AGOpenGPS</value>
+            </setting>
             <setting name="setHeadland_isSectionControlled" serializeAs="String">
                 <value>True</value>
             </setting>
@@ -448,9 +445,6 @@
             <setting name="setVehicle_isSteerAxleAhead" serializeAs="String">
                 <value>True</value>
             </setting>
-            <setting name="setVehicle_vehicleName" serializeAs="String">
-                <value>Default Vehicle</value>
-            </setting>
             <setting name="setVehicle_slowSpeedCutoff" serializeAs="String">
                 <value>0.5</value>
             </setting>
@@ -643,6 +637,12 @@
             <setting name="setAS_minSteerSpeed" serializeAs="String">
                 <value>0</value>
             </setting>
+            <setting name="setBrand_HBrand" serializeAs="String">
+                <value>AgOpenGPS</value>
+            </setting>
+            <setting name="setBrand_WDBrand" serializeAs="String">
+                <value>AgOpenGPS</value>
+            </setting>
             <setting name="setIMU_fusionWeight2" serializeAs="String">
                 <value>0.06</value>
             </setting>