Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Planner: Fixed binding issues with mode DDLs

This commit is contained in:
Adam M Rivera 2012-04-23 09:59:45 -05:00
parent 58a4d7a4c9
commit 62ac138b78
2 changed files with 2 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Tools/ArdupilotMegaPlanner/CurrentState.cs
View File

@ -535,9 +535,6 @@ namespace ArdupilotMega
case (byte)(100 + Common.ac2modes.APPROACH): case (byte)(100 + Common.ac2modes.APPROACH):
mode = EnumTranslator.GetDisplayText(Common.ac2modes.APPROACH); mode = EnumTranslator.GetDisplayText(Common.ac2modes.APPROACH);
break; break;
case (byte)(100 + Common.ac2modes.APPROACH):
mode = "APPROACH";
break;
case (byte)(100 + Common.ac2modes.POSITION): case (byte)(100 + Common.ac2modes.POSITION):
mode = EnumTranslator.GetDisplayText(Common.ac2modes.POSITION); mode = EnumTranslator.GetDisplayText(Common.ac2modes.POSITION);
break; break;

42
Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFlightModes.cs
View File

@ -159,38 +159,19 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
CB_simple5.Visible = false; CB_simple5.Visible = false;
CB_simple6.Visible = false; CB_simple6.Visible = false;
CMB_fmode1.Items.Clear(); var flightModes = EnumTranslator.Translate<Common.apmmodes>().Select(x => x.Value).OrderBy(x => x).ToList();
CMB_fmode2.Items.Clear();
CMB_fmode3.Items.Clear();
CMB_fmode4.Items.Clear();
CMB_fmode5.Items.Clear();
CMB_fmode6.Items.Clear();
var flightModes = EnumTranslator.Translate<Common.apmmodes>();
CMB_fmode1.DataSource = flightModes; CMB_fmode1.DataSource = flightModes;
CMB_fmode1.ValueMember = "Value";
CMB_fmode1.DisplayMember = "Value";
CMB_fmode2.DataSource = flightModes; CMB_fmode2.DataSource = flightModes;
CMB_fmode2.ValueMember = "Value";
CMB_fmode2.DisplayMember = "Value";
CMB_fmode3.DataSource = flightModes; CMB_fmode3.DataSource = flightModes;
CMB_fmode3.ValueMember = "Value";
CMB_fmode3.DisplayMember = "Value";
CMB_fmode4.DataSource = flightModes; CMB_fmode4.DataSource = flightModes;
CMB_fmode4.ValueMember = "Value";
CMB_fmode4.DisplayMember = "Value";
CMB_fmode5.DataSource = flightModes; CMB_fmode5.DataSource = flightModes;
CMB_fmode5.ValueMember = "Value";
CMB_fmode5.DisplayMember = "Value";
CMB_fmode6.DataSource = flightModes; CMB_fmode6.DataSource = flightModes;
CMB_fmode6.ValueMember = "Value";
CMB_fmode6.DisplayMember = "Value";
try try
{ {
@ -206,38 +187,19 @@ namespace ArdupilotMega.GCSViews.ConfigurationView
} }
if (MainV2.cs.firmware == MainV2.Firmwares.ArduCopter2) // ac2 if (MainV2.cs.firmware == MainV2.Firmwares.ArduCopter2) // ac2
{ {
CMB_fmode1.Items.Clear(); var flightModes = EnumTranslator.Translate<Common.ac2modes>().Select(x => x.Value).OrderBy(x => x).ToList();
CMB_fmode2.Items.Clear();
CMB_fmode3.Items.Clear();
CMB_fmode4.Items.Clear();
CMB_fmode5.Items.Clear();
CMB_fmode6.Items.Clear();
var flightModes = EnumTranslator.Translate<Common.apmmodes>();
CMB_fmode1.DataSource = flightModes; CMB_fmode1.DataSource = flightModes;
CMB_fmode1.ValueMember = "Value";
CMB_fmode1.DisplayMember = "Value";
CMB_fmode2.DataSource = flightModes; CMB_fmode2.DataSource = flightModes;
CMB_fmode2.ValueMember = "Value";
CMB_fmode2.DisplayMember = "Value";
CMB_fmode3.DataSource = flightModes; CMB_fmode3.DataSource = flightModes;
CMB_fmode3.ValueMember = "Value";
CMB_fmode3.DisplayMember = "Value";
CMB_fmode4.DataSource = flightModes; CMB_fmode4.DataSource = flightModes;
CMB_fmode4.ValueMember = "Value";
CMB_fmode4.DisplayMember = "Value";
CMB_fmode5.DataSource = flightModes; CMB_fmode5.DataSource = flightModes;
CMB_fmode5.ValueMember = "Value";
CMB_fmode5.DisplayMember = "Value";
CMB_fmode6.DataSource = flightModes; CMB_fmode6.DataSource = flightModes;
CMB_fmode6.ValueMember = "Value";
CMB_fmode6.DisplayMember = "Value";
try try
{ {