Merge branch 'release/6.6' into develop

AgOpenGPS-Official · Jan 6, 2025 · f729ecb · f729ecb
2 parents 860eb9f + 42ce65a
commit f729ecb
Show file tree

Hide file tree

Showing 47 changed files with 468 additions and 3,670 deletions.
diff --git a/SourceCode/AgIO/Source/Classes/CSettings.cs b/SourceCode/AgIO/Source/Classes/CSettings.cs
@@ -66,7 +66,7 @@ public static class RegistrySettings
         public static string culture = "en";
         public static string profileDirectory =
             Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "AgOpenGPS", "AgIO");
-        public static string LogsDirectory =
+        public static string logsDirectory =
             Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "AgOpenGPS", "Logs");
         public static string profileName = "Default Profile";
 
@@ -77,9 +77,9 @@ public static void Load()
                 try
                 {
                     //create Logs directory if not exist
-                    if (!string.IsNullOrEmpty(LogsDirectory) && !Directory.Exists(LogsDirectory))
+                    if (!string.IsNullOrEmpty(logsDirectory) && !Directory.Exists(logsDirectory))
                     {
-                        Directory.CreateDirectory(LogsDirectory);
+                        Directory.CreateDirectory(logsDirectory);
                         Log.EventWriter("Logs Dir Created\r");
                     }
                 }
@@ -89,7 +89,7 @@ public static void Load()
                 }
 
                 //keep below 500 kb
-                Log.CheckLogSize(Path.Combine(LogsDirectory, "AgIO_Events_Log.txt"), 500000);
+                Log.CheckLogSize(Path.Combine(logsDirectory, "AgIO_Events_Log.txt"), 500000);
 
                 try
                 {
@@ -212,10 +212,13 @@ public static void Save()
 
         public static void Reset()
         {
+            Registry.CurrentUser.DeleteSubKeyTree(@"SOFTWARE\AgIO");
+
             RegistryKey key = Registry.CurrentUser.CreateSubKey(@"SOFTWARE\AgIO");
             try
             {
                 key.SetValue("ProfileName", "Default Profile");
+                key.SetValue("Language", "en");
                 Log.EventWriter("Registry -> Resetting Registry keys");
             }
             catch (Exception ex)

diff --git a/SourceCode/AgIO/Source/Forms/Controls.Designer.cs b/SourceCode/AgIO/Source/Forms/Controls.Designer.cs
diff --git a/SourceCode/AgIO/Source/Forms/FormLoop.cs b/SourceCode/AgIO/Source/Forms/FormLoop.cs
@@ -340,7 +340,7 @@ private void FormLoop_FormClosing(object sender, FormClosingEventArgs e)
 
         public void FileSaveSystemEvents()
         {
-            using (StreamWriter writer = new StreamWriter(Path.Combine(RegistrySettings.LogsDirectory, "AgIO_Events_Log.txt"), true))
+            using (StreamWriter writer = new StreamWriter(Path.Combine(RegistrySettings.logsDirectory, "AgIO_Events_Log.txt"), true))
             {
                 writer.Write(Log.sbEvent);
                 Log.sbEvent.Clear();

diff --git a/SourceCode/GPS/AgOpenGPS.csproj b/SourceCode/GPS/AgOpenGPS.csproj
@@ -135,7 +135,6 @@
     <Compile Include="Classes\CGuidance.cs" />
     <Compile Include="Classes\CHeadLine.cs" />
     <Compile Include="Classes\CLog.cs" />
-    <Compile Include="Classes\CNozzle.cs" />
     <Compile Include="Classes\CPolygon.cs" />
     <Compile Include="Classes\CRecordedPath.cs" />
     <Compile Include="Classes\CPatches.cs" />
@@ -471,18 +470,6 @@
     <Compile Include="Forms\Field\FormSaveOrNot.Designer.cs">
       <DependentUpon>FormSaveOrNot.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\Settings\FormNozConfig.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\Settings\FormNozConfig.Designer.cs">
-      <DependentUpon>FormNozConfig.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Forms\Settings\FormNozSettings.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Forms\Settings\FormNozSettings.Designer.cs">
-      <DependentUpon>FormNozSettings.cs</DependentUpon>
-    </Compile>
     <Compile Include="Forms\Settings\FormSimCoords.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -820,12 +807,6 @@
     <EmbeddedResource Include="Forms\Field\FormSaveOrNot.resx">
       <DependentUpon>FormSaveOrNot.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\Settings\FormNozConfig.resx">
-      <DependentUpon>FormNozConfig.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\Settings\FormNozSettings.resx">
-      <DependentUpon>FormNozSettings.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Forms\Settings\FormSimCoords.resx">
       <DependentUpon>FormSimCoords.cs</DependentUpon>
     </EmbeddedResource>

diff --git a/SourceCode/GPS/Classes/CDubins.cs b/SourceCode/GPS/Classes/CDubins.cs
@@ -19,7 +19,7 @@ public class CDubins
         public static readonly double driveDistance = 0.05;
 
         //The radius the car can turn 360 degrees with
-        public static double turningRadius = Properties.Settings.Default.setVehicle_minTurningRadius;
+        public static double turningRadius = Properties.Settings.Default.set_youTurnRadius;
 
         //Position, Heading is in radians
         private vec2 startPos, goalPos;

diff --git a/SourceCode/GPS/Classes/CNozzle.cs b/SourceCode/GPS/Classes/CNozzle.cs