diff --git a/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj b/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj index 3ba7c16a03..3bcce47215 100644 --- a/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj +++ b/Tools/ArdupilotMegaPlanner/ArdupilotMega.csproj @@ -391,6 +391,12 @@ ConfigFailSafe.cs + + UserControl + + + ConfigCameraParams.cs + @@ -780,6 +786,9 @@ ConfigRawParams.cs + + ConfigCameraParams.cs + MavlinkLog.cs @@ -1304,9 +1313,10 @@ Always - - Always - + + + + Always Designer diff --git a/Tools/ArdupilotMegaPlanner/Controls/BackstageView/BackstageViewButton.cs b/Tools/ArdupilotMegaPlanner/Controls/BackstageView/BackstageViewButton.cs index 33377c103e..8b648348bd 100644 --- a/Tools/ArdupilotMegaPlanner/Controls/BackstageView/BackstageViewButton.cs +++ b/Tools/ArdupilotMegaPlanner/Controls/BackstageView/BackstageViewButton.cs @@ -62,7 +62,10 @@ namespace ArdupilotMega.Controls.BackstageView protected override void OnPaint(PaintEventArgs pevent) { - ((BackStageViewMenuPanel)this.Parent).PaintBackground(pevent); + if (this.Parent != null) + { + ((BackStageViewMenuPanel)this.Parent).PaintBackground(pevent); + } Graphics g = pevent.Graphics; diff --git a/Tools/ArdupilotMegaPlanner/CurrentState.cs b/Tools/ArdupilotMegaPlanner/CurrentState.cs index 3a2280e443..e9631fcc27 100644 --- a/Tools/ArdupilotMegaPlanner/CurrentState.cs +++ b/Tools/ArdupilotMegaPlanner/CurrentState.cs @@ -87,6 +87,7 @@ namespace ArdupilotMega // turn radius public float radius { get { if (groundspeed <= 1) return 0; return ((groundspeed * groundspeed)/(float)(9.8f*Math.Tan(roll * deg2rad))); } } + public float rxrssi { get; set; } //radio public float ch1in { get; set; } public float ch2in { get; set; } @@ -880,6 +881,9 @@ namespace ArdupilotMega ch7in = rcin.chan7_raw; ch8in = rcin.chan8_raw; + //percent + rxrssi = (float)((rcin.rssi / 255.0) * 100.0); + //MAVLink.packets[MAVLink.MAVLINK_MSG_ID_RC_CHANNELS_RAW] = null; } diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigCameraParams.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigCameraParams.Designer.cs new file mode 100644 index 0000000000..d9bbd89791 --- /dev/null +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigCameraParams.Designer.cs @@ -0,0 +1,92 @@ +namespace ArdupilotMega.GCSViews.ConfigurationView +{ + partial class ConfigParamParams + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.BUT_rerequestparams = new ArdupilotMega.Controls.MyButton(); + this.BUT_writePIDS = new ArdupilotMega.Controls.MyButton(); + this.SuspendLayout(); + // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.AutoScroll = true; + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.Location = new System.Drawing.Point(12, 36); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 1; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 110F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(514, 110); + this.tableLayoutPanel1.TabIndex = 0; + // + // BUT_rerequestparams + // + this.BUT_rerequestparams.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.BUT_rerequestparams.Location = new System.Drawing.Point(121, 11); + this.BUT_rerequestparams.Name = "BUT_rerequestparams"; + this.BUT_rerequestparams.Padding = new System.Windows.Forms.Padding(0, 15, 0, 0); + this.BUT_rerequestparams.Size = new System.Drawing.Size(103, 19); + this.BUT_rerequestparams.TabIndex = 73; + this.BUT_rerequestparams.Text = "Refresh Params"; + this.BUT_rerequestparams.UseVisualStyleBackColor = true; + // + // BUT_writePIDS + // + this.BUT_writePIDS.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.BUT_writePIDS.Location = new System.Drawing.Point(12, 11); + this.BUT_writePIDS.Name = "BUT_writePIDS"; + this.BUT_writePIDS.Padding = new System.Windows.Forms.Padding(0, 15, 0, 0); + this.BUT_writePIDS.Size = new System.Drawing.Size(103, 19); + this.BUT_writePIDS.TabIndex = 74; + this.BUT_writePIDS.Text = "Write Params"; + this.BUT_writePIDS.UseVisualStyleBackColor = true; + // + // ConfigFriendlyParams + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoSize = true; + this.Controls.Add(this.BUT_rerequestparams); + this.Controls.Add(this.BUT_writePIDS); + this.Controls.Add(this.tableLayoutPanel1); + this.Name = "ConfigFriendlyParams"; + this.Size = new System.Drawing.Size(673, 177); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; + private Controls.MyButton BUT_rerequestparams; + private Controls.MyButton BUT_writePIDS; + } +} diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigCameraParams.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigCameraParams.cs new file mode 100644 index 0000000000..0a176eed17 --- /dev/null +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigCameraParams.cs @@ -0,0 +1,395 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Drawing; +using System.Globalization; +using System.IO; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using ArdupilotMega.Controls; +using ArdupilotMega.Controls.BackstageView; +using ArdupilotMega.Utilities; +using log4net; + +namespace ArdupilotMega.GCSViews.ConfigurationView +{ + public partial class ConfigParamParams : UserControl, IActivate + { + #region Class Fields + + private static readonly ILog log = + LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); + private readonly ParameterMetaDataRepository _parameterMetaDataRepository; + private Dictionary _params = new Dictionary(); + + #endregion + + #region Properties + + /// + /// Gets or sets the parameter mode. + /// + /// + /// The parameter mode. + /// + public string ParameterMode { get; set; } + + #endregion + + #region Constructor + + public ConfigParamParams() + { + InitializeComponent(); + tableLayoutPanel1.Height = this.Height; + _parameterMetaDataRepository = new ParameterMetaDataRepository(); + + MainV2.comPort.ParamListChanged += comPort_ParamListChanged; + Resize += this_Resize; + + BUT_rerequestparams.Click += BUT_rerequestparams_Click; + BUT_writePIDS.Click += BUT_writePIDS_Click; + } + + #endregion + + #region Events + + /// + /// Handles the Click event of the BUT_writePIDS control. + /// + /// The source of the event. + /// The instance containing the event data. + protected void BUT_writePIDS_Click(object sender, EventArgs e) + { + bool errorThrown = false; + _params.ForEach(x => + { + var matchingControls = tableLayoutPanel1.Controls.Find(x.Key, true); + if (matchingControls.Length > 0) + { + var ctl = (IDynamicParameterControl)matchingControls[0]; + try + { + MainV2.comPort.setParam(x.Key, float.Parse(ctl.Value)); + } + catch + { + errorThrown = true; + CustomMessageBox.Show("Set " + x.Key + " Failed"); + } + } + }); + if (!errorThrown) + { + CustomMessageBox.Show("Parameters successfully saved."); + } + } + + /// + /// Handles the Click event of the BUT_rerequestparams control. + /// + /// The source of the event. + /// The instance containing the event data. + protected void BUT_rerequestparams_Click(object sender, EventArgs e) + { + if (!MainV2.comPort.BaseStream.IsOpen) + return; + + ((Control)sender).Enabled = false; + + try + { + MainV2.comPort.getParamList(); + } + catch (Exception ex) + { + log.Error("Exception getting param list", ex); + CustomMessageBox.Show("Error: getting param list"); + } + + + ((Control)sender).Enabled = true; + + BindParamList(); + } + + /// + /// Handles the Resize event of the this control. + /// + /// The source of the event. + /// The instance containing the event data. + protected void this_Resize(object sender, EventArgs e) + { + tableLayoutPanel1.Height = this.Height - 50; + } + + /// + /// Handles the Load event of the ConfigRawParamsV2 control. + /// + /// The source of the event. + /// The instance containing the event data. + public void Activate() + { + BindParamList(); + } + + /// + /// Handles the ParamListChanged event of the comPort control. + /// + /// The source of the event. + /// The instance containing the event data. + protected void comPort_ParamListChanged(object sender, EventArgs e) + { + SortParamList(); + } + + #endregion + + #region Methods + + /// + /// Sorts the param list. + /// + private void SortParamList() + { + // Clear list + _params.Clear(); + + // When the parameter list is changed, re sort the list for our View's purposes + MainV2.comPort.param.Keys.ForEach(x => + { + string displayName = _parameterMetaDataRepository.GetParameterMetaData(x.ToString(), ParameterMetaDataConstants.DisplayName); + string parameterMode = _parameterMetaDataRepository.GetParameterMetaData(x.ToString(), ParameterMetaDataConstants.User); + + // If we have a friendly display name AND + if (!String.IsNullOrEmpty(displayName) && + // The user type is equal to the ParameterMode specified at class instantiation OR + ((!String.IsNullOrEmpty(parameterMode) && parameterMode == ParameterMode) || + // The user type is empty and this is in Advanced mode + String.IsNullOrEmpty(parameterMode) && ParameterMode == ParameterMetaDataConstants.Advanced)) + { + _params.Add(x.ToString(), displayName); + } + }); + _params = _params.OrderBy(x => x.Value).ToDictionary(x => x.Key, x => x.Value); + } + + /// + /// Binds the param list. + /// + private void BindParamList() + { + tableLayoutPanel1.Controls.Clear(); + if (_params == null || _params.Count == 0) SortParamList(); + + // get the params if nothing exists already + if (_params != null && _params.Count == 0) + { + try + { + Utilities.ParameterMetaDataParser.GetParameterInformation(); + + _parameterMetaDataRepository.Reload(); + + SortParamList(); + } + catch (Exception exp) { log.Error(exp); } // just to cleanup any errors + } + + this.SuspendLayout(); + + _params.OrderBy(x => x.Key).ForEach(x => + { + if(!String.IsNullOrEmpty(x.Key)) + { + try + { + bool controlAdded = false; + + if (!x.Key.StartsWith("MNT_")) + return; + + string value = ((float)MainV2.comPort.param[x.Key]).ToString("0.###", CultureInfo.InvariantCulture); + string description = _parameterMetaDataRepository.GetParameterMetaData(x.Key, ParameterMetaDataConstants.Description); + string displayName = x.Value + " (" + x.Key + ")"; + string units = _parameterMetaDataRepository.GetParameterMetaData(x.Key, ParameterMetaDataConstants.Units); + + // If this is a range + string rangeRaw = _parameterMetaDataRepository.GetParameterMetaData(x.Key, ParameterMetaDataConstants.Range); + string incrementRaw = _parameterMetaDataRepository.GetParameterMetaData(x.Key, ParameterMetaDataConstants.Increment); + + // modify for scaling + float test = 1; + MAVLink.modifyParamForDisplay(true, x.Key, ref test); + + if (test != 1) + { + if (units.ToLower() == "centi-degrees") + { + units = "Degrees"; + incrementRaw = "0.1"; + string[] rangeParts = rangeRaw.Split(new[] { ' ' }); + if (rangeParts.Count() == 2) + { + float lowerRange; + float.TryParse(rangeParts[0], out lowerRange); + float upperRange; + float.TryParse(rangeParts[1], out upperRange); + + rangeRaw = (lowerRange / 100) + " " + (upperRange / 100); + } + } + else if (units.ToLower() == "centimeters") + { + units = "Meters"; + incrementRaw = "0.1"; + string[] rangeParts = rangeRaw.Split(new[] { ' ' }); + if (rangeParts.Count() == 2) + { + float lowerRange; + float.TryParse(rangeParts[0], out lowerRange); + float upperRange; + float.TryParse(rangeParts[1], out upperRange); + + rangeRaw = (lowerRange / 100) + " " + (upperRange / 100); + } + } + else + { + units += " / " + (int)(1 / test); + } + } + + if (!String.IsNullOrEmpty(rangeRaw) && !String.IsNullOrEmpty(incrementRaw)) + { + float increment, intValue; + float.TryParse(incrementRaw, out increment); + float.TryParse(value, out intValue); + + string[] rangeParts = rangeRaw.Split(new[] { ' ' }); + if (rangeParts.Count() == 2 && increment > 0) + { + float lowerRange; + float.TryParse(rangeParts[0], out lowerRange); + float upperRange; + float.TryParse(rangeParts[1], out upperRange); + + int scaler = (int)float.Parse((1 / increment).ToString(CultureInfo.InvariantCulture)); + int scaledLowerRange = 0, scaledUpperRange = 0; + int scaledIncrement = (int)increment; + if (scaler > 0) + { + scaledLowerRange = (int)(lowerRange * scaler); + scaledUpperRange = (int)(upperRange * scaler); + scaledIncrement = (int)float.Parse((increment * scaler).ToString(CultureInfo.InvariantCulture)); + intValue *= scaler; + } + + var rangeControl = new RangeControl(); + rangeControl.Name = x.Key; + rangeControl.Scaler = scaler; + rangeControl.DescriptionText = FitDescriptionText(units, description); + rangeControl.LabelText = displayName; + rangeControl.TrackBarControl.Minimum = Math.Min(scaledLowerRange,(int)intValue); + rangeControl.TrackBarControl.Maximum = Math.Max(scaledUpperRange, (int)intValue); + rangeControl.TrackBarControl.TickFrequency = scaledIncrement; + rangeControl.TrackBarControl.Value = (int)intValue; + + rangeControl.NumericUpDownControl.Increment = (decimal)increment; + rangeControl.NumericUpDownControl.DecimalPlaces = scaler.ToString(CultureInfo.InvariantCulture).Length - 1; + rangeControl.NumericUpDownControl.Minimum = (decimal)Math.Min(lowerRange, ((float)MainV2.comPort.param[x.Key])); + rangeControl.NumericUpDownControl.Maximum = (decimal)Math.Max(upperRange, ((float)MainV2.comPort.param[x.Key])); + rangeControl.NumericUpDownControl.Value = (decimal)((float)MainV2.comPort.param[x.Key]); + + rangeControl.AttachEvents(); + + tableLayoutPanel1.Controls.Add(rangeControl); + + controlAdded = true; + } + } + + if (!controlAdded) + { + // If this is a subset of values + string availableValuesRaw = _parameterMetaDataRepository.GetParameterMetaData(x.Key, ParameterMetaDataConstants.Values); + if (!String.IsNullOrEmpty(availableValuesRaw)) + { + string[] availableValues = availableValuesRaw.Split(new[] { ',' }); + if (availableValues.Any()) + { + var valueControl = new ValuesControl(); + valueControl.Name = x.Key; + valueControl.DescriptionText = FitDescriptionText(units, description); + valueControl.LabelText = displayName; + + var splitValues = new List>(); + // Add the values to the ddl + availableValues.ForEach(val => + { + string[] valParts = val.Split(new[] { ':' }); + splitValues.Add(new KeyValuePair(valParts[0], (valParts.Length > 1) ? valParts[1] : valParts[0])); + }); + valueControl.ComboBoxControl.DisplayMember = "Value"; + valueControl.ComboBoxControl.ValueMember = "Key"; + valueControl.ComboBoxControl.DataSource = splitValues; + valueControl.ComboBoxControl.SelectedValue = value; + + tableLayoutPanel1.Controls.Add(valueControl); + } + } + } + } // if there is an error simply dont show it, ie bad pde file, bad scale etc + catch (Exception ex) { log.Error(ex); } + } + }); + + ThemeManager.ApplyThemeTo(this); + + this.ResumeLayout(); + } + + /// + /// Fits the description text. + /// + /// The description. + /// + private string FitDescriptionText(string description) + { + return FitDescriptionText(string.Empty, description); + } + + /// + /// Fits the description text. + /// + /// The units. + /// The description. + /// + private string FitDescriptionText(string units, string description) + { + var returnDescription = new StringBuilder(); + + if (!String.IsNullOrEmpty(units)) + { + returnDescription.Append(String.Format("Units: {0}{1}", units, Environment.NewLine)); + } + + if (!String.IsNullOrEmpty(description)) + { + returnDescription.Append("Description: "); + var descriptionParts = description.Split(new char[] { ' ' }); + for (int i = 0; i < descriptionParts.Length; i++) + { + returnDescription.Append(String.Format("{0} ", descriptionParts[i])); + if (i != 0 && i % 12 == 0) returnDescription.Append(Environment.NewLine); + } + } + + return returnDescription.ToString(); + } + + #endregion + } +} diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigCameraParams.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigCameraParams.resx new file mode 100644 index 0000000000..7080a7d118 --- /dev/null +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigCameraParams.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigMount.designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigMount.designer.cs index 3541cf0112..caa5db207d 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigMount.designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigMount.designer.cs @@ -38,8 +38,6 @@ namespace ArdupilotMega.GCSViews.ConfigurationView this.groupBox2 = new System.Windows.Forms.GroupBox(); this.label5 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label(); - this.PBOX_WarningIcon = new ArdupilotMega.Controls.PictureBoxWithPseudoOpacity(); - this.LBL_Error = new ArdupilotMega.Controls.LabelWithPseudoOpacity(); this.LNK_wiki = new System.Windows.Forms.LinkLabel(); this.label15 = new System.Windows.Forms.Label(); this.groupBox3 = new System.Windows.Forms.GroupBox(); @@ -48,60 +46,62 @@ namespace ArdupilotMega.GCSViews.ConfigurationView this.label10 = new System.Windows.Forms.Label(); this.label11 = new System.Windows.Forms.Label(); this.label12 = new System.Windows.Forms.Label(); - this.mavlinkNumericUpDownRAM = new ArdupilotMega.Controls.MavlinkNumericUpDown(); - this.mavlinkNumericUpDownRAMX = new ArdupilotMega.Controls.MavlinkNumericUpDown(); this.label13 = new System.Windows.Forms.Label(); this.label14 = new System.Windows.Forms.Label(); - this.mavlinkNumericUpDownRSM = new ArdupilotMega.Controls.MavlinkNumericUpDown(); - this.mavlinkNumericUpDownRSMX = new ArdupilotMega.Controls.MavlinkNumericUpDown(); - this.mavlinkCheckBoxRR = new ArdupilotMega.Controls.MavlinkCheckBox(); this.label16 = new System.Windows.Forms.Label(); this.label17 = new System.Windows.Forms.Label(); this.label18 = new System.Windows.Forms.Label(); this.label19 = new System.Windows.Forms.Label(); - this.mavlinkNumericUpDownPAM = new ArdupilotMega.Controls.MavlinkNumericUpDown(); - this.mavlinkNumericUpDownPAMX = new ArdupilotMega.Controls.MavlinkNumericUpDown(); this.label20 = new System.Windows.Forms.Label(); this.label21 = new System.Windows.Forms.Label(); - this.mavlinkNumericUpDownPSM = new ArdupilotMega.Controls.MavlinkNumericUpDown(); - this.mavlinkNumericUpDownPSMX = new ArdupilotMega.Controls.MavlinkNumericUpDown(); - this.mavlinkCheckBoxPR = new ArdupilotMega.Controls.MavlinkCheckBox(); this.label1 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); - this.mavlinkNumericUpDownTAM = new ArdupilotMega.Controls.MavlinkNumericUpDown(); - this.mavlinkNumericUpDownTAMX = new ArdupilotMega.Controls.MavlinkNumericUpDown(); this.label7 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label(); - this.mavlinkNumericUpDownTSM = new ArdupilotMega.Controls.MavlinkNumericUpDown(); - this.mavlinkNumericUpDownTSMX = new ArdupilotMega.Controls.MavlinkNumericUpDown(); - this.mavlinkCheckBoxTR = new ArdupilotMega.Controls.MavlinkCheckBox(); this.mavlinkComboBoxTilt = new System.Windows.Forms.ComboBox(); this.mavlinkComboBoxRoll = new System.Windows.Forms.ComboBox(); this.mavlinkComboBoxPan = new System.Windows.Forms.ComboBox(); - this.CMB_inputch_tilt = new ArdupilotMega.Controls.MavlinkComboBox(); this.label22 = new System.Windows.Forms.Label(); this.label23 = new System.Windows.Forms.Label(); - this.CMB_inputch_roll = new ArdupilotMega.Controls.MavlinkComboBox(); this.label24 = new System.Windows.Forms.Label(); this.CMB_inputch_pan = new ArdupilotMega.Controls.MavlinkComboBox(); + this.CMB_inputch_roll = new ArdupilotMega.Controls.MavlinkComboBox(); + this.CMB_inputch_tilt = new ArdupilotMega.Controls.MavlinkComboBox(); + this.mavlinkNumericUpDownTAM = new ArdupilotMega.Controls.MavlinkNumericUpDown(); + this.mavlinkNumericUpDownTAMX = new ArdupilotMega.Controls.MavlinkNumericUpDown(); + this.mavlinkNumericUpDownTSM = new ArdupilotMega.Controls.MavlinkNumericUpDown(); + this.mavlinkNumericUpDownTSMX = new ArdupilotMega.Controls.MavlinkNumericUpDown(); + this.mavlinkCheckBoxTR = new ArdupilotMega.Controls.MavlinkCheckBox(); + this.mavlinkNumericUpDownPAM = new ArdupilotMega.Controls.MavlinkNumericUpDown(); + this.mavlinkNumericUpDownPAMX = new ArdupilotMega.Controls.MavlinkNumericUpDown(); + this.mavlinkNumericUpDownPSM = new ArdupilotMega.Controls.MavlinkNumericUpDown(); + this.mavlinkNumericUpDownPSMX = new ArdupilotMega.Controls.MavlinkNumericUpDown(); + this.mavlinkCheckBoxPR = new ArdupilotMega.Controls.MavlinkCheckBox(); + this.mavlinkNumericUpDownRAM = new ArdupilotMega.Controls.MavlinkNumericUpDown(); + this.mavlinkNumericUpDownRAMX = new ArdupilotMega.Controls.MavlinkNumericUpDown(); + this.mavlinkNumericUpDownRSM = new ArdupilotMega.Controls.MavlinkNumericUpDown(); + this.mavlinkNumericUpDownRSMX = new ArdupilotMega.Controls.MavlinkNumericUpDown(); + this.mavlinkCheckBoxRR = new ArdupilotMega.Controls.MavlinkCheckBox(); + this.LBL_Error = new ArdupilotMega.Controls.LabelWithPseudoOpacity(); + this.PBOX_WarningIcon = new ArdupilotMega.Controls.PictureBoxWithPseudoOpacity(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.PBOX_WarningIcon)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownRAM)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownRAMX)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownRSM)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownRSMX)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownPAM)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownPAMX)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownPSM)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownPSMX)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownTAM)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownTAMX)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownTSM)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownTSMX)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownPAM)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownPAMX)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownPSM)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownPSMX)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownRAM)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownRAMX)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownRSM)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownRSMX)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.PBOX_WarningIcon)).BeginInit(); this.SuspendLayout(); // // pictureBox1 @@ -143,20 +143,6 @@ namespace ArdupilotMega.GCSViews.ConfigurationView this.label6.ForeColor = System.Drawing.Color.WhiteSmoke; this.label6.Name = "label6"; // - // PBOX_WarningIcon - // - resources.ApplyResources(this.PBOX_WarningIcon, "PBOX_WarningIcon"); - this.PBOX_WarningIcon.Image = global::ArdupilotMega.Properties.Resources.iconWarning32; - this.PBOX_WarningIcon.Name = "PBOX_WarningIcon"; - this.PBOX_WarningIcon.Opacity = 0.5F; - this.PBOX_WarningIcon.TabStop = false; - // - // LBL_Error - // - resources.ApplyResources(this.LBL_Error, "LBL_Error"); - this.LBL_Error.ForeColor = System.Drawing.Color.WhiteSmoke; - this.LBL_Error.Name = "LBL_Error"; - // // LNK_wiki // resources.ApplyResources(this.LNK_wiki, "LNK_wiki"); @@ -207,59 +193,6 @@ namespace ArdupilotMega.GCSViews.ConfigurationView this.label12.ForeColor = System.Drawing.Color.WhiteSmoke; this.label12.Name = "label12"; // - // mavlinkNumericUpDownRAM - // - resources.ApplyResources(this.mavlinkNumericUpDownRAM, "mavlinkNumericUpDownRAM"); - this.mavlinkNumericUpDownRAM.Increment = new decimal(new int[] { - 10, - 0, - 0, - 0}); - this.mavlinkNumericUpDownRAM.Max = 1F; - this.mavlinkNumericUpDownRAM.Maximum = new decimal(new int[] { - 2200, - 0, - 0, - 0}); - this.mavlinkNumericUpDownRAM.Min = 0F; - this.mavlinkNumericUpDownRAM.Name = "mavlinkNumericUpDownRAM"; - this.mavlinkNumericUpDownRAM.param = null; - this.mavlinkNumericUpDownRAM.ParamName = null; - this.mavlinkNumericUpDownRAM.Value = new decimal(new int[] { - 1000, - 0, - 0, - 0}); - // - // mavlinkNumericUpDownRAMX - // - resources.ApplyResources(this.mavlinkNumericUpDownRAMX, "mavlinkNumericUpDownRAMX"); - this.mavlinkNumericUpDownRAMX.Increment = new decimal(new int[] { - 10, - 0, - 0, - 0}); - this.mavlinkNumericUpDownRAMX.Max = 1F; - this.mavlinkNumericUpDownRAMX.Maximum = new decimal(new int[] { - 2200, - 0, - 0, - 0}); - this.mavlinkNumericUpDownRAMX.Min = 0F; - this.mavlinkNumericUpDownRAMX.Minimum = new decimal(new int[] { - 800, - 0, - 0, - 0}); - this.mavlinkNumericUpDownRAMX.Name = "mavlinkNumericUpDownRAMX"; - this.mavlinkNumericUpDownRAMX.param = null; - this.mavlinkNumericUpDownRAMX.ParamName = null; - this.mavlinkNumericUpDownRAMX.Value = new decimal(new int[] { - 2000, - 0, - 0, - 0}); - // // label13 // resources.ApplyResources(this.label13, "label13"); @@ -272,75 +205,6 @@ namespace ArdupilotMega.GCSViews.ConfigurationView this.label14.ForeColor = System.Drawing.Color.WhiteSmoke; this.label14.Name = "label14"; // - // mavlinkNumericUpDownRSM - // - resources.ApplyResources(this.mavlinkNumericUpDownRSM, "mavlinkNumericUpDownRSM"); - this.mavlinkNumericUpDownRSM.Increment = new decimal(new int[] { - 10, - 0, - 0, - 0}); - this.mavlinkNumericUpDownRSM.Max = 1F; - this.mavlinkNumericUpDownRSM.Maximum = new decimal(new int[] { - 2200, - 0, - 0, - 0}); - this.mavlinkNumericUpDownRSM.Min = 0F; - this.mavlinkNumericUpDownRSM.Minimum = new decimal(new int[] { - 800, - 0, - 0, - 0}); - this.mavlinkNumericUpDownRSM.Name = "mavlinkNumericUpDownRSM"; - this.mavlinkNumericUpDownRSM.param = null; - this.mavlinkNumericUpDownRSM.ParamName = null; - this.mavlinkNumericUpDownRSM.Value = new decimal(new int[] { - 1000, - 0, - 0, - 0}); - // - // mavlinkNumericUpDownRSMX - // - resources.ApplyResources(this.mavlinkNumericUpDownRSMX, "mavlinkNumericUpDownRSMX"); - this.mavlinkNumericUpDownRSMX.Increment = new decimal(new int[] { - 10, - 0, - 0, - 0}); - this.mavlinkNumericUpDownRSMX.Max = 1F; - this.mavlinkNumericUpDownRSMX.Maximum = new decimal(new int[] { - 2200, - 0, - 0, - 0}); - this.mavlinkNumericUpDownRSMX.Min = 0F; - this.mavlinkNumericUpDownRSMX.Minimum = new decimal(new int[] { - 800, - 0, - 0, - 0}); - this.mavlinkNumericUpDownRSMX.Name = "mavlinkNumericUpDownRSMX"; - this.mavlinkNumericUpDownRSMX.param = null; - this.mavlinkNumericUpDownRSMX.ParamName = null; - this.mavlinkNumericUpDownRSMX.Value = new decimal(new int[] { - 2000, - 0, - 0, - 0}); - // - // mavlinkCheckBoxRR - // - resources.ApplyResources(this.mavlinkCheckBoxRR, "mavlinkCheckBoxRR"); - this.mavlinkCheckBoxRR.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.mavlinkCheckBoxRR.Name = "mavlinkCheckBoxRR"; - this.mavlinkCheckBoxRR.OffValue = 0F; - this.mavlinkCheckBoxRR.OnValue = 1F; - this.mavlinkCheckBoxRR.param = null; - this.mavlinkCheckBoxRR.ParamName = null; - this.mavlinkCheckBoxRR.UseVisualStyleBackColor = true; - // // label16 // resources.ApplyResources(this.label16, "label16"); @@ -363,59 +227,6 @@ namespace ArdupilotMega.GCSViews.ConfigurationView this.label19.ForeColor = System.Drawing.Color.WhiteSmoke; this.label19.Name = "label19"; // - // mavlinkNumericUpDownPAM - // - resources.ApplyResources(this.mavlinkNumericUpDownPAM, "mavlinkNumericUpDownPAM"); - this.mavlinkNumericUpDownPAM.Increment = new decimal(new int[] { - 10, - 0, - 0, - 0}); - this.mavlinkNumericUpDownPAM.Max = 1F; - this.mavlinkNumericUpDownPAM.Maximum = new decimal(new int[] { - 2200, - 0, - 0, - 0}); - this.mavlinkNumericUpDownPAM.Min = 0F; - this.mavlinkNumericUpDownPAM.Name = "mavlinkNumericUpDownPAM"; - this.mavlinkNumericUpDownPAM.param = null; - this.mavlinkNumericUpDownPAM.ParamName = null; - this.mavlinkNumericUpDownPAM.Value = new decimal(new int[] { - 1000, - 0, - 0, - 0}); - // - // mavlinkNumericUpDownPAMX - // - resources.ApplyResources(this.mavlinkNumericUpDownPAMX, "mavlinkNumericUpDownPAMX"); - this.mavlinkNumericUpDownPAMX.Increment = new decimal(new int[] { - 10, - 0, - 0, - 0}); - this.mavlinkNumericUpDownPAMX.Max = 1F; - this.mavlinkNumericUpDownPAMX.Maximum = new decimal(new int[] { - 2200, - 0, - 0, - 0}); - this.mavlinkNumericUpDownPAMX.Min = 0F; - this.mavlinkNumericUpDownPAMX.Minimum = new decimal(new int[] { - 800, - 0, - 0, - 0}); - this.mavlinkNumericUpDownPAMX.Name = "mavlinkNumericUpDownPAMX"; - this.mavlinkNumericUpDownPAMX.param = null; - this.mavlinkNumericUpDownPAMX.ParamName = null; - this.mavlinkNumericUpDownPAMX.Value = new decimal(new int[] { - 2000, - 0, - 0, - 0}); - // // label20 // resources.ApplyResources(this.label20, "label20"); @@ -428,75 +239,6 @@ namespace ArdupilotMega.GCSViews.ConfigurationView this.label21.ForeColor = System.Drawing.Color.WhiteSmoke; this.label21.Name = "label21"; // - // mavlinkNumericUpDownPSM - // - resources.ApplyResources(this.mavlinkNumericUpDownPSM, "mavlinkNumericUpDownPSM"); - this.mavlinkNumericUpDownPSM.Increment = new decimal(new int[] { - 10, - 0, - 0, - 0}); - this.mavlinkNumericUpDownPSM.Max = 1F; - this.mavlinkNumericUpDownPSM.Maximum = new decimal(new int[] { - 2200, - 0, - 0, - 0}); - this.mavlinkNumericUpDownPSM.Min = 0F; - this.mavlinkNumericUpDownPSM.Minimum = new decimal(new int[] { - 800, - 0, - 0, - 0}); - this.mavlinkNumericUpDownPSM.Name = "mavlinkNumericUpDownPSM"; - this.mavlinkNumericUpDownPSM.param = null; - this.mavlinkNumericUpDownPSM.ParamName = null; - this.mavlinkNumericUpDownPSM.Value = new decimal(new int[] { - 1000, - 0, - 0, - 0}); - // - // mavlinkNumericUpDownPSMX - // - resources.ApplyResources(this.mavlinkNumericUpDownPSMX, "mavlinkNumericUpDownPSMX"); - this.mavlinkNumericUpDownPSMX.Increment = new decimal(new int[] { - 10, - 0, - 0, - 0}); - this.mavlinkNumericUpDownPSMX.Max = 1F; - this.mavlinkNumericUpDownPSMX.Maximum = new decimal(new int[] { - 2200, - 0, - 0, - 0}); - this.mavlinkNumericUpDownPSMX.Min = 0F; - this.mavlinkNumericUpDownPSMX.Minimum = new decimal(new int[] { - 800, - 0, - 0, - 0}); - this.mavlinkNumericUpDownPSMX.Name = "mavlinkNumericUpDownPSMX"; - this.mavlinkNumericUpDownPSMX.param = null; - this.mavlinkNumericUpDownPSMX.ParamName = null; - this.mavlinkNumericUpDownPSMX.Value = new decimal(new int[] { - 2000, - 0, - 0, - 0}); - // - // mavlinkCheckBoxPR - // - resources.ApplyResources(this.mavlinkCheckBoxPR, "mavlinkCheckBoxPR"); - this.mavlinkCheckBoxPR.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.mavlinkCheckBoxPR.Name = "mavlinkCheckBoxPR"; - this.mavlinkCheckBoxPR.OffValue = 0F; - this.mavlinkCheckBoxPR.OnValue = 1F; - this.mavlinkCheckBoxPR.param = null; - this.mavlinkCheckBoxPR.ParamName = null; - this.mavlinkCheckBoxPR.UseVisualStyleBackColor = true; - // // label1 // resources.ApplyResources(this.label1, "label1"); @@ -519,6 +261,84 @@ namespace ArdupilotMega.GCSViews.ConfigurationView this.label4.ForeColor = System.Drawing.Color.WhiteSmoke; this.label4.Name = "label4"; // + // label7 + // + resources.ApplyResources(this.label7, "label7"); + this.label7.ForeColor = System.Drawing.Color.WhiteSmoke; + this.label7.Name = "label7"; + // + // label8 + // + resources.ApplyResources(this.label8, "label8"); + this.label8.ForeColor = System.Drawing.Color.WhiteSmoke; + this.label8.Name = "label8"; + // + // mavlinkComboBoxTilt + // + this.mavlinkComboBoxTilt.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.mavlinkComboBoxTilt.FormattingEnabled = true; + resources.ApplyResources(this.mavlinkComboBoxTilt, "mavlinkComboBoxTilt"); + this.mavlinkComboBoxTilt.Name = "mavlinkComboBoxTilt"; + this.mavlinkComboBoxTilt.SelectedIndexChanged += new System.EventHandler(this.mavlinkComboBox_SelectedIndexChanged); + // + // mavlinkComboBoxRoll + // + this.mavlinkComboBoxRoll.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.mavlinkComboBoxRoll.FormattingEnabled = true; + resources.ApplyResources(this.mavlinkComboBoxRoll, "mavlinkComboBoxRoll"); + this.mavlinkComboBoxRoll.Name = "mavlinkComboBoxRoll"; + this.mavlinkComboBoxRoll.SelectedIndexChanged += new System.EventHandler(this.mavlinkComboBox_SelectedIndexChanged); + // + // mavlinkComboBoxPan + // + this.mavlinkComboBoxPan.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.mavlinkComboBoxPan.FormattingEnabled = true; + resources.ApplyResources(this.mavlinkComboBoxPan, "mavlinkComboBoxPan"); + this.mavlinkComboBoxPan.Name = "mavlinkComboBoxPan"; + this.mavlinkComboBoxPan.SelectedIndexChanged += new System.EventHandler(this.mavlinkComboBox_SelectedIndexChanged); + // + // label22 + // + resources.ApplyResources(this.label22, "label22"); + this.label22.Name = "label22"; + // + // label23 + // + resources.ApplyResources(this.label23, "label23"); + this.label23.Name = "label23"; + // + // label24 + // + resources.ApplyResources(this.label24, "label24"); + this.label24.Name = "label24"; + // + // CMB_inputch_pan + // + this.CMB_inputch_pan.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + resources.ApplyResources(this.CMB_inputch_pan, "CMB_inputch_pan"); + this.CMB_inputch_pan.FormattingEnabled = true; + this.CMB_inputch_pan.Name = "CMB_inputch_pan"; + this.CMB_inputch_pan.param = null; + this.CMB_inputch_pan.ParamName = null; + // + // CMB_inputch_roll + // + this.CMB_inputch_roll.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + resources.ApplyResources(this.CMB_inputch_roll, "CMB_inputch_roll"); + this.CMB_inputch_roll.FormattingEnabled = true; + this.CMB_inputch_roll.Name = "CMB_inputch_roll"; + this.CMB_inputch_roll.param = null; + this.CMB_inputch_roll.ParamName = null; + // + // CMB_inputch_tilt + // + this.CMB_inputch_tilt.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + resources.ApplyResources(this.CMB_inputch_tilt, "CMB_inputch_tilt"); + this.CMB_inputch_tilt.FormattingEnabled = true; + this.CMB_inputch_tilt.Name = "CMB_inputch_tilt"; + this.CMB_inputch_tilt.param = null; + this.CMB_inputch_tilt.ParamName = null; + // // mavlinkNumericUpDownTAM // resources.ApplyResources(this.mavlinkNumericUpDownTAM, "mavlinkNumericUpDownTAM"); @@ -572,18 +392,6 @@ namespace ArdupilotMega.GCSViews.ConfigurationView 0, 0}); // - // label7 - // - resources.ApplyResources(this.label7, "label7"); - this.label7.ForeColor = System.Drawing.Color.WhiteSmoke; - this.label7.Name = "label7"; - // - // label8 - // - resources.ApplyResources(this.label8, "label8"); - this.label8.ForeColor = System.Drawing.Color.WhiteSmoke; - this.label8.Name = "label8"; - // // mavlinkNumericUpDownTSM // resources.ApplyResources(this.mavlinkNumericUpDownTSM, "mavlinkNumericUpDownTSM"); @@ -653,71 +461,264 @@ namespace ArdupilotMega.GCSViews.ConfigurationView this.mavlinkCheckBoxTR.ParamName = null; this.mavlinkCheckBoxTR.UseVisualStyleBackColor = true; // - // mavlinkComboBoxTilt + // mavlinkNumericUpDownPAM // - this.mavlinkComboBoxTilt.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.mavlinkComboBoxTilt.FormattingEnabled = true; - resources.ApplyResources(this.mavlinkComboBoxTilt, "mavlinkComboBoxTilt"); - this.mavlinkComboBoxTilt.Name = "mavlinkComboBoxTilt"; - this.mavlinkComboBoxTilt.SelectedIndexChanged += new System.EventHandler(this.mavlinkComboBox_SelectedIndexChanged); + resources.ApplyResources(this.mavlinkNumericUpDownPAM, "mavlinkNumericUpDownPAM"); + this.mavlinkNumericUpDownPAM.Increment = new decimal(new int[] { + 10, + 0, + 0, + 0}); + this.mavlinkNumericUpDownPAM.Max = 1F; + this.mavlinkNumericUpDownPAM.Maximum = new decimal(new int[] { + 2200, + 0, + 0, + 0}); + this.mavlinkNumericUpDownPAM.Min = 0F; + this.mavlinkNumericUpDownPAM.Name = "mavlinkNumericUpDownPAM"; + this.mavlinkNumericUpDownPAM.param = null; + this.mavlinkNumericUpDownPAM.ParamName = null; + this.mavlinkNumericUpDownPAM.Value = new decimal(new int[] { + 1000, + 0, + 0, + 0}); // - // mavlinkComboBoxRoll + // mavlinkNumericUpDownPAMX // - this.mavlinkComboBoxRoll.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.mavlinkComboBoxRoll.FormattingEnabled = true; - resources.ApplyResources(this.mavlinkComboBoxRoll, "mavlinkComboBoxRoll"); - this.mavlinkComboBoxRoll.Name = "mavlinkComboBoxRoll"; - this.mavlinkComboBoxRoll.SelectedIndexChanged += new System.EventHandler(this.mavlinkComboBox_SelectedIndexChanged); + resources.ApplyResources(this.mavlinkNumericUpDownPAMX, "mavlinkNumericUpDownPAMX"); + this.mavlinkNumericUpDownPAMX.Increment = new decimal(new int[] { + 10, + 0, + 0, + 0}); + this.mavlinkNumericUpDownPAMX.Max = 1F; + this.mavlinkNumericUpDownPAMX.Maximum = new decimal(new int[] { + 2200, + 0, + 0, + 0}); + this.mavlinkNumericUpDownPAMX.Min = 0F; + this.mavlinkNumericUpDownPAMX.Minimum = new decimal(new int[] { + 800, + 0, + 0, + 0}); + this.mavlinkNumericUpDownPAMX.Name = "mavlinkNumericUpDownPAMX"; + this.mavlinkNumericUpDownPAMX.param = null; + this.mavlinkNumericUpDownPAMX.ParamName = null; + this.mavlinkNumericUpDownPAMX.Value = new decimal(new int[] { + 2000, + 0, + 0, + 0}); // - // mavlinkComboBoxPan + // mavlinkNumericUpDownPSM // - this.mavlinkComboBoxPan.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.mavlinkComboBoxPan.FormattingEnabled = true; - resources.ApplyResources(this.mavlinkComboBoxPan, "mavlinkComboBoxPan"); - this.mavlinkComboBoxPan.Name = "mavlinkComboBoxPan"; - this.mavlinkComboBoxPan.SelectedIndexChanged += new System.EventHandler(this.mavlinkComboBox_SelectedIndexChanged); + resources.ApplyResources(this.mavlinkNumericUpDownPSM, "mavlinkNumericUpDownPSM"); + this.mavlinkNumericUpDownPSM.Increment = new decimal(new int[] { + 10, + 0, + 0, + 0}); + this.mavlinkNumericUpDownPSM.Max = 1F; + this.mavlinkNumericUpDownPSM.Maximum = new decimal(new int[] { + 2200, + 0, + 0, + 0}); + this.mavlinkNumericUpDownPSM.Min = 0F; + this.mavlinkNumericUpDownPSM.Minimum = new decimal(new int[] { + 800, + 0, + 0, + 0}); + this.mavlinkNumericUpDownPSM.Name = "mavlinkNumericUpDownPSM"; + this.mavlinkNumericUpDownPSM.param = null; + this.mavlinkNumericUpDownPSM.ParamName = null; + this.mavlinkNumericUpDownPSM.Value = new decimal(new int[] { + 1000, + 0, + 0, + 0}); // - // CMB_inputch_tilt + // mavlinkNumericUpDownPSMX // - this.CMB_inputch_tilt.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - resources.ApplyResources(this.CMB_inputch_tilt, "CMB_inputch_tilt"); - this.CMB_inputch_tilt.FormattingEnabled = true; - this.CMB_inputch_tilt.Name = "CMB_inputch_tilt"; - this.CMB_inputch_tilt.param = null; - this.CMB_inputch_tilt.ParamName = null; + resources.ApplyResources(this.mavlinkNumericUpDownPSMX, "mavlinkNumericUpDownPSMX"); + this.mavlinkNumericUpDownPSMX.Increment = new decimal(new int[] { + 10, + 0, + 0, + 0}); + this.mavlinkNumericUpDownPSMX.Max = 1F; + this.mavlinkNumericUpDownPSMX.Maximum = new decimal(new int[] { + 2200, + 0, + 0, + 0}); + this.mavlinkNumericUpDownPSMX.Min = 0F; + this.mavlinkNumericUpDownPSMX.Minimum = new decimal(new int[] { + 800, + 0, + 0, + 0}); + this.mavlinkNumericUpDownPSMX.Name = "mavlinkNumericUpDownPSMX"; + this.mavlinkNumericUpDownPSMX.param = null; + this.mavlinkNumericUpDownPSMX.ParamName = null; + this.mavlinkNumericUpDownPSMX.Value = new decimal(new int[] { + 2000, + 0, + 0, + 0}); // - // label22 + // mavlinkCheckBoxPR // - resources.ApplyResources(this.label22, "label22"); - this.label22.Name = "label22"; + resources.ApplyResources(this.mavlinkCheckBoxPR, "mavlinkCheckBoxPR"); + this.mavlinkCheckBoxPR.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.mavlinkCheckBoxPR.Name = "mavlinkCheckBoxPR"; + this.mavlinkCheckBoxPR.OffValue = 0F; + this.mavlinkCheckBoxPR.OnValue = 1F; + this.mavlinkCheckBoxPR.param = null; + this.mavlinkCheckBoxPR.ParamName = null; + this.mavlinkCheckBoxPR.UseVisualStyleBackColor = true; // - // label23 + // mavlinkNumericUpDownRAM // - resources.ApplyResources(this.label23, "label23"); - this.label23.Name = "label23"; + resources.ApplyResources(this.mavlinkNumericUpDownRAM, "mavlinkNumericUpDownRAM"); + this.mavlinkNumericUpDownRAM.Increment = new decimal(new int[] { + 10, + 0, + 0, + 0}); + this.mavlinkNumericUpDownRAM.Max = 1F; + this.mavlinkNumericUpDownRAM.Maximum = new decimal(new int[] { + 2200, + 0, + 0, + 0}); + this.mavlinkNumericUpDownRAM.Min = 0F; + this.mavlinkNumericUpDownRAM.Name = "mavlinkNumericUpDownRAM"; + this.mavlinkNumericUpDownRAM.param = null; + this.mavlinkNumericUpDownRAM.ParamName = null; + this.mavlinkNumericUpDownRAM.Value = new decimal(new int[] { + 1000, + 0, + 0, + 0}); // - // CMB_inputch_roll + // mavlinkNumericUpDownRAMX // - this.CMB_inputch_roll.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - resources.ApplyResources(this.CMB_inputch_roll, "CMB_inputch_roll"); - this.CMB_inputch_roll.FormattingEnabled = true; - this.CMB_inputch_roll.Name = "CMB_inputch_roll"; - this.CMB_inputch_roll.param = null; - this.CMB_inputch_roll.ParamName = null; + resources.ApplyResources(this.mavlinkNumericUpDownRAMX, "mavlinkNumericUpDownRAMX"); + this.mavlinkNumericUpDownRAMX.Increment = new decimal(new int[] { + 10, + 0, + 0, + 0}); + this.mavlinkNumericUpDownRAMX.Max = 1F; + this.mavlinkNumericUpDownRAMX.Maximum = new decimal(new int[] { + 2200, + 0, + 0, + 0}); + this.mavlinkNumericUpDownRAMX.Min = 0F; + this.mavlinkNumericUpDownRAMX.Minimum = new decimal(new int[] { + 800, + 0, + 0, + 0}); + this.mavlinkNumericUpDownRAMX.Name = "mavlinkNumericUpDownRAMX"; + this.mavlinkNumericUpDownRAMX.param = null; + this.mavlinkNumericUpDownRAMX.ParamName = null; + this.mavlinkNumericUpDownRAMX.Value = new decimal(new int[] { + 2000, + 0, + 0, + 0}); // - // label24 + // mavlinkNumericUpDownRSM // - resources.ApplyResources(this.label24, "label24"); - this.label24.Name = "label24"; + resources.ApplyResources(this.mavlinkNumericUpDownRSM, "mavlinkNumericUpDownRSM"); + this.mavlinkNumericUpDownRSM.Increment = new decimal(new int[] { + 10, + 0, + 0, + 0}); + this.mavlinkNumericUpDownRSM.Max = 1F; + this.mavlinkNumericUpDownRSM.Maximum = new decimal(new int[] { + 2200, + 0, + 0, + 0}); + this.mavlinkNumericUpDownRSM.Min = 0F; + this.mavlinkNumericUpDownRSM.Minimum = new decimal(new int[] { + 800, + 0, + 0, + 0}); + this.mavlinkNumericUpDownRSM.Name = "mavlinkNumericUpDownRSM"; + this.mavlinkNumericUpDownRSM.param = null; + this.mavlinkNumericUpDownRSM.ParamName = null; + this.mavlinkNumericUpDownRSM.Value = new decimal(new int[] { + 1000, + 0, + 0, + 0}); // - // CMB_inputch_pan + // mavlinkNumericUpDownRSMX // - this.CMB_inputch_pan.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - resources.ApplyResources(this.CMB_inputch_pan, "CMB_inputch_pan"); - this.CMB_inputch_pan.FormattingEnabled = true; - this.CMB_inputch_pan.Name = "CMB_inputch_pan"; - this.CMB_inputch_pan.param = null; - this.CMB_inputch_pan.ParamName = null; + resources.ApplyResources(this.mavlinkNumericUpDownRSMX, "mavlinkNumericUpDownRSMX"); + this.mavlinkNumericUpDownRSMX.Increment = new decimal(new int[] { + 10, + 0, + 0, + 0}); + this.mavlinkNumericUpDownRSMX.Max = 1F; + this.mavlinkNumericUpDownRSMX.Maximum = new decimal(new int[] { + 2200, + 0, + 0, + 0}); + this.mavlinkNumericUpDownRSMX.Min = 0F; + this.mavlinkNumericUpDownRSMX.Minimum = new decimal(new int[] { + 800, + 0, + 0, + 0}); + this.mavlinkNumericUpDownRSMX.Name = "mavlinkNumericUpDownRSMX"; + this.mavlinkNumericUpDownRSMX.param = null; + this.mavlinkNumericUpDownRSMX.ParamName = null; + this.mavlinkNumericUpDownRSMX.Value = new decimal(new int[] { + 2000, + 0, + 0, + 0}); + // + // mavlinkCheckBoxRR + // + resources.ApplyResources(this.mavlinkCheckBoxRR, "mavlinkCheckBoxRR"); + this.mavlinkCheckBoxRR.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.mavlinkCheckBoxRR.Name = "mavlinkCheckBoxRR"; + this.mavlinkCheckBoxRR.OffValue = 0F; + this.mavlinkCheckBoxRR.OnValue = 1F; + this.mavlinkCheckBoxRR.param = null; + this.mavlinkCheckBoxRR.ParamName = null; + this.mavlinkCheckBoxRR.UseVisualStyleBackColor = true; + // + // LBL_Error + // + resources.ApplyResources(this.LBL_Error, "LBL_Error"); + this.LBL_Error.DoubleBuffered = true; + this.LBL_Error.ForeColor = System.Drawing.Color.WhiteSmoke; + this.LBL_Error.Name = "LBL_Error"; + // + // PBOX_WarningIcon + // + resources.ApplyResources(this.PBOX_WarningIcon, "PBOX_WarningIcon"); + this.PBOX_WarningIcon.Image = global::ArdupilotMega.Properties.Resources.iconWarning32; + this.PBOX_WarningIcon.Name = "PBOX_WarningIcon"; + this.PBOX_WarningIcon.Opacity = 0.5F; + this.PBOX_WarningIcon.TabStop = false; // // ConfigMount // @@ -780,20 +781,20 @@ namespace ArdupilotMega.GCSViews.ConfigurationView resources.ApplyResources(this, "$this"); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.PBOX_WarningIcon)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownRAM)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownRAMX)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownRSM)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownRSMX)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownPAM)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownPAMX)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownPSM)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownPSMX)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownTAM)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownTAMX)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownTSM)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownTSMX)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownPAM)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownPAMX)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownPSM)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownPSMX)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownRAM)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownRAMX)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownRSM)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.mavlinkNumericUpDownRSMX)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.PBOX_WarningIcon)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigMount.resx b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigMount.resx index dbbdcb099b..061ee327f4 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigMount.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/ConfigMount.resx @@ -121,6 +121,9 @@ Zoom + + NoControl + 33, 16 @@ -151,7 +154,7 @@ 17, 150 - 635, 5 + 516, 5 52 @@ -171,6 +174,9 @@ Zoom + + NoControl + 33, 141 @@ -199,7 +205,7 @@ 17, 23 - 635, 5 + 516, 5 59 @@ -222,6 +228,9 @@ Microsoft Sans Serif, 12pt + + NoControl + 21, 4 @@ -252,6 +261,9 @@ Microsoft Sans Serif, 12pt + + NoControl + 20, 132 @@ -276,66 +288,15 @@ 48 - - Bottom, Left, Right - - - 264, 389 - - - 32, 32 - - - 75 - - - PBOX_WarningIcon - - - ArdupilotMega.Controls.PictureBoxWithPseudoOpacity, ArdupilotMegaPlanner10, Version=1.1.4638.35097, Culture=neutral, PublicKeyToken=null - - - $this - - - 47 - - - Bottom, Left, Right - - - True - - - 303, 402 - - - 138, 13 - - - 76 - - - Error Message of some kind - - - LBL_Error - - - ArdupilotMega.Controls.LabelWithPseudoOpacity, ArdupilotMegaPlanner10, Version=1.1.4638.35097, Culture=neutral, PublicKeyToken=null - - - $this - - - 46 - Top, Right True + + NoControl + 624, 9 @@ -366,6 +327,9 @@ Microsoft Sans Serif, 12pt + + NoControl + 20, 256 @@ -397,7 +361,7 @@ 17, 274 - 635, 5 + 516, 5 78 @@ -417,6 +381,9 @@ Zoom + + NoControl + 33, 265 @@ -444,6 +411,9 @@ Microsoft Sans Serif, 12pt + + NoControl + 352, 158 @@ -474,6 +444,9 @@ Microsoft Sans Serif, 12pt + + NoControl + 251, 158 @@ -501,6 +474,9 @@ True + + NoControl + 355, 211 @@ -528,6 +504,9 @@ True + + NoControl + 355, 183 @@ -552,57 +531,12 @@ 34 - - False - - - 385, 181 - - - 59, 20 - - - 101 - - - mavlinkNumericUpDownRAM - - - ArdupilotMega.Controls.MavlinkNumericUpDown, ArdupilotMegaPlanner10, Version=1.1.4638.35097, Culture=neutral, PublicKeyToken=null - - - $this - - - 35 - - - False - - - 385, 207 - - - 59, 20 - - - 100 - - - mavlinkNumericUpDownRAMX - - - ArdupilotMega.Controls.MavlinkNumericUpDown, ArdupilotMegaPlanner10, Version=1.1.4638.35097, Culture=neutral, PublicKeyToken=null - - - $this - - - 36 - True + + NoControl + 246, 211 @@ -630,6 +564,9 @@ True + + NoControl + 246, 183 @@ -654,90 +591,15 @@ 38 - - False - - - 276, 181 - - - 59, 20 - - - 97 - - - mavlinkNumericUpDownRSM - - - ArdupilotMega.Controls.MavlinkNumericUpDown, ArdupilotMegaPlanner10, Version=1.1.4638.35097, Culture=neutral, PublicKeyToken=null - - - $this - - - 39 - - - False - - - 276, 207 - - - 59, 20 - - - 96 - - - mavlinkNumericUpDownRSMX - - - ArdupilotMega.Controls.MavlinkNumericUpDown, ArdupilotMegaPlanner10, Version=1.1.4638.35097, Culture=neutral, PublicKeyToken=null - - - $this - - - 40 - - - True - - - False - - - 267, 233 - - - 66, 17 - - - 95 - - - Reverse - - - mavlinkCheckBoxRR - - - ArdupilotMega.Controls.MavlinkCheckBox, ArdupilotMegaPlanner10, Version=1.1.4638.35097, Culture=neutral, PublicKeyToken=null - - - $this - - - 41 - True Microsoft Sans Serif, 12pt + + NoControl + 352, 282 @@ -768,6 +630,9 @@ Microsoft Sans Serif, 12pt + + NoControl + 251, 282 @@ -795,6 +660,9 @@ True + + NoControl + 355, 335 @@ -822,6 +690,9 @@ True + + NoControl + 355, 307 @@ -846,57 +717,12 @@ 23 - - False - - - 385, 305 - - - 59, 20 - - - 112 - - - mavlinkNumericUpDownPAM - - - ArdupilotMega.Controls.MavlinkNumericUpDown, ArdupilotMegaPlanner10, Version=1.1.4638.35097, Culture=neutral, PublicKeyToken=null - - - $this - - - 24 - - - False - - - 385, 331 - - - 59, 20 - - - 111 - - - mavlinkNumericUpDownPAMX - - - ArdupilotMega.Controls.MavlinkNumericUpDown, ArdupilotMegaPlanner10, Version=1.1.4638.35097, Culture=neutral, PublicKeyToken=null - - - $this - - - 25 - True + + NoControl + 246, 335 @@ -924,6 +750,9 @@ True + + NoControl + 246, 307 @@ -948,90 +777,15 @@ 27 - - False - - - 276, 305 - - - 59, 20 - - - 108 - - - mavlinkNumericUpDownPSM - - - ArdupilotMega.Controls.MavlinkNumericUpDown, ArdupilotMegaPlanner10, Version=1.1.4638.35097, Culture=neutral, PublicKeyToken=null - - - $this - - - 28 - - - False - - - 276, 331 - - - 59, 20 - - - 107 - - - mavlinkNumericUpDownPSMX - - - ArdupilotMega.Controls.MavlinkNumericUpDown, ArdupilotMegaPlanner10, Version=1.1.4638.35097, Culture=neutral, PublicKeyToken=null - - - $this - - - 29 - - - True - - - False - - - 267, 357 - - - 66, 17 - - - 106 - - - Reverse - - - mavlinkCheckBoxPR - - - ArdupilotMega.Controls.MavlinkCheckBox, ArdupilotMegaPlanner10, Version=1.1.4638.35097, Culture=neutral, PublicKeyToken=null - - - $this - - - 30 - True Microsoft Sans Serif, 12pt + + NoControl + 352, 31 @@ -1062,6 +816,9 @@ Microsoft Sans Serif, 12pt + + NoControl + 251, 31 @@ -1089,6 +846,9 @@ True + + NoControl + 355, 84 @@ -1116,6 +876,9 @@ True + + NoControl + 355, 56 @@ -1140,57 +903,12 @@ 12 - - False - - - 385, 54 - - - 59, 20 - - - 123 - - - mavlinkNumericUpDownTAM - - - ArdupilotMega.Controls.MavlinkNumericUpDown, ArdupilotMegaPlanner10, Version=1.1.4638.35097, Culture=neutral, PublicKeyToken=null - - - $this - - - 13 - - - False - - - 385, 80 - - - 59, 20 - - - 122 - - - mavlinkNumericUpDownTAMX - - - ArdupilotMega.Controls.MavlinkNumericUpDown, ArdupilotMegaPlanner10, Version=1.1.4638.35097, Culture=neutral, PublicKeyToken=null - - - $this - - - 14 - True + + NoControl + 246, 84 @@ -1218,6 +936,9 @@ True + + NoControl + 246, 56 @@ -1242,84 +963,6 @@ 16 - - False - - - 276, 54 - - - 59, 20 - - - 119 - - - mavlinkNumericUpDownTSM - - - ArdupilotMega.Controls.MavlinkNumericUpDown, ArdupilotMegaPlanner10, Version=1.1.4638.35097, Culture=neutral, PublicKeyToken=null - - - $this - - - 17 - - - False - - - 276, 80 - - - 59, 20 - - - 118 - - - mavlinkNumericUpDownTSMX - - - ArdupilotMega.Controls.MavlinkNumericUpDown, ArdupilotMegaPlanner10, Version=1.1.4638.35097, Culture=neutral, PublicKeyToken=null - - - $this - - - 18 - - - True - - - False - - - 267, 106 - - - 66, 17 - - - 117 - - - Reverse - - - mavlinkCheckBoxTR - - - ArdupilotMega.Controls.MavlinkCheckBox, ArdupilotMegaPlanner10, Version=1.1.4638.35097, Culture=neutral, PublicKeyToken=null - - - $this - - - 19 - 71, 3 @@ -1383,36 +1026,15 @@ 6 - - False - - - 450, 54 - - - 83, 21 - - - 131 - - - CMB_inputch_tilt - - - ArdupilotMega.Controls.MavlinkComboBox, ArdupilotMegaPlanner10, Version=1.1.4638.35097, Culture=neutral, PublicKeyToken=null - - - $this - - - 5 - True Microsoft Sans Serif, 12pt + + NoControl + 453, 31 @@ -1443,6 +1065,9 @@ Microsoft Sans Serif, 12pt + + NoControl + 453, 158 @@ -1467,36 +1092,15 @@ 2 - - False - - - 450, 181 - - - 83, 21 - - - 133 - - - CMB_inputch_roll - - - ArdupilotMega.Controls.MavlinkComboBox, ArdupilotMegaPlanner10, Version=1.1.4638.35097, Culture=neutral, PublicKeyToken=null - - - $this - - - 3 - True Microsoft Sans Serif, 12pt + + NoControl + 453, 282 @@ -1537,7 +1141,7 @@ CMB_inputch_pan - ArdupilotMega.Controls.MavlinkComboBox, ArdupilotMegaPlanner10, Version=1.1.4638.35097, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MavlinkComboBox, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null $this @@ -1545,6 +1149,501 @@ 1 + + False + + + 450, 181 + + + 83, 21 + + + 133 + + + CMB_inputch_roll + + + ArdupilotMega.Controls.MavlinkComboBox, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null + + + $this + + + 3 + + + False + + + 450, 54 + + + 83, 21 + + + 131 + + + CMB_inputch_tilt + + + ArdupilotMega.Controls.MavlinkComboBox, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null + + + $this + + + 5 + + + False + + + 385, 54 + + + 59, 20 + + + 123 + + + mavlinkNumericUpDownTAM + + + ArdupilotMega.Controls.MavlinkNumericUpDown, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null + + + $this + + + 13 + + + False + + + 385, 80 + + + 59, 20 + + + 122 + + + mavlinkNumericUpDownTAMX + + + ArdupilotMega.Controls.MavlinkNumericUpDown, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null + + + $this + + + 14 + + + False + + + 276, 54 + + + 59, 20 + + + 119 + + + mavlinkNumericUpDownTSM + + + ArdupilotMega.Controls.MavlinkNumericUpDown, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null + + + $this + + + 17 + + + False + + + 276, 80 + + + 59, 20 + + + 118 + + + mavlinkNumericUpDownTSMX + + + ArdupilotMega.Controls.MavlinkNumericUpDown, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null + + + $this + + + 18 + + + True + + + False + + + NoControl + + + 267, 106 + + + 66, 17 + + + 117 + + + Reverse + + + mavlinkCheckBoxTR + + + ArdupilotMega.Controls.MavlinkCheckBox, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null + + + $this + + + 19 + + + False + + + 385, 305 + + + 59, 20 + + + 112 + + + mavlinkNumericUpDownPAM + + + ArdupilotMega.Controls.MavlinkNumericUpDown, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null + + + $this + + + 24 + + + False + + + 385, 331 + + + 59, 20 + + + 111 + + + mavlinkNumericUpDownPAMX + + + ArdupilotMega.Controls.MavlinkNumericUpDown, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null + + + $this + + + 25 + + + False + + + 276, 305 + + + 59, 20 + + + 108 + + + mavlinkNumericUpDownPSM + + + ArdupilotMega.Controls.MavlinkNumericUpDown, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null + + + $this + + + 28 + + + False + + + 276, 331 + + + 59, 20 + + + 107 + + + mavlinkNumericUpDownPSMX + + + ArdupilotMega.Controls.MavlinkNumericUpDown, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null + + + $this + + + 29 + + + True + + + False + + + NoControl + + + 267, 357 + + + 66, 17 + + + 106 + + + Reverse + + + mavlinkCheckBoxPR + + + ArdupilotMega.Controls.MavlinkCheckBox, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null + + + $this + + + 30 + + + False + + + 385, 181 + + + 59, 20 + + + 101 + + + mavlinkNumericUpDownRAM + + + ArdupilotMega.Controls.MavlinkNumericUpDown, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null + + + $this + + + 35 + + + False + + + 385, 207 + + + 59, 20 + + + 100 + + + mavlinkNumericUpDownRAMX + + + ArdupilotMega.Controls.MavlinkNumericUpDown, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null + + + $this + + + 36 + + + False + + + 276, 181 + + + 59, 20 + + + 97 + + + mavlinkNumericUpDownRSM + + + ArdupilotMega.Controls.MavlinkNumericUpDown, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null + + + $this + + + 39 + + + False + + + 276, 207 + + + 59, 20 + + + 96 + + + mavlinkNumericUpDownRSMX + + + ArdupilotMega.Controls.MavlinkNumericUpDown, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null + + + $this + + + 40 + + + True + + + False + + + NoControl + + + 267, 233 + + + 66, 17 + + + 95 + + + Reverse + + + mavlinkCheckBoxRR + + + ArdupilotMega.Controls.MavlinkCheckBox, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null + + + $this + + + 41 + + + Bottom, Left, Right + + + True + + + NoControl + + + 303, 402 + + + 138, 13 + + + 76 + + + Error Message of some kind + + + LBL_Error + + + ArdupilotMega.Controls.LabelWithPseudoOpacity, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null + + + $this + + + 46 + + + Bottom, Left, Right + + + NoControl + + + 264, 389 + + + 32, 32 + + + 75 + + + PBOX_WarningIcon + + + ArdupilotMega.Controls.PictureBoxWithPseudoOpacity, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null + + + $this + + + 47 + True diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/Setup.cs b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/Setup.cs index 08b547ecac..35fb5567f5 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/Setup.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/ConfigurationView/Setup.cs @@ -78,6 +78,8 @@ If you are just setting up 3DR radios, you may continue without connecting."); AddBackstageViewPage(new ConfigFriendlyParams { ParameterMode = ParameterMetaDataConstants.Advanced }, "Advanced Params", tunningpage); AddBackstageViewPage(new ConfigRawParams(), "Adv Parameter List", tunningpage); + // AddBackstageViewPage(new ConfigParamParams() { ParameterMode = ParameterMetaDataConstants.Standard }, "Camera Gimbal Adv"); + /******************************HELI **************************/ if (MainV2.comPort.param["H_GYR_ENABLE"] != null) // heli { diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs index da3fb59f0e..e42af35562 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.Designer.cs @@ -14,6 +14,7 @@ this.goHereToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.flyToHereAltToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.pointCameraHereToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.triggerCameraToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.flightPlannerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.MainH = new System.Windows.Forms.SplitContainer(); this.SubMainLeft = new System.Windows.Forms.SplitContainer(); @@ -120,6 +121,7 @@ this.goHereToolStripMenuItem, this.flyToHereAltToolStripMenuItem, this.pointCameraHereToolStripMenuItem, + this.triggerCameraToolStripMenuItem, this.flightPlannerToolStripMenuItem}); this.contextMenuStripMap.Name = "contextMenuStrip1"; resources.ApplyResources(this.contextMenuStripMap, "contextMenuStripMap"); @@ -142,6 +144,12 @@ resources.ApplyResources(this.pointCameraHereToolStripMenuItem, "pointCameraHereToolStripMenuItem"); this.pointCameraHereToolStripMenuItem.Click += new System.EventHandler(this.pointCameraHereToolStripMenuItem_Click); // + // triggerCameraToolStripMenuItem + // + this.triggerCameraToolStripMenuItem.Name = "triggerCameraToolStripMenuItem"; + resources.ApplyResources(this.triggerCameraToolStripMenuItem, "triggerCameraToolStripMenuItem"); + this.triggerCameraToolStripMenuItem.Click += new System.EventHandler(this.triggerCameraToolStripMenuItem_Click); + // // flightPlannerToolStripMenuItem // this.flightPlannerToolStripMenuItem.Name = "flightPlannerToolStripMenuItem"; @@ -1442,6 +1450,7 @@ private Controls.MyButton BUT_ARM; private Controls.ModifyandSet modifyandSetAlt; private Controls.ModifyandSet modifyandSetSpeed; + private System.Windows.Forms.ToolStripMenuItem triggerCameraToolStripMenuItem; } } \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs index 502538cc4f..f3f3c9bfe0 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.cs @@ -476,7 +476,7 @@ namespace ArdupilotMega.GCSViews comPort.requestDatastream((byte)ArdupilotMega.MAVLink.MAV_DATA_STREAM.RAW_SENSORS, MainV2.cs.ratesensors); // request raw sensor comPort.requestDatastream((byte)ArdupilotMega.MAVLink.MAV_DATA_STREAM.RC_CHANNELS, MainV2.cs.raterc); // request rc info } - catch { } + catch { log.Error("Failed to request rates"); } lastdata = DateTime.Now.AddSeconds(120); // prevent flooding } @@ -498,7 +498,7 @@ namespace ArdupilotMega.GCSViews aviwriter.avi_end(hud1.Width, hud1.Height, 10); } } - catch { } + catch { log.Error("Failed to write avi"); } if (MainV2.comPort.logreadmode && MainV2.comPort.logplaybackfile != null) { @@ -511,7 +511,7 @@ namespace ArdupilotMega.GCSViews { MainV2.comPort.logplaybackfile.Close(); } - catch { } + catch { log.Error("Failed to close logfile"); } MainV2.comPort.logplaybackfile = null; } @@ -520,8 +520,12 @@ namespace ArdupilotMega.GCSViews if (updatescreen.AddMilliseconds(300) < DateTime.Now) { - updatePlayPauseButton(true); - updateLogPlayPosition(); + try + { + updatePlayPauseButton(true); + updateLogPlayPosition(); + } + catch { log.Error("Failed to update log playback pos"); } updatescreen = DateTime.Now; } @@ -532,7 +536,7 @@ namespace ArdupilotMega.GCSViews { MainV2.comPort.readPacket(); } - catch { } + catch { log.Error("Failed to read log packet"); } double act = (MainV2.comPort.lastlogread - logplayback).TotalMilliseconds; @@ -2535,5 +2539,14 @@ print 'Roll complete' { } + + private void triggerCameraToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + MainV2.comPort.setDigicamControl(true); + } + catch { CustomMessageBox.Show("Error sending command"); } + } } } diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx index 6ddcb1392e..8376148672 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightData.resx @@ -122,31 +122,37 @@ - 174, 22 + 188, 22 Fly To Here - 174, 22 + 188, 22 Fly To Here Alt - 174, 22 + 188, 22 Point Camera Here + + 188, 22 + + + Trigger Camera NOW + - 174, 22 + 188, 22 Flight Planner - 175, 92 + 189, 136 contextMenuStripMap @@ -216,7 +222,7 @@ User Items - 177, 158 + 177, 136 contextMenuStripHud @@ -244,7 +250,7 @@ hud1 - ArdupilotMega.Controls.HUD, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.HUD, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null SubMainLeft.Panel1 @@ -283,7 +289,7 @@ quickView6 - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null tabQuick @@ -307,7 +313,7 @@ quickView5 - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null tabQuick @@ -331,7 +337,7 @@ quickView4 - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null tabQuick @@ -355,7 +361,7 @@ quickView3 - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null tabQuick @@ -379,7 +385,7 @@ quickView2 - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null tabQuick @@ -409,7 +415,7 @@ quickView1 - ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.QuickView, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null tabQuick @@ -457,7 +463,7 @@ modifyandSetSpeed - ArdupilotMega.Controls.ModifyandSet, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.ModifyandSet, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null tabActions @@ -478,7 +484,7 @@ modifyandSetAlt - ArdupilotMega.Controls.ModifyandSet, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.ModifyandSet, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null tabActions @@ -511,7 +517,7 @@ BUT_ARM - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null tabActions @@ -538,7 +544,7 @@ BUT_script - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null tabActions @@ -568,7 +574,7 @@ BUT_joystick - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null tabActions @@ -598,7 +604,7 @@ BUT_quickmanual - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null tabActions @@ -628,7 +634,7 @@ BUT_quickrtl - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null tabActions @@ -658,7 +664,7 @@ BUT_quickauto - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null tabActions @@ -712,7 +718,7 @@ BUT_setwp - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null tabActions @@ -763,7 +769,7 @@ BUT_setmode - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null tabActions @@ -793,7 +799,7 @@ BUT_clear_track - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null tabActions @@ -844,7 +850,7 @@ BUT_Homealt - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null tabActions @@ -874,7 +880,7 @@ BUT_RAWSensor - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null tabActions @@ -904,7 +910,7 @@ BUTrestartmission - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null tabActions @@ -934,7 +940,7 @@ BUTactiondo - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null tabActions @@ -988,7 +994,7 @@ Gvspeed - AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null tabGauges @@ -1018,7 +1024,7 @@ Gheading - ArdupilotMega.Controls.HSI, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.HSI, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null tabGauges @@ -1048,7 +1054,7 @@ Galt - AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null tabGauges @@ -1081,7 +1087,7 @@ Gspeed - AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + AGaugeApp.AGauge, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null tabGauges @@ -1165,7 +1171,7 @@ lbl_playbackspeed - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null tabTLogs @@ -1192,7 +1198,7 @@ lbl_logpercent - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null tabTLogs @@ -1219,7 +1225,7 @@ NUM_playbackspeed - ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null tabTLogs @@ -1246,7 +1252,7 @@ BUT_log2kml - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null tabTLogs @@ -1300,7 +1306,7 @@ BUT_playlog - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null tabTLogs @@ -1327,7 +1333,7 @@ BUT_loadtelem - ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null tabTLogs @@ -1513,7 +1519,7 @@ lbl_winddir - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -1543,7 +1549,7 @@ lbl_windvel - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -1576,7 +1582,7 @@ lbl_hdop - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -1609,7 +1615,7 @@ lbl_sats - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -1781,7 +1787,7 @@ gMapControl1 - ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null splitContainer1.Panel2 @@ -1844,7 +1850,7 @@ TXT_lat - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null panel1 @@ -1901,7 +1907,7 @@ label1 - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null panel1 @@ -1931,7 +1937,7 @@ TXT_long - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null panel1 @@ -1961,7 +1967,7 @@ TXT_alt - ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null panel1 @@ -2150,13 +2156,13 @@ 714, 17 - 152, 22 + 102, 22 Reset - 153, 48 + 103, 26 contextMenuStripDockContainer @@ -2194,6 +2200,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + triggerCameraToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + flightPlannerToolStripMenuItem @@ -2276,6 +2288,6 @@ FlightData - System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner10, Version=1.1.4691.24648, Culture=neutral, PublicKeyToken=null + System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner10, Version=1.1.4695.13950, Culture=neutral, PublicKeyToken=null \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.cs b/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.cs index de9a73d391..873d016ca0 100644 --- a/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.cs +++ b/Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.cs @@ -1921,7 +1921,7 @@ namespace ArdupilotMega.GCSViews MainMap.Invalidate(false); int answer; - if (item.Tag != null && int.TryParse(item.Tag.ToString(), out answer)) + if (item.Tag != null && rc.InnerMarker != null && int.TryParse(rc.InnerMarker.Tag.ToString(), out answer)) { try { diff --git a/Tools/ArdupilotMegaPlanner/MainV2.cs b/Tools/ArdupilotMegaPlanner/MainV2.cs index 615802e258..5776aa5bb5 100644 --- a/Tools/ArdupilotMegaPlanner/MainV2.cs +++ b/Tools/ArdupilotMegaPlanner/MainV2.cs @@ -260,14 +260,15 @@ namespace ArdupilotMega // preload Python.CreateEngine(); } - catch (ArgumentException e) { - //http://www.microsoft.com/en-us/download/details.aspx?id=16083 - //System.ArgumentException: Font 'Arial' does not support style 'Regular'. + catch (ArgumentException e) + { + //http://www.microsoft.com/en-us/download/details.aspx?id=16083 + //System.ArgumentException: Font 'Arial' does not support style 'Regular'. - log.Fatal(e); - CustomMessageBox.Show(e.ToString() + "\n\n Please install this http://www.microsoft.com/en-us/download/details.aspx?id=16083"); - this.Close(); - } + log.Fatal(e); + CustomMessageBox.Show(e.ToString() + "\n\n Please install this http://www.microsoft.com/en-us/download/details.aspx?id=16083"); + this.Close(); + } catch (Exception e) { log.Fatal(e); CustomMessageBox.Show("A Major error has occured : " + e.ToString()); this.Close(); } if (MainV2.config["CHK_GDIPlus"] != null) @@ -388,14 +389,14 @@ namespace ArdupilotMega { // If the form has been closed, or never shown before, we need all new stuff this.connectionStatsForm = new Form - { - Width = 430, - Height = 180, - MaximizeBox = false, - MinimizeBox = false, - FormBorderStyle = FormBorderStyle.FixedDialog, - Text = "Link Stats" - }; + { + Width = 430, + Height = 180, + MaximizeBox = false, + MinimizeBox = false, + FormBorderStyle = FormBorderStyle.FixedDialog, + Text = "Link Stats" + }; // Change the connection stats control, so that when/if the connection stats form is showing, // there will be something to see this.connectionStatsForm.Controls.Clear(); @@ -685,7 +686,7 @@ namespace ArdupilotMega } } catch (Exception exp3) { log.Error(exp3); } - MessageBox.Show("Can not establish a connection\n\n" + ex.Message); + CustomMessageBox.Show("Can not establish a connection\n\n" + ex.Message); return; } } @@ -1475,7 +1476,7 @@ namespace ArdupilotMega foreach (var point in MainV2.comPort.wps.Values) { - coords.Add(new SharpKml.Base.Vector(point.x, point.y, point.z)); + coords.Add(new SharpKml.Base.Vector(point.x, point.y, point.z)); } SharpKml.Dom.LineString ls = new SharpKml.Dom.LineString(); @@ -2005,7 +2006,7 @@ namespace ArdupilotMega } } catch { } - // log.Debug(file + " " + bytes); + // log.Debug(file + " " + bytes); int len = dataStream.Read(buf1, 0, 1024); if (len == 0) break; @@ -2292,8 +2293,8 @@ namespace ArdupilotMega private void MainV2_MouseMove(object sender, MouseEventArgs e) { - // if (e.Y < 50) - // MainMenu.Visible = true; + // if (e.Y < 50) + // MainMenu.Visible = true; } } } \ No newline at end of file diff --git a/Tools/ArdupilotMegaPlanner/Mavlink/MAVLink.cs b/Tools/ArdupilotMegaPlanner/Mavlink/MAVLink.cs index 4fbceead88..726afafc94 100644 --- a/Tools/ArdupilotMegaPlanner/Mavlink/MAVLink.cs +++ b/Tools/ArdupilotMegaPlanner/Mavlink/MAVLink.cs @@ -2068,6 +2068,24 @@ namespace ArdupilotMega MainV2.giveComport = false; } + public void setDigicamConfigure() + { + // not implmented + } + + public void setDigicamControl(bool shot) + { + mavlink_digicam_control_t req = new mavlink_digicam_control_t(); + + req.target_system = sysid; + req.target_component = compid; + req.shot = (shot == true) ? (byte)1 : (byte)0; + + generatePacket(MAVLINK_MSG_ID_DIGICAM_CONTROL, req); + System.Threading.Thread.Sleep(20); + generatePacket(MAVLINK_MSG_ID_DIGICAM_CONTROL, req); + } + public void setMountConfigure(MAV_MOUNT_MODE mountmode, bool stabroll, bool stabpitch, bool stabyaw) { mavlink_mount_configure_t req = new mavlink_mount_configure_t(); diff --git a/Tools/ArdupilotMegaPlanner/Msi/installer.wxs b/Tools/ArdupilotMegaPlanner/Msi/installer.wxs index 1ac44ae82b..110a74e1fc 100644 --- a/Tools/ArdupilotMegaPlanner/Msi/installer.wxs +++ b/Tools/ArdupilotMegaPlanner/Msi/installer.wxs @@ -2,14 +2,14 @@ - + - + - - + + @@ -31,252 +31,235 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - + + + + - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + + + + - - - - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - + + + + - + - + + + @@ -287,23 +270,26 @@ + + + + + + NOT + Installed AND NOT VersionNT64 + NOT + Installed AND VersionNT64 + + - - - + - - - - - + - - - - @@ -312,32 +298,30 @@ - - - - - - - + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + - @@ -349,10 +333,10 @@ Event="DoAction" Value="LaunchApplication">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed - + - + - + - + @@ -210,10 +210,12 @@ namespace wix { string data = @" - + - + + + @@ -224,23 +226,26 @@ namespace wix + + + + + + NOT + Installed AND NOT VersionNT64 + NOT + Installed AND VersionNT64 + + - - - + - - - - - + - - - - @@ -260,7 +265,6 @@ data = @" - @@ -272,7 +276,7 @@ data = @" Event=""DoAction"" Value=""LaunchApplication"">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed - + @@ -310,7 +314,7 @@ data = @" no++; - if (filepath.EndsWith("ArdupilotMegaPlanner.exe")) { + if (filepath.EndsWith("ArdupilotMegaPlanner10.exe")) { mainexeid = "_" + no; sw.WriteLine(" ");