zrzk
/
zr-v4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Planner: Fixed binding issues with mode DDLs

master
Adam M Rivera 13 years ago
parent
a2d65b28cc
commit
489ae28d2e
2 changed files with 2 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      Tools/ArdupilotMegaPlanner/CurrentState.cs
  2. 42
      Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigFlightModes.cs

3
Tools/ArdupilotMegaPlanner/CurrentState.cs
Unescape View File

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

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

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

Write Preview
Loading…
Cancel
Save