Merge pull request #337 from farmerbriantee/Languages

Languages

Author: farmerbriantee

.gitignore

@@ -364,3 +364,4 @@ Program/
 /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/
+*.zip

SourceCode/AgIO/Source/AgIO.csproj

@@ -269,20 +269,10 @@
       <SubType>Designer</SubType>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <EmbeddedResource Include="gStr.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>gStr.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <Compile Include="gStr.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>gStr.resx</DependentUpon>
-    </Compile>
     <Compile Include="Forms\SerialComm.Designer.cs">
       <SubType>Form</SubType>
       <DependentUpon>FormLoop.cs</DependentUpon>

SourceCode/AgIO/Source/Forms/FormCommSaver.cs

@@ -38,7 +38,7 @@ private void cboxVeh_SelectedIndexChanged(object sender, EventArgs e)
         {
             DialogResult result3 = MessageBox.Show(
                 "Overwrite: " + cboxEnv.SelectedItem.ToString() + ".xml",
-                gStr.gsSaveAndReturn,
+                "Save And Return",
                 MessageBoxButtons.YesNo,
                 MessageBoxIcon.Question,
                 MessageBoxDefaultButton.Button2);
@@ -69,7 +69,7 @@ private void btnSave_Click(object sender, EventArgs e)
             else
             {
                 _ = MessageBox.Show("Enter a File Name To Save...",
-                gStr.gsSaveAndReturn, MessageBoxButtons.OK);
+                "Save And Return", MessageBoxButtons.OK);
             }
         }
 

SourceCode/AgIO/Source/Forms/FormEthernet.cs

@@ -75,12 +75,6 @@ private void btnSerialCancel_Click(object sender, EventArgs e)
 
         }
 
-        private void btnHelp_Click(object sender, EventArgs e)
-        {
-            System.Diagnostics.Process.Start(gStr.gsEthernetHelp);
-        }
-
-
         ////get the ipv4 address only
         //public void GetIP4AddressList()
         //{

SourceCode/AgIO/Source/Forms/FormEthernet.designer.cs

@@ -204,7 +204,7 @@ private void FormLoop_Load(object sender, EventArgs e)
             isConnectedIMU = cboxIsIMUModule.Checked = Properties.Settings.Default.setMod_isIMUConnected;
             isConnectedSteer = cboxIsSteerModule.Checked = Properties.Settings.Default.setMod_isSteerConnected;
             isConnectedMachine = cboxIsMachineModule.Checked = Properties.Settings.Default.setMod_isMachineConnected;
-            
+
             SetModulesOnOff();
 
             oneSecondLoopTimer.Enabled = true;
@@ -218,6 +218,58 @@ private void FormLoop_Load(object sender, EventArgs e)
 
             //On or off the module rows
             SetModulesOnOff();
+
+            //update Caster IP from URL, just use the old one if can't find
+            if (isNTRIP_RequiredOn)
+            {
+                //broadCasterIP = Properties.Settings.Default.setNTRIP_casterIP; //Select correct Address
+                broadCasterIP = null;
+                string actualIP = Properties.Settings.Default.setNTRIP_casterURL.Trim();
+
+                try
+                {
+                    IPAddress[] addresslist = Dns.GetHostAddresses(actualIP);
+                    foreach (IPAddress address in addresslist)
+                    {
+                        if (address.AddressFamily == AddressFamily.InterNetwork)
+                        {
+                            broadCasterIP = address.ToString().Trim();
+                            Properties.Settings.Default.setNTRIP_casterIP = broadCasterIP;
+                            Properties.Settings.Default.Save();
+                            break;
+                        }
+                    }
+
+                    if (broadCasterIP == null) throw new NullReferenceException();
+                }
+                catch (Exception)
+                {
+                    TimedMessageBox(1500, "URL Not Located, Network Down?", "Cannot Find: " + Properties.Settings.Default.setNTRIP_casterURL);
+                    //if we had a timer already, kill it
+                    if (tmr != null)
+                    {
+                        tmr.Dispose();
+                    }
+
+                    //use last known
+                    broadCasterIP = Properties.Settings.Default.setNTRIP_casterIP; //Select correct Address
+
+                    // Close the socket if it is still open
+                    if (clientSocket != null && clientSocket.Connected)
+                    {
+                        clientSocket.Shutdown(SocketShutdown.Both);
+                        System.Threading.Thread.Sleep(100);
+                        clientSocket.Close();
+                    }
+
+                    //TimedMessageBox(2000, "NTRIP Not Connected", " Reconnect Request");
+                    ntripCounter = 15;
+                    isNTRIP_Connected = false;
+                    isNTRIP_Starting = false;
+                    isNTRIP_Connecting = false;
+                    return;
+                }
+            }
         }
 
         public void SetModulesOnOff()
@@ -847,7 +899,7 @@ private void toolStripEthernet_Click(object sender, EventArgs e)
 
         private void btnHelp_Click(object sender, EventArgs e)
         {
-            System.Diagnostics.Process.Start(gStr.gsAgIOHelp);
+            //System.Diagnostics.Process.Start(gStr.gsAgIOHelp);
         }
 
         private void lblNTRIPBytes_Click(object sender, EventArgs e)

SourceCode/AgIO/Source/Forms/FormLoop.cs

@@ -141,6 +141,11 @@ private void btnGetIP_Click(object sender, EventArgs e)
                         if (addr.AddressFamily == AddressFamily.InterNetwork)
                         {
                             tboxCasterIP.Text = addr.ToString().Trim();
+                            mf.broadCasterIP = addr.ToString().Trim();
+                            Properties.Settings.Default.setNTRIP_casterIP = mf.broadCasterIP;
+                            Properties.Settings.Default.Save();
+                            break;
+
                         }
                     }
                     mf.TimedMessageBox(2500, "IP Located", "Verified: " + actualIP);
@@ -446,7 +451,7 @@ private void cboxToSerial_Click(object sender, EventArgs e)
 
         private void btnHelp_Click(object sender, EventArgs e)
         {
-            System.Diagnostics.Process.Start(gStr.gsNTRIP_Help);
+            //System.Diagnostics.Process.Start(gStr.gsNTRIP_Help);
         }
     }
 }

SourceCode/AgIO/Source/Forms/FormNtrip.Designer.cs

@@ -145,7 +145,7 @@ private void btnSerialCancel_Click(object sender, EventArgs e)
 
         private void btnHelp_Click(object sender, EventArgs e)
         {
-            System.Diagnostics.Process.Start(gStr.gsSerialMonHelp);
+            //System.Diagnostics.Process.Start(gStr.gsSerialMonHelp);
         }
 
         private void cboxPort_SelectedIndexChanged(object sender, EventArgs e)

SourceCode/AgIO/Source/Forms/FormNtrip.cs

@@ -329,7 +329,7 @@ private void btnNetworkCPL_Click(object sender, EventArgs e)
 
         private void btnHelp_Click(object sender, EventArgs e)
         {
-            System.Diagnostics.Process.Start(gStr.gsEthernetHelp);
+            //System.Diagnostics.Process.Start(gStr.gsEthernetHelp);
 
         }