Merge pull request #289 from farmerbriantee/FinalUpdates

Final updates

.gitignore

@@ -363,3 +363,4 @@ Program/
 *.xml
 /Support/Basic Panda GPS/Firmware/Autosteer_gps_teensy_v5_5/__vm/.Autosteer_gps_teensy_v5_5.vsarduino.h
 Support/TeensyModules/Firmware/Autosteer_gps_teensy_v5_5/__vm/.Autosteer_gps_teensy_v5_5.vsarduino.h
+__vm/

SourceCode/AgIO/Source/Forms/FormUDP.cs

@@ -123,7 +123,6 @@ private void timer1_Tick(object sender, EventArgs e)
                 ScanNetwork();
                 counter++;
             }
-
             else
             {
                 lblConnectedModules.Text = mf.scanReturn;
@@ -137,7 +136,7 @@ private void btnSendSubnet_Click(object sender, EventArgs e)
                 "Change Modules and AgIO Subnet To: \r\n\r\n" +
                 ipToSend[0].ToString() + "." +
                 ipToSend[1].ToString() + "." +
-                ipToSend[2].ToString() + "??????? ",
+                ipToSend[2].ToString() + " ?",
                 "Are you sure ?",
                 MessageBoxButtons.YesNo,
                 MessageBoxIcon.Question,
@@ -185,16 +184,16 @@ private void nudThirdIP_Click(object sender, EventArgs e)
             ipToSend[2] = (byte)nudThirdIP.Value;
         }
 
-        private void btnScanNetwork_Click(object sender, EventArgs e)
-        {
-            ScanNetwork();
-        }
-
         private void ScanNetwork()
         {
             mf.scanReturn = "";
             byte[] scanModules = { 0x80, 0x81, 0x7F, 202, 3, 202, 202, 5, 0x47 };
             mf.SendUDPMessage(scanModules, mf.epModuleSet);
         }
+
+        private void btnRescan_Click(object sender, EventArgs e)
+        {
+            ScanNetwork();
+        }
     }
 }

SourceCode/AgIO/Source/Properties/AssemblyInfo.cs

@@ -32,6 +32,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.6.0")]
-[assembly: AssemblyFileVersion("5.6.0")]
+[assembly: AssemblyVersion("5.7.0")]
+[assembly: AssemblyFileVersion("5.7.0")]
 [assembly: NeutralResourcesLanguage("en-CA")]

SourceCode/GPS/AgOpenGPS.csproj

@@ -183,6 +183,12 @@
     <Compile Include="Forms\FormRecordName.Designer.cs">
       <DependentUpon>FormRecordName.cs</DependentUpon>
     </Compile>
+    <Compile Include="Forms\Form_Keys.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\Form_Keys.Designer.cs">
+      <DependentUpon>Form_Keys.cs</DependentUpon>
+    </Compile>
     <Compile Include="Forms\Form_Help.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -569,11 +575,8 @@
     <EmbeddedResource Include="Forms\FormRecordName.resx">
       <DependentUpon>FormRecordName.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Forms\Form_About.es.resx">
-      <DependentUpon>Form_About.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Forms\Form_About.fr.resx">
-      <DependentUpon>Form_About.cs</DependentUpon>
+    <EmbeddedResource Include="Forms\Form_Keys.resx">
+      <DependentUpon>Form_Keys.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Forms\Form_Help.resx">
       <DependentUpon>Form_Help.cs</DependentUpon>

SourceCode/GPS/Classes/CPatches.cs

@@ -26,9 +26,6 @@ public class CPatches
         public int currentStartSectionNum, currentEndSectionNum;
         public int newStartSectionNum, newEndSectionNum;
 
-        //count triangles
-        public static int tris;
-
         //simple constructor, position is set in GPSWinForm_Load in FormGPS when creating new object
         public CPatches(FormGPS _f)
         {
@@ -66,8 +63,6 @@ public void TurnMappingOn(int j)
                         triangleList.Add(new vec3(mf.sectionColorDay.R, mf.sectionColorDay.G, mf.sectionColorDay.B));
                 }
 
-                tris += 2;
-
                 leftPoint = mf.section[currentStartSectionNum].leftPoint;
                 rightPoint = mf.section[currentEndSectionNum].rightPoint;
 
@@ -116,7 +111,6 @@ public void AddMappingPoint(int j)
             //Right side
             triangleList.Add(new vec3(rightPoint.easting, rightPoint.northing, 0));
 
-            tris += 2;
             //count the triangle pairs
             numTriangles++;
 
@@ -163,8 +157,6 @@ public void AddMappingPoint(int j)
                 //add the points to List, yes its more points, but breaks up patches for culling
                 triangleList.Add(new vec3(leftPoint.easting, leftPoint.northing, 0));
                 triangleList.Add(new vec3(rightPoint.easting, rightPoint.northing, 0));
-
-                tris += 2;
             }
         }
     }