Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-11 18:38:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Mission planner:

Browse Source 
* Added timeout to udp port open
    * Disabled baud selector for udp
    * Fixed problem where selected port might disappear when clicking near
      the port selector
This commit is contained in:
Janne Mantyharju 2011-09-22 15:32:43 +03:00
parent e4f87d7442
commit 926416040b
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Tools/ArdupilotMegaPlanner/CommsUdpSerial.cs
View File

@ -79,6 +79,18 @@ namespace System.IO.Ports
client = new UdpClient(int.Parse(Port)); client = new UdpClient(int.Parse(Port));
int timeout = 5;
while (timeout > 0)
{
if (BytesToRead > 0)
break;
System.Threading.Thread.Sleep(1000);
timeout--;
}
if (BytesToRead == 0)
return;
try try
{ {
client.Receive(ref RemoteIpEndPoint); client.Receive(ref RemoteIpEndPoint);

7
Tools/ArdupilotMegaPlanner/MainV2.cs
View File

@ -222,9 +222,12 @@ namespace ArdupilotMega
private void CMB_serialport_Click(object sender, EventArgs e) private void CMB_serialport_Click(object sender, EventArgs e)
{ {
String old_port = CMB_serialport.Text;
CMB_serialport.Items.Clear(); CMB_serialport.Items.Clear();
CMB_serialport.Items.AddRange(SerialPort.GetPortNames()); CMB_serialport.Items.AddRange(SerialPort.GetPortNames());
CMB_serialport.Items.Add("UDP"); CMB_serialport.Items.Add("UDP");
if (CMB_serialport.Items.Contains(old_port))
CMB_serialport.Text = old_port;
} }
public static void fixtheme(Control temp) public static void fixtheme(Control temp)
@ -672,6 +675,10 @@ namespace ArdupilotMega
private void CMB_serialport_SelectedIndexChanged(object sender, EventArgs e) private void CMB_serialport_SelectedIndexChanged(object sender, EventArgs e)
{ {
comportname = CMB_serialport.Text; comportname = CMB_serialport.Text;
if (comportname == "UDP")
CMB_baudrate.Enabled = false;
else
CMB_baudrate.Enabled = true;
try try
{ {
comPort.BaseStream.PortName = CMB_serialport.Text; comPort.BaseStream.PortName = CMB_serialport.Text;