mirror of https://github.com/ArduPilot/ardupilot
APM Planner 1.1.92
add dump -1 option to log dump fix terminal issue with logs fix mavlink 1.0 manual/stablaize Mode fix config screen showing incorrect tab
This commit is contained in:
Michael Oborne
parent
25c17a5425
commit
297f391548
|
|
@ -58,7 +58,7 @@ namespace ArdupilotMega.Antenna
|
|||
}
|
||||
public bool Setup()
|
||||
{
|
||||
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
@ -96,7 +96,7 @@ namespace ArdupilotMega.Antenna
|
|||
// conver the angle into a 0-pwmrange value
|
||||
int target = (int)((((PointAtAngle / range) * 2.0) * (PanPWMRange / 2) * _panreverse + centerpos));
|
||||
|
||||
// Console.WriteLine("P " + Angle + " " + target + " " + PointAtAngle);
|
||||
// Console.WriteLine("P " + Angle + " " + target + " " + PointAtAngle);
|
||||
|
||||
currentpan = target;
|
||||
|
||||
|
|
@ -111,7 +111,7 @@ namespace ArdupilotMega.Antenna
|
|||
|
||||
int target = (int)((((PointAtAngle / range) * 2.0) * (TiltPWMRange / 2) * _tiltreverse + 1500));
|
||||
|
||||
// Console.WriteLine("T " + Angle + " " + target + " " + PointAtAngle);
|
||||
// Console.WriteLine("T " + Angle + " " + target + " " + PointAtAngle);
|
||||
|
||||
currenttilt = target;
|
||||
|
||||
|
|
@ -152,4 +152,4 @@ namespace ArdupilotMega.Antenna
|
|||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -26,7 +26,7 @@ namespace ArdupilotMega.Antenna
|
|||
bool Setup();
|
||||
bool Pan(double Angle);
|
||||
bool Tilt(double Angle);
|
||||
bool PanAndTilt(double Pan,double Tilt);
|
||||
bool PanAndTilt(double Pan, double Tilt);
|
||||
bool Close();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ namespace ArdupilotMega.Antenna
|
|||
public int PanPWMRange { get; set; }
|
||||
public int TiltPWMRange { get; set; }
|
||||
|
||||
public bool PanReverse { get { return _panreverse == -1; } set { _panreverse = value == true ? -1 : 1 ; } }
|
||||
public bool PanReverse { get { return _panreverse == -1; } set { _panreverse = value == true ? -1 : 1; } }
|
||||
public bool TiltReverse { get { return _tiltreverse == -1; } set { _tiltreverse = value == true ? -1 : 1; } }
|
||||
|
||||
int _panreverse = 1;
|
||||
|
|
@ -52,11 +52,11 @@ namespace ArdupilotMega.Antenna
|
|||
{
|
||||
ComPort.Open();
|
||||
}
|
||||
catch (Exception ex) { System.Windows.Forms.CustomMessageBox.Show("Connect failed " + ex.Message,"Error"); return false; }
|
||||
catch (Exception ex) { System.Windows.Forms.CustomMessageBox.Show("Connect failed " + ex.Message, "Error"); return false; }
|
||||
|
||||
return true;
|
||||
}
|
||||
public bool Setup()
|
||||
public bool Setup()
|
||||
{
|
||||
int target = 100;
|
||||
// speed
|
||||
|
|
@ -86,7 +86,7 @@ namespace ArdupilotMega.Antenna
|
|||
return input;
|
||||
}
|
||||
|
||||
double wrap_range(double input,double range)
|
||||
double wrap_range(double input, double range)
|
||||
{
|
||||
if (input > range)
|
||||
return input - 360;
|
||||
|
|
@ -112,10 +112,10 @@ namespace ArdupilotMega.Antenna
|
|||
|
||||
Console.WriteLine("P " + Angle + " " + target + " " + PointAtAngle);
|
||||
|
||||
var buffer = new byte[] { 0xff,PanAddress,target};
|
||||
var buffer = new byte[] { 0xff, PanAddress, target };
|
||||
ComPort.Write(buffer, 0, buffer.Length);
|
||||
|
||||
return true;
|
||||
return true;
|
||||
}
|
||||
|
||||
public bool Tilt(double Angle)
|
||||
|
|
@ -124,14 +124,14 @@ namespace ArdupilotMega.Antenna
|
|||
|
||||
short PointAtAngle = Constrain((Angle - TrimTilt), TiltStartRange, TiltEndRange);
|
||||
|
||||
byte target = (byte)((((PointAtAngle / range ) * 2) * 127 + 127) * _tiltreverse);
|
||||
byte target = (byte)((((PointAtAngle / range) * 2) * 127 + 127) * _tiltreverse);
|
||||
|
||||
//Console.WriteLine("T " + Angle + " " + target + " " + PointAtAngle);
|
||||
|
||||
var buffer = new byte[] { 0xff, TiltAddress, target };
|
||||
ComPort.Write(buffer, 0, buffer.Length);
|
||||
|
||||
return true;
|
||||
return true;
|
||||
}
|
||||
|
||||
public bool PanAndTilt(double pan, double tilt)
|
||||
|
|
|
|||
|
|
@ -315,6 +315,32 @@ namespace ArdupilotMega.Arduino
|
|||
return true;
|
||||
}
|
||||
|
||||
public byte getChipType(byte part = 0)
|
||||
{
|
||||
byte answer = 0x00;
|
||||
|
||||
byte[] command = new byte[] { (byte)'V', 0x30, 0x01, part, 0x01, (byte)' ' };
|
||||
this.Write(command, 0, command.Length);
|
||||
|
||||
byte[] chr = new byte[1];
|
||||
|
||||
this.Read(chr, 0, 1);
|
||||
|
||||
if (chr[0] == 0x14)
|
||||
{
|
||||
this.Read(chr, 0, 1);
|
||||
answer = (byte)chr[0];
|
||||
|
||||
this.Read(chr, 0, 1);
|
||||
if (chr[0] == 0x10)
|
||||
{
|
||||
return answer;
|
||||
}
|
||||
}
|
||||
|
||||
return answer;
|
||||
}
|
||||
|
||||
public new bool Close()
|
||||
{
|
||||
try
|
||||
|
|
|
|||
|
|
@ -249,10 +249,10 @@ namespace ArdupilotMega.Controls.BackstageView
|
|||
{
|
||||
// deactivate the old page
|
||||
_activePage.Page.Close();
|
||||
// Pages.ForEach(x =>
|
||||
// {
|
||||
// x.Page.Visible = false;
|
||||
// });
|
||||
Pages.ForEach(x =>
|
||||
{
|
||||
x.Page.Visible = false;
|
||||
});
|
||||
|
||||
// deactivate button
|
||||
_activePage.Page.Visible = false;
|
||||
|
|
|
|||
|
|
@ -1253,7 +1253,10 @@ namespace ArdupilotMega.GCSViews
|
|||
{
|
||||
((Button)sender).Enabled = false;
|
||||
#if MAVLINK10
|
||||
MainV2.comPort.setMode("Manual");
|
||||
if (MainV2.cs.firmware == MainV2.Firmwares.ArduPlane)
|
||||
MainV2.comPort.setMode("Manual");
|
||||
if (MainV2.cs.firmware == MainV2.Firmwares.ArduCopter2)
|
||||
MainV2.comPort.setMode("Stabilize");
|
||||
#else
|
||||
comPort.doAction(MAVLink.MAV_ACTION.MAV_ACTION_SET_MANUAL);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -226,7 +226,7 @@
|
|||
<value>hud1</value>
|
||||
</data>
|
||||
<data name=">>hud1.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.HUD, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.HUD, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>hud1.Parent" xml:space="preserve">
|
||||
<value>SubMainLeft.Panel1</value>
|
||||
|
|
@ -265,7 +265,7 @@
|
|||
<value>BUT_script</value>
|
||||
</data>
|
||||
<data name=">>BUT_script.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_script.Parent" xml:space="preserve">
|
||||
<value>tabActions</value>
|
||||
|
|
@ -298,7 +298,7 @@
|
|||
<value>BUT_joystick</value>
|
||||
</data>
|
||||
<data name=">>BUT_joystick.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_joystick.Parent" xml:space="preserve">
|
||||
<value>tabActions</value>
|
||||
|
|
@ -328,7 +328,7 @@
|
|||
<value>BUT_quickmanual</value>
|
||||
</data>
|
||||
<data name=">>BUT_quickmanual.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_quickmanual.Parent" xml:space="preserve">
|
||||
<value>tabActions</value>
|
||||
|
|
@ -358,7 +358,7 @@
|
|||
<value>BUT_quickrtl</value>
|
||||
</data>
|
||||
<data name=">>BUT_quickrtl.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_quickrtl.Parent" xml:space="preserve">
|
||||
<value>tabActions</value>
|
||||
|
|
@ -388,7 +388,7 @@
|
|||
<value>BUT_quickauto</value>
|
||||
</data>
|
||||
<data name=">>BUT_quickauto.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_quickauto.Parent" xml:space="preserve">
|
||||
<value>tabActions</value>
|
||||
|
|
@ -442,7 +442,7 @@
|
|||
<value>BUT_setwp</value>
|
||||
</data>
|
||||
<data name=">>BUT_setwp.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_setwp.Parent" xml:space="preserve">
|
||||
<value>tabActions</value>
|
||||
|
|
@ -493,7 +493,7 @@
|
|||
<value>BUT_setmode</value>
|
||||
</data>
|
||||
<data name=">>BUT_setmode.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_setmode.Parent" xml:space="preserve">
|
||||
<value>tabActions</value>
|
||||
|
|
@ -523,7 +523,7 @@
|
|||
<value>BUT_clear_track</value>
|
||||
</data>
|
||||
<data name=">>BUT_clear_track.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_clear_track.Parent" xml:space="preserve">
|
||||
<value>tabActions</value>
|
||||
|
|
@ -574,7 +574,7 @@
|
|||
<value>BUT_Homealt</value>
|
||||
</data>
|
||||
<data name=">>BUT_Homealt.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_Homealt.Parent" xml:space="preserve">
|
||||
<value>tabActions</value>
|
||||
|
|
@ -604,7 +604,7 @@
|
|||
<value>BUT_RAWSensor</value>
|
||||
</data>
|
||||
<data name=">>BUT_RAWSensor.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_RAWSensor.Parent" xml:space="preserve">
|
||||
<value>tabActions</value>
|
||||
|
|
@ -634,7 +634,7 @@
|
|||
<value>BUTrestartmission</value>
|
||||
</data>
|
||||
<data name=">>BUTrestartmission.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUTrestartmission.Parent" xml:space="preserve">
|
||||
<value>tabActions</value>
|
||||
|
|
@ -664,7 +664,7 @@
|
|||
<value>BUTactiondo</value>
|
||||
</data>
|
||||
<data name=">>BUTactiondo.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUTactiondo.Parent" xml:space="preserve">
|
||||
<value>tabActions</value>
|
||||
|
|
@ -718,7 +718,7 @@
|
|||
<value>Gvspeed</value>
|
||||
</data>
|
||||
<data name=">>Gvspeed.Type" xml:space="preserve">
|
||||
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>Gvspeed.Parent" xml:space="preserve">
|
||||
<value>tabGauges</value>
|
||||
|
|
@ -748,7 +748,7 @@
|
|||
<value>Gheading</value>
|
||||
</data>
|
||||
<data name=">>Gheading.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.HSI, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.HSI, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>Gheading.Parent" xml:space="preserve">
|
||||
<value>tabGauges</value>
|
||||
|
|
@ -778,7 +778,7 @@
|
|||
<value>Galt</value>
|
||||
</data>
|
||||
<data name=">>Galt.Type" xml:space="preserve">
|
||||
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>Galt.Parent" xml:space="preserve">
|
||||
<value>tabGauges</value>
|
||||
|
|
@ -811,7 +811,7 @@
|
|||
<value>Gspeed</value>
|
||||
</data>
|
||||
<data name=">>Gspeed.Type" xml:space="preserve">
|
||||
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>AGaugeApp.AGauge, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>Gspeed.Parent" xml:space="preserve">
|
||||
<value>tabGauges</value>
|
||||
|
|
@ -895,7 +895,7 @@
|
|||
<value>lbl_playbackspeed</value>
|
||||
</data>
|
||||
<data name=">>lbl_playbackspeed.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>lbl_playbackspeed.Parent" xml:space="preserve">
|
||||
<value>tabTLogs</value>
|
||||
|
|
@ -922,7 +922,7 @@
|
|||
<value>lbl_logpercent</value>
|
||||
</data>
|
||||
<data name=">>lbl_logpercent.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>lbl_logpercent.Parent" xml:space="preserve">
|
||||
<value>tabTLogs</value>
|
||||
|
|
@ -949,7 +949,7 @@
|
|||
<value>NUM_playbackspeed</value>
|
||||
</data>
|
||||
<data name=">>NUM_playbackspeed.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyTrackBar, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>NUM_playbackspeed.Parent" xml:space="preserve">
|
||||
<value>tabTLogs</value>
|
||||
|
|
@ -976,7 +976,7 @@
|
|||
<value>BUT_log2kml</value>
|
||||
</data>
|
||||
<data name=">>BUT_log2kml.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_log2kml.Parent" xml:space="preserve">
|
||||
<value>tabTLogs</value>
|
||||
|
|
@ -1030,7 +1030,7 @@
|
|||
<value>BUT_playlog</value>
|
||||
</data>
|
||||
<data name=">>BUT_playlog.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_playlog.Parent" xml:space="preserve">
|
||||
<value>tabTLogs</value>
|
||||
|
|
@ -1057,7 +1057,7 @@
|
|||
<value>BUT_loadtelem</value>
|
||||
</data>
|
||||
<data name=">>BUT_loadtelem.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_loadtelem.Parent" xml:space="preserve">
|
||||
<value>tabTLogs</value>
|
||||
|
|
@ -1246,7 +1246,7 @@
|
|||
<value>lbl_hdop</value>
|
||||
</data>
|
||||
<data name=">>lbl_hdop.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>lbl_hdop.Parent" xml:space="preserve">
|
||||
<value>splitContainer1.Panel2</value>
|
||||
|
|
@ -1279,7 +1279,7 @@
|
|||
<value>lbl_sats</value>
|
||||
</data>
|
||||
<data name=">>lbl_sats.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>lbl_sats.Parent" xml:space="preserve">
|
||||
<value>splitContainer1.Panel2</value>
|
||||
|
|
@ -1309,7 +1309,7 @@
|
|||
<value>lbl_winddir</value>
|
||||
</data>
|
||||
<data name=">>lbl_winddir.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>lbl_winddir.Parent" xml:space="preserve">
|
||||
<value>splitContainer1.Panel2</value>
|
||||
|
|
@ -1339,7 +1339,7 @@
|
|||
<value>lbl_windvel</value>
|
||||
</data>
|
||||
<data name=">>lbl_windvel.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>lbl_windvel.Parent" xml:space="preserve">
|
||||
<value>splitContainer1.Panel2</value>
|
||||
|
|
@ -1511,7 +1511,7 @@
|
|||
<value>gMapControl1</value>
|
||||
</data>
|
||||
<data name=">>gMapControl1.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.myGMAP, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>gMapControl1.Parent" xml:space="preserve">
|
||||
<value>splitContainer1.Panel2</value>
|
||||
|
|
@ -1574,7 +1574,7 @@
|
|||
<value>TXT_lat</value>
|
||||
</data>
|
||||
<data name=">>TXT_lat.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>TXT_lat.Parent" xml:space="preserve">
|
||||
<value>panel1</value>
|
||||
|
|
@ -1631,7 +1631,7 @@
|
|||
<value>label1</value>
|
||||
</data>
|
||||
<data name=">>label1.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>label1.Parent" xml:space="preserve">
|
||||
<value>panel1</value>
|
||||
|
|
@ -1661,7 +1661,7 @@
|
|||
<value>TXT_long</value>
|
||||
</data>
|
||||
<data name=">>TXT_long.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>TXT_long.Parent" xml:space="preserve">
|
||||
<value>panel1</value>
|
||||
|
|
@ -1691,7 +1691,7 @@
|
|||
<value>TXT_alt</value>
|
||||
</data>
|
||||
<data name=">>TXT_alt.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>TXT_alt.Parent" xml:space="preserve">
|
||||
<value>panel1</value>
|
||||
|
|
@ -1892,7 +1892,7 @@
|
|||
<value>label6</value>
|
||||
</data>
|
||||
<data name=">>label6.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ArdupilotMega.Controls.MyLabel, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>label6.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
|
|
@ -1988,6 +1988,6 @@
|
|||
<value>FlightData</value>
|
||||
</data>
|
||||
<data name=">>$this.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner, Version=1.1.4533.36755, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>System.Windows.Forms.MyUserControl, ArdupilotMegaPlanner, Version=1.1.4538.28387, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
</root>
|
||||
|
|
@ -53,6 +53,8 @@ namespace ArdupilotMega.GCSViews
|
|||
{
|
||||
a++;
|
||||
}
|
||||
if (a == (buffer.Length-1))
|
||||
break;
|
||||
}
|
||||
|
||||
addText(ASCIIEncoding.ASCII.GetString(buffer,0,a+1));
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@
|
|||
this.TXT_status = new System.Windows.Forms.TextBox();
|
||||
this.BUT_redokml = new ArdupilotMega.Controls.MyButton();
|
||||
this.BUT_firstperson = new ArdupilotMega.Controls.MyButton();
|
||||
this.BUT_dumpdf = new ArdupilotMega.Controls.MyButton();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// TXT_seriallog
|
||||
|
|
@ -92,10 +93,18 @@
|
|||
this.BUT_firstperson.UseVisualStyleBackColor = true;
|
||||
this.BUT_firstperson.Click += new System.EventHandler(this.BUT_firstperson_Click);
|
||||
//
|
||||
// BUT_dumpdf
|
||||
//
|
||||
resources.ApplyResources(this.BUT_dumpdf, "BUT_dumpdf");
|
||||
this.BUT_dumpdf.Name = "BUT_dumpdf";
|
||||
this.BUT_dumpdf.UseVisualStyleBackColor = true;
|
||||
this.BUT_dumpdf.Click += new System.EventHandler(this.BUT_dumpdf_Click);
|
||||
//
|
||||
// Log
|
||||
//
|
||||
resources.ApplyResources(this, "$this");
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.Controls.Add(this.BUT_dumpdf);
|
||||
this.Controls.Add(this.BUT_firstperson);
|
||||
this.Controls.Add(this.BUT_redokml);
|
||||
this.Controls.Add(this.TXT_status);
|
||||
|
|
@ -122,5 +131,6 @@
|
|||
private ArdupilotMega.Controls.MyButton BUT_redokml;
|
||||
private System.Windows.Forms.TextBox TXT_seriallog;
|
||||
private ArdupilotMega.Controls.MyButton BUT_firstperson;
|
||||
private Controls.MyButton BUT_dumpdf;
|
||||
}
|
||||
}
|
||||
|
|
@ -1014,5 +1014,18 @@ namespace ArdupilotMega
|
|||
cmd.Clear();
|
||||
}
|
||||
|
||||
private void BUT_dumpdf_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (status == serialstatus.Done)
|
||||
{
|
||||
// add -1 entry
|
||||
CHK_logs.Items.Add(-1, true);
|
||||
|
||||
System.Threading.Thread t11 = new System.Threading.Thread(delegate() { downloadsinglethread(); });
|
||||
t11.Name = "Log download single thread";
|
||||
t11.Start();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -141,7 +141,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>TXT_seriallog.ZOrder" xml:space="preserve">
|
||||
<value>7</value>
|
||||
<value>8</value>
|
||||
</data>
|
||||
<data name="BUT_DLall.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>13, 13</value>
|
||||
|
|
@ -159,13 +159,13 @@
|
|||
<value>BUT_DLall</value>
|
||||
</data>
|
||||
<data name=">>BUT_DLall.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4537.26254, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_DLall.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>BUT_DLall.ZOrder" xml:space="preserve">
|
||||
<value>6</value>
|
||||
<value>7</value>
|
||||
</data>
|
||||
<data name="BUT_DLthese.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>13, 43</value>
|
||||
|
|
@ -183,13 +183,13 @@
|
|||
<value>BUT_DLthese</value>
|
||||
</data>
|
||||
<data name=">>BUT_DLthese.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4537.26254, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_DLthese.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>BUT_DLthese.ZOrder" xml:space="preserve">
|
||||
<value>5</value>
|
||||
<value>6</value>
|
||||
</data>
|
||||
<data name="BUT_clearlogs.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>13, 187</value>
|
||||
|
|
@ -207,13 +207,13 @@
|
|||
<value>BUT_clearlogs</value>
|
||||
</data>
|
||||
<data name=">>BUT_clearlogs.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4537.26254, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_clearlogs.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>BUT_clearlogs.ZOrder" xml:space="preserve">
|
||||
<value>4</value>
|
||||
<value>5</value>
|
||||
</data>
|
||||
<data name="CHK_logs.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>13, 72</value>
|
||||
|
|
@ -234,7 +234,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>CHK_logs.ZOrder" xml:space="preserve">
|
||||
<value>3</value>
|
||||
<value>4</value>
|
||||
</data>
|
||||
<data name="TXT_status.Enabled" type="System.Boolean, mscorlib">
|
||||
<value>False</value>
|
||||
|
|
@ -258,7 +258,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>TXT_status.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name="BUT_redokml.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>13, 311</value>
|
||||
|
|
@ -276,13 +276,13 @@
|
|||
<value>BUT_redokml</value>
|
||||
</data>
|
||||
<data name=">>BUT_redokml.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4537.26254, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_redokml.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>BUT_redokml.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="BUT_firstperson.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>13, 282</value>
|
||||
|
|
@ -300,12 +300,40 @@
|
|||
<value>BUT_firstperson</value>
|
||||
</data>
|
||||
<data name=">>BUT_firstperson.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ff91852278f5092c</value>
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4537.26254, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_firstperson.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>BUT_firstperson.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<data name="BUT_dumpdf.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="BUT_dumpdf.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>12, 243</value>
|
||||
</data>
|
||||
<data name="BUT_dumpdf.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>116, 33</value>
|
||||
</data>
|
||||
<data name="BUT_dumpdf.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>10</value>
|
||||
</data>
|
||||
<data name="BUT_dumpdf.Text" xml:space="preserve">
|
||||
<value>(adv) Dump All DF</value>
|
||||
</data>
|
||||
<data name=">>BUT_dumpdf.Name" xml:space="preserve">
|
||||
<value>BUT_dumpdf</value>
|
||||
</data>
|
||||
<data name=">>BUT_dumpdf.Type" xml:space="preserve">
|
||||
<value>ArdupilotMega.Controls.MyButton, ArdupilotMegaPlanner, Version=1.1.4537.26254, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>BUT_dumpdf.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>BUT_dumpdf.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension" xmlns:difx="http://schemas.microsoft.com/wix/DifxAppExtension">
|
||||
|
||||
|
||||
<Product Id="*" Name="APM Planner" Language="1033" Version="1.1.90" Manufacturer="Michael Oborne" UpgradeCode="{625389D7-EB3C-4d77-A5F6-A285CF99437D}">
|
||||
<Product Id="*" Name="APM Planner" Language="1033" Version="1.1.91" Manufacturer="Michael Oborne" UpgradeCode="{625389D7-EB3C-4d77-A5F6-A285CF99437D}">
|
||||
|
||||
<Package Description="APM Planner Installer" Comments="Apm Planner Installer" Manufacturer="Michael Oborne" InstallerVersion="200" Compressed="yes" />
|
||||
|
||||
|
||||
<Upgrade Id="{625389D7-EB3C-4d77-A5F6-A285CF99437D}">
|
||||
<UpgradeVersion OnlyDetect="yes" Minimum="1.1.90" Property="NEWERVERSIONDETECTED" IncludeMinimum="no" />
|
||||
<UpgradeVersion OnlyDetect="no" Maximum="1.1.90" Property="OLDERVERSIONBEINGUPGRADED" IncludeMaximum="no" />
|
||||
<UpgradeVersion OnlyDetect="yes" Minimum="1.1.91" Property="NEWERVERSIONDETECTED" IncludeMinimum="no" />
|
||||
<UpgradeVersion OnlyDetect="no" Maximum="1.1.91" Property="OLDERVERSIONBEINGUPGRADED" IncludeMaximum="no" />
|
||||
</Upgrade>
|
||||
|
||||
<InstallExecuteSequence>
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
<Permission User="Everyone" GenericAll="yes" />
|
||||
</CreateFolder>
|
||||
</Component>
|
||||
<Component Id="_comp1" Guid="304401d2-6ff0-4e0c-882e-e84e1f984a1c">
|
||||
<Component Id="_comp1" Guid="98ec92da-9dc3-4e1d-96af-4ec78a1a3522">
|
||||
<File Id="_2" Source="..\bin\release\.gdbinit" />
|
||||
<File Id="_3" Source="..\bin\release\.gitignore" />
|
||||
<File Id="_4" Source="..\bin\release\aerosim3.91.txt" />
|
||||
|
|
@ -47,199 +47,201 @@
|
|||
<File Id="_14" Source="..\bin\release\ArdupilotMegaPlanner.exe.config" />
|
||||
<File Id="_15" Source="..\bin\release\ArdupilotMegaPlanner.exe.manifest" />
|
||||
<File Id="_16" Source="..\bin\release\ArdupilotMegaPlanner.pdb" />
|
||||
<File Id="_17" Source="..\bin\release\block_plane_0.dae" />
|
||||
<File Id="_18" Source="..\bin\release\BSE.Windows.Forms.dll" />
|
||||
<File Id="_19" Source="..\bin\release\BSE.Windows.Forms.pdb" />
|
||||
<File Id="_20" Source="..\bin\release\BSE.Windows.Forms.xml" />
|
||||
<File Id="_21" Source="..\bin\release\Core.dll" />
|
||||
<File Id="_22" Source="..\bin\release\dataflashlog.xml" />
|
||||
<File Id="_23" Source="..\bin\release\DirectShowLib-2005.dll" />
|
||||
<File Id="_24" Source="..\bin\release\eeprom.bin" />
|
||||
<File Id="_25" Source="..\bin\release\GMap.NET.Core.dll" />
|
||||
<File Id="_26" Source="..\bin\release\GMap.NET.Core.pdb" />
|
||||
<File Id="_27" Source="..\bin\release\GMap.NET.WindowsForms.dll" />
|
||||
<File Id="_28" Source="..\bin\release\GMap.NET.WindowsForms.pdb" />
|
||||
<File Id="_29" Source="..\bin\release\hud.html" />
|
||||
<File Id="_30" Source="..\bin\release\ICSharpCode.SharpZipLib.dll" />
|
||||
<File Id="_31" Source="..\bin\release\Ionic.Zip.Reduced.dll" />
|
||||
<File Id="_32" Source="..\bin\release\IronPython.dll" />
|
||||
<File Id="_33" Source="..\bin\release\IronPython.Modules.dll" />
|
||||
<File Id="_34" Source="..\bin\release\JSBSim.exe" />
|
||||
<File Id="_35" Source="..\bin\release\KMLib.dll" />
|
||||
<File Id="_36" Source="..\bin\release\log4net.dll" />
|
||||
<File Id="_37" Source="..\bin\release\mavcmd.xml" />
|
||||
<File Id="_38" Source="..\bin\release\MAVLink.xml" />
|
||||
<File Id="_39" Source="..\bin\release\MetaDataExtractor.dll" />
|
||||
<File Id="_40" Source="..\bin\release\Microsoft.DirectX.DirectInput.dll" />
|
||||
<File Id="_41" Source="..\bin\release\Microsoft.DirectX.dll" />
|
||||
<File Id="_42" Source="..\bin\release\Microsoft.Dynamic.dll" />
|
||||
<File Id="_43" Source="..\bin\release\Microsoft.Scripting.Core.dll" />
|
||||
<File Id="_44" Source="..\bin\release\Microsoft.Scripting.Debugging.dll" />
|
||||
<File Id="_45" Source="..\bin\release\Microsoft.Scripting.dll" />
|
||||
<File Id="_46" Source="..\bin\release\Microsoft.Scripting.ExtensionAttribute.dll" />
|
||||
<File Id="_47" Source="..\bin\release\netDxf.dll" />
|
||||
<File Id="_48" Source="..\bin\release\OpenTK.Compatibility.dll" />
|
||||
<File Id="_49" Source="..\bin\release\OpenTK.dll" />
|
||||
<File Id="_50" Source="..\bin\release\OpenTK.dll.config" />
|
||||
<File Id="_51" Source="..\bin\release\OpenTK.GLControl.dll" />
|
||||
<File Id="_52" Source="..\bin\release\ParameterMetaData.xml" />
|
||||
<File Id="_53" Source="..\bin\release\quadhil.xml" />
|
||||
<File Id="_54" Source="..\bin\release\runme" />
|
||||
<File Id="_55" Source="..\bin\release\SharpKml.dll" />
|
||||
<File Id="_56" Source="..\bin\release\SharpKml.pdb" />
|
||||
<File Id="_57" Source="..\bin\release\SharpKml.xml" />
|
||||
<File Id="_58" Source="..\bin\release\System.Data.SQLite.dll" />
|
||||
<File Id="_59" Source="..\bin\release\System.Reactive.dll" />
|
||||
<File Id="_60" Source="..\bin\release\System.Reactive.xml" />
|
||||
<File Id="_61" Source="..\bin\release\System.Speech.dll" />
|
||||
<File Id="_62" Source="..\bin\release\Updater.exe" />
|
||||
<File Id="_63" Source="..\bin\release\Updater.exe.config" />
|
||||
<File Id="_64" Source="..\bin\release\Updater.pdb" />
|
||||
<File Id="_65" Source="..\bin\release\version.exe" />
|
||||
<File Id="_66" Source="..\bin\release\version.txt" />
|
||||
<File Id="_67" Source="..\bin\release\ZedGraph.dll" />
|
||||
<File Id="_17" Source="..\bin\release\ArdupilotMegaPlanner10.exe" />
|
||||
<File Id="_18" Source="..\bin\release\ArdupilotMegaPlanner10.exe.config" />
|
||||
<File Id="_19" Source="..\bin\release\block_plane_0.dae" />
|
||||
<File Id="_20" Source="..\bin\release\BSE.Windows.Forms.dll" />
|
||||
<File Id="_21" Source="..\bin\release\BSE.Windows.Forms.pdb" />
|
||||
<File Id="_22" Source="..\bin\release\BSE.Windows.Forms.xml" />
|
||||
<File Id="_23" Source="..\bin\release\Core.dll" />
|
||||
<File Id="_24" Source="..\bin\release\dataflashlog.xml" />
|
||||
<File Id="_25" Source="..\bin\release\DirectShowLib-2005.dll" />
|
||||
<File Id="_26" Source="..\bin\release\eeprom.bin" />
|
||||
<File Id="_27" Source="..\bin\release\GMap.NET.Core.dll" />
|
||||
<File Id="_28" Source="..\bin\release\GMap.NET.Core.pdb" />
|
||||
<File Id="_29" Source="..\bin\release\GMap.NET.WindowsForms.dll" />
|
||||
<File Id="_30" Source="..\bin\release\GMap.NET.WindowsForms.pdb" />
|
||||
<File Id="_31" Source="..\bin\release\hud.html" />
|
||||
<File Id="_32" Source="..\bin\release\ICSharpCode.SharpZipLib.dll" />
|
||||
<File Id="_33" Source="..\bin\release\Ionic.Zip.Reduced.dll" />
|
||||
<File Id="_34" Source="..\bin\release\IronPython.dll" />
|
||||
<File Id="_35" Source="..\bin\release\IronPython.Modules.dll" />
|
||||
<File Id="_36" Source="..\bin\release\JSBSim.exe" />
|
||||
<File Id="_37" Source="..\bin\release\KMLib.dll" />
|
||||
<File Id="_38" Source="..\bin\release\log4net.dll" />
|
||||
<File Id="_39" Source="..\bin\release\mavcmd.xml" />
|
||||
<File Id="_40" Source="..\bin\release\MAVLink.xml" />
|
||||
<File Id="_41" Source="..\bin\release\MetaDataExtractor.dll" />
|
||||
<File Id="_42" Source="..\bin\release\Microsoft.DirectX.DirectInput.dll" />
|
||||
<File Id="_43" Source="..\bin\release\Microsoft.DirectX.dll" />
|
||||
<File Id="_44" Source="..\bin\release\Microsoft.Dynamic.dll" />
|
||||
<File Id="_45" Source="..\bin\release\Microsoft.Scripting.Core.dll" />
|
||||
<File Id="_46" Source="..\bin\release\Microsoft.Scripting.Debugging.dll" />
|
||||
<File Id="_47" Source="..\bin\release\Microsoft.Scripting.dll" />
|
||||
<File Id="_48" Source="..\bin\release\Microsoft.Scripting.ExtensionAttribute.dll" />
|
||||
<File Id="_49" Source="..\bin\release\netDxf.dll" />
|
||||
<File Id="_50" Source="..\bin\release\OpenTK.Compatibility.dll" />
|
||||
<File Id="_51" Source="..\bin\release\OpenTK.dll" />
|
||||
<File Id="_52" Source="..\bin\release\OpenTK.dll.config" />
|
||||
<File Id="_53" Source="..\bin\release\OpenTK.GLControl.dll" />
|
||||
<File Id="_54" Source="..\bin\release\ParameterMetaData.xml" />
|
||||
<File Id="_55" Source="..\bin\release\quadhil.xml" />
|
||||
<File Id="_56" Source="..\bin\release\runme" />
|
||||
<File Id="_57" Source="..\bin\release\SharpKml.dll" />
|
||||
<File Id="_58" Source="..\bin\release\SharpKml.pdb" />
|
||||
<File Id="_59" Source="..\bin\release\SharpKml.xml" />
|
||||
<File Id="_60" Source="..\bin\release\System.Data.SQLite.dll" />
|
||||
<File Id="_61" Source="..\bin\release\System.Reactive.dll" />
|
||||
<File Id="_62" Source="..\bin\release\System.Reactive.xml" />
|
||||
<File Id="_63" Source="..\bin\release\System.Speech.dll" />
|
||||
<File Id="_64" Source="..\bin\release\Updater.exe" />
|
||||
<File Id="_65" Source="..\bin\release\Updater.exe.config" />
|
||||
<File Id="_66" Source="..\bin\release\Updater.pdb" />
|
||||
<File Id="_67" Source="..\bin\release\version.exe" />
|
||||
<File Id="_68" Source="..\bin\release\version.txt" />
|
||||
<File Id="_69" Source="..\bin\release\ZedGraph.dll" />
|
||||
</Component>
|
||||
<Directory Id="aircraft67" Name="aircraft">
|
||||
<Component Id="_comp68" Guid="a8b31701-6229-41c5-bebb-800326324456">
|
||||
<File Id="_69" Source="..\bin\release\aircraft\placeholder.txt" />
|
||||
<Directory Id="aircraft69" Name="aircraft">
|
||||
<Component Id="_comp70" Guid="a4aa4372-a398-4de1-bca9-79ca5f663c3c">
|
||||
<File Id="_71" Source="..\bin\release\aircraft\placeholder.txt" />
|
||||
</Component>
|
||||
<Directory Id="arducopter69" Name="arducopter">
|
||||
<Component Id="_comp70" Guid="74c0eb64-d270-48b0-b324-dff6a511ac81">
|
||||
<File Id="_71" Source="..\bin\release\aircraft\arducopter\arducopter-set.xml" />
|
||||
<File Id="_72" Source="..\bin\release\aircraft\arducopter\arducopter.jpg" />
|
||||
<File Id="_73" Source="..\bin\release\aircraft\arducopter\arducopter.xml" />
|
||||
<File Id="_74" Source="..\bin\release\aircraft\arducopter\initfile.xml" />
|
||||
<File Id="_75" Source="..\bin\release\aircraft\arducopter\plus_quad2-set.xml" />
|
||||
<File Id="_76" Source="..\bin\release\aircraft\arducopter\plus_quad2.xml" />
|
||||
<File Id="_77" Source="..\bin\release\aircraft\arducopter\quad.nas" />
|
||||
<File Id="_78" Source="..\bin\release\aircraft\arducopter\README" />
|
||||
<Directory Id="arducopter71" Name="arducopter">
|
||||
<Component Id="_comp72" Guid="bea17f59-b5d3-47f2-b17c-28a78b6d2594">
|
||||
<File Id="_73" Source="..\bin\release\aircraft\arducopter\arducopter-set.xml" />
|
||||
<File Id="_74" Source="..\bin\release\aircraft\arducopter\arducopter.jpg" />
|
||||
<File Id="_75" Source="..\bin\release\aircraft\arducopter\arducopter.xml" />
|
||||
<File Id="_76" Source="..\bin\release\aircraft\arducopter\initfile.xml" />
|
||||
<File Id="_77" Source="..\bin\release\aircraft\arducopter\plus_quad2-set.xml" />
|
||||
<File Id="_78" Source="..\bin\release\aircraft\arducopter\plus_quad2.xml" />
|
||||
<File Id="_79" Source="..\bin\release\aircraft\arducopter\quad.nas" />
|
||||
<File Id="_80" Source="..\bin\release\aircraft\arducopter\README" />
|
||||
</Component>
|
||||
<Directory Id="data78" Name="data">
|
||||
<Component Id="_comp79" Guid="7b15a3ff-ab07-44a4-9473-a8df5fbc334b">
|
||||
<File Id="_80" Source="..\bin\release\aircraft\arducopter\data\arducopter_half_step.txt" />
|
||||
<File Id="_81" Source="..\bin\release\aircraft\arducopter\data\arducopter_step.txt" />
|
||||
<File Id="_82" Source="..\bin\release\aircraft\arducopter\data\rw_generic_pylon.ac" />
|
||||
<Directory Id="data80" Name="data">
|
||||
<Component Id="_comp81" Guid="60d6590a-9235-4eba-9066-d32595612d33">
|
||||
<File Id="_82" Source="..\bin\release\aircraft\arducopter\data\arducopter_half_step.txt" />
|
||||
<File Id="_83" Source="..\bin\release\aircraft\arducopter\data\arducopter_step.txt" />
|
||||
<File Id="_84" Source="..\bin\release\aircraft\arducopter\data\rw_generic_pylon.ac" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="Engines82" Name="Engines">
|
||||
<Component Id="_comp83" Guid="8e233296-39f1-4228-8d8b-949b11e298c4">
|
||||
<File Id="_84" Source="..\bin\release\aircraft\arducopter\Engines\a2830-12.xml" />
|
||||
<File Id="_85" Source="..\bin\release\aircraft\arducopter\Engines\prop10x4.5.xml" />
|
||||
<Directory Id="Engines84" Name="Engines">
|
||||
<Component Id="_comp85" Guid="dd972696-599a-40a7-92ec-17d36a48e7de">
|
||||
<File Id="_86" Source="..\bin\release\aircraft\arducopter\Engines\a2830-12.xml" />
|
||||
<File Id="_87" Source="..\bin\release\aircraft\arducopter\Engines\prop10x4.5.xml" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="Models85" Name="Models">
|
||||
<Component Id="_comp86" Guid="821faf86-233b-4de1-80d4-8f914393ac95">
|
||||
<File Id="_87" Source="..\bin\release\aircraft\arducopter\Models\arducopter.ac" />
|
||||
<File Id="_88" Source="..\bin\release\aircraft\arducopter\Models\arducopter.xml" />
|
||||
<File Id="_89" Source="..\bin\release\aircraft\arducopter\Models\plus_quad.ac" />
|
||||
<File Id="_90" Source="..\bin\release\aircraft\arducopter\Models\plus_quad2.ac" />
|
||||
<File Id="_91" Source="..\bin\release\aircraft\arducopter\Models\plus_quad2.xml" />
|
||||
<File Id="_92" Source="..\bin\release\aircraft\arducopter\Models\quad.3ds" />
|
||||
<File Id="_93" Source="..\bin\release\aircraft\arducopter\Models\shareware_output.3ds" />
|
||||
<File Id="_94" Source="..\bin\release\aircraft\arducopter\Models\Untitled.ac" />
|
||||
<File Id="_95" Source="..\bin\release\aircraft\arducopter\Models\Y6_test.ac" />
|
||||
<Directory Id="Models87" Name="Models">
|
||||
<Component Id="_comp88" Guid="062c9b49-bc12-4340-a9e7-114d70ea8fb4">
|
||||
<File Id="_89" Source="..\bin\release\aircraft\arducopter\Models\arducopter.ac" />
|
||||
<File Id="_90" Source="..\bin\release\aircraft\arducopter\Models\arducopter.xml" />
|
||||
<File Id="_91" Source="..\bin\release\aircraft\arducopter\Models\plus_quad.ac" />
|
||||
<File Id="_92" Source="..\bin\release\aircraft\arducopter\Models\plus_quad2.ac" />
|
||||
<File Id="_93" Source="..\bin\release\aircraft\arducopter\Models\plus_quad2.xml" />
|
||||
<File Id="_94" Source="..\bin\release\aircraft\arducopter\Models\quad.3ds" />
|
||||
<File Id="_95" Source="..\bin\release\aircraft\arducopter\Models\shareware_output.3ds" />
|
||||
<File Id="_96" Source="..\bin\release\aircraft\arducopter\Models\Untitled.ac" />
|
||||
<File Id="_97" Source="..\bin\release\aircraft\arducopter\Models\Y6_test.ac" />
|
||||
</Component>
|
||||
</Directory>
|
||||
</Directory>
|
||||
<Directory Id="Rascal95" Name="Rascal">
|
||||
<Component Id="_comp96" Guid="486d52eb-1ea2-47ae-9867-415dccf9ba67">
|
||||
<File Id="_97" Source="..\bin\release\aircraft\Rascal\Rascal-keyboard.xml" />
|
||||
<File Id="_98" Source="..\bin\release\aircraft\Rascal\Rascal-submodels.xml" />
|
||||
<File Id="_99" Source="..\bin\release\aircraft\Rascal\Rascal.xml" />
|
||||
<File Id="_100" Source="..\bin\release\aircraft\Rascal\Rascal110-JSBSim-set.xml" />
|
||||
<File Id="_101" Source="..\bin\release\aircraft\Rascal\Rascal110-JSBSim.xml" />
|
||||
<File Id="_102" Source="..\bin\release\aircraft\Rascal\Rascal110-splash.rgb" />
|
||||
<File Id="_103" Source="..\bin\release\aircraft\Rascal\README.Rascal" />
|
||||
<File Id="_104" Source="..\bin\release\aircraft\Rascal\reset_CMAC.xml" />
|
||||
<File Id="_105" Source="..\bin\release\aircraft\Rascal\thumbnail.jpg" />
|
||||
<Directory Id="Rascal97" Name="Rascal">
|
||||
<Component Id="_comp98" Guid="795ee65b-a949-49e7-9017-ebc330b0ed91">
|
||||
<File Id="_99" Source="..\bin\release\aircraft\Rascal\Rascal-keyboard.xml" />
|
||||
<File Id="_100" Source="..\bin\release\aircraft\Rascal\Rascal-submodels.xml" />
|
||||
<File Id="_101" Source="..\bin\release\aircraft\Rascal\Rascal.xml" />
|
||||
<File Id="_102" Source="..\bin\release\aircraft\Rascal\Rascal110-JSBSim-set.xml" />
|
||||
<File Id="_103" Source="..\bin\release\aircraft\Rascal\Rascal110-JSBSim.xml" />
|
||||
<File Id="_104" Source="..\bin\release\aircraft\Rascal\Rascal110-splash.rgb" />
|
||||
<File Id="_105" Source="..\bin\release\aircraft\Rascal\README.Rascal" />
|
||||
<File Id="_106" Source="..\bin\release\aircraft\Rascal\reset_CMAC.xml" />
|
||||
<File Id="_107" Source="..\bin\release\aircraft\Rascal\thumbnail.jpg" />
|
||||
</Component>
|
||||
<Directory Id="Engines105" Name="Engines">
|
||||
<Component Id="_comp106" Guid="f60b22ea-6558-4c3c-b422-181254c121ec">
|
||||
<File Id="_107" Source="..\bin\release\aircraft\Rascal\Engines\18x8.xml" />
|
||||
<File Id="_108" Source="..\bin\release\aircraft\Rascal\Engines\Zenoah_G-26A.xml" />
|
||||
<Directory Id="Engines107" Name="Engines">
|
||||
<Component Id="_comp108" Guid="192bff01-c2c9-4c0c-890b-fe487f651466">
|
||||
<File Id="_109" Source="..\bin\release\aircraft\Rascal\Engines\18x8.xml" />
|
||||
<File Id="_110" Source="..\bin\release\aircraft\Rascal\Engines\Zenoah_G-26A.xml" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="Models108" Name="Models">
|
||||
<Component Id="_comp109" Guid="234c046f-bc24-4958-86e3-7a75da198d79">
|
||||
<File Id="_110" Source="..\bin\release\aircraft\Rascal\Models\Rascal.rgb" />
|
||||
<File Id="_111" Source="..\bin\release\aircraft\Rascal\Models\Rascal110-000-013.ac" />
|
||||
<File Id="_112" Source="..\bin\release\aircraft\Rascal\Models\Rascal110.xml" />
|
||||
<File Id="_113" Source="..\bin\release\aircraft\Rascal\Models\smoke.png" />
|
||||
<File Id="_114" Source="..\bin\release\aircraft\Rascal\Models\smokeW.xml" />
|
||||
<File Id="_115" Source="..\bin\release\aircraft\Rascal\Models\Trajectory-Marker.ac" />
|
||||
<File Id="_116" Source="..\bin\release\aircraft\Rascal\Models\Trajectory-Marker.xml" />
|
||||
<Directory Id="Models110" Name="Models">
|
||||
<Component Id="_comp111" Guid="bffe6e9a-dd59-4588-a452-46933f8e0815">
|
||||
<File Id="_112" Source="..\bin\release\aircraft\Rascal\Models\Rascal.rgb" />
|
||||
<File Id="_113" Source="..\bin\release\aircraft\Rascal\Models\Rascal110-000-013.ac" />
|
||||
<File Id="_114" Source="..\bin\release\aircraft\Rascal\Models\Rascal110.xml" />
|
||||
<File Id="_115" Source="..\bin\release\aircraft\Rascal\Models\smoke.png" />
|
||||
<File Id="_116" Source="..\bin\release\aircraft\Rascal\Models\smokeW.xml" />
|
||||
<File Id="_117" Source="..\bin\release\aircraft\Rascal\Models\Trajectory-Marker.ac" />
|
||||
<File Id="_118" Source="..\bin\release\aircraft\Rascal\Models\Trajectory-Marker.xml" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="Systems116" Name="Systems">
|
||||
<Component Id="_comp117" Guid="4b254cc2-40eb-4168-945b-570434f3ce80">
|
||||
<File Id="_118" Source="..\bin\release\aircraft\Rascal\Systems\110-autopilot.xml" />
|
||||
<File Id="_119" Source="..\bin\release\aircraft\Rascal\Systems\airdata.nas" />
|
||||
<File Id="_120" Source="..\bin\release\aircraft\Rascal\Systems\electrical.xml" />
|
||||
<File Id="_121" Source="..\bin\release\aircraft\Rascal\Systems\main.nas" />
|
||||
<File Id="_122" Source="..\bin\release\aircraft\Rascal\Systems\ugear.nas" />
|
||||
<Directory Id="Systems118" Name="Systems">
|
||||
<Component Id="_comp119" Guid="874ace9f-74ed-4316-8415-af2d80ae627f">
|
||||
<File Id="_120" Source="..\bin\release\aircraft\Rascal\Systems\110-autopilot.xml" />
|
||||
<File Id="_121" Source="..\bin\release\aircraft\Rascal\Systems\airdata.nas" />
|
||||
<File Id="_122" Source="..\bin\release\aircraft\Rascal\Systems\electrical.xml" />
|
||||
<File Id="_123" Source="..\bin\release\aircraft\Rascal\Systems\main.nas" />
|
||||
<File Id="_124" Source="..\bin\release\aircraft\Rascal\Systems\ugear.nas" />
|
||||
</Component>
|
||||
</Directory>
|
||||
</Directory>
|
||||
</Directory>
|
||||
<Directory Id="Driver122" Name="Driver">
|
||||
<Component Id="_comp123" Guid="8e462eb2-d786-4186-bd0a-71a80efe01fa">
|
||||
<File Id="_124" Source="..\bin\release\Driver\Arduino MEGA 2560.inf" />
|
||||
<Directory Id="Driver124" Name="Driver">
|
||||
<Component Id="_comp125" Guid="c4e836a1-1e6f-4046-a3ca-d7f24d192184">
|
||||
<File Id="_126" Source="..\bin\release\Driver\Arduino MEGA 2560.inf" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="es_ES124" Name="es-ES">
|
||||
<Component Id="_comp125" Guid="06e792f7-0160-48c8-9b55-dfe4df9ac7c8">
|
||||
<File Id="_126" Source="..\bin\release\es-ES\ArdupilotMegaPlanner.resources.dll" />
|
||||
<Directory Id="es_ES126" Name="es-ES">
|
||||
<Component Id="_comp127" Guid="8730378e-dd40-4480-887f-1b8c6a12a0b2">
|
||||
<File Id="_128" Source="..\bin\release\es-ES\ArdupilotMegaPlanner.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="fr126" Name="fr">
|
||||
<Component Id="_comp127" Guid="3d4a977b-c97f-49a3-982a-e6e4c9d6f115">
|
||||
<File Id="_128" Source="..\bin\release\fr\ArdupilotMegaPlanner.resources.dll" />
|
||||
<Directory Id="fr128" Name="fr">
|
||||
<Component Id="_comp129" Guid="f20e1e3a-d1d7-4e51-9c1e-a69ac1641d8a">
|
||||
<File Id="_130" Source="..\bin\release\fr\ArdupilotMegaPlanner.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="it_IT128" Name="it-IT">
|
||||
<Component Id="_comp129" Guid="47a09a31-9372-49c4-8493-f9db67666c37">
|
||||
<File Id="_130" Source="..\bin\release\it-IT\ArdupilotMegaPlanner.resources.dll" />
|
||||
<Directory Id="it_IT130" Name="it-IT">
|
||||
<Component Id="_comp131" Guid="c513424b-3bd5-4a81-8f8d-303b6b66d884">
|
||||
<File Id="_132" Source="..\bin\release\it-IT\ArdupilotMegaPlanner.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="jsbsim130" Name="jsbsim">
|
||||
<Component Id="_comp131" Guid="784ab043-cefd-4c96-a0be-2b21e779ce55">
|
||||
<File Id="_132" Source="..\bin\release\jsbsim\fgout.xml" />
|
||||
<File Id="_133" Source="..\bin\release\jsbsim\rascal_test.xml" />
|
||||
<Directory Id="jsbsim132" Name="jsbsim">
|
||||
<Component Id="_comp133" Guid="5e37eccd-128d-40e7-bed1-83ddb29d2531">
|
||||
<File Id="_134" Source="..\bin\release\jsbsim\fgout.xml" />
|
||||
<File Id="_135" Source="..\bin\release\jsbsim\rascal_test.xml" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="m3u133" Name="m3u">
|
||||
<Component Id="_comp134" Guid="d76e9ada-a0c2-40a4-879b-aff12588e50b">
|
||||
<File Id="_135" Source="..\bin\release\m3u\both.m3u" />
|
||||
<File Id="_136" Source="..\bin\release\m3u\GeoRefnetworklink.kml" />
|
||||
<File Id="_137" Source="..\bin\release\m3u\hud.m3u" />
|
||||
<File Id="_138" Source="..\bin\release\m3u\map.m3u" />
|
||||
<File Id="_139" Source="..\bin\release\m3u\networklink.kml" />
|
||||
<Directory Id="m3u135" Name="m3u">
|
||||
<Component Id="_comp136" Guid="0ec122ee-7829-48d0-93d6-99aa0ad6a636">
|
||||
<File Id="_137" Source="..\bin\release\m3u\both.m3u" />
|
||||
<File Id="_138" Source="..\bin\release\m3u\GeoRefnetworklink.kml" />
|
||||
<File Id="_139" Source="..\bin\release\m3u\hud.m3u" />
|
||||
<File Id="_140" Source="..\bin\release\m3u\map.m3u" />
|
||||
<File Id="_141" Source="..\bin\release\m3u\networklink.kml" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="pl139" Name="pl">
|
||||
<Component Id="_comp140" Guid="d1e6c69a-acc2-431a-8b15-93d69b998a74">
|
||||
<File Id="_141" Source="..\bin\release\pl\ArdupilotMegaPlanner.resources.dll" />
|
||||
<Directory Id="pl141" Name="pl">
|
||||
<Component Id="_comp142" Guid="c11c90fe-5b10-4c29-b36e-a5f34860b78b">
|
||||
<File Id="_143" Source="..\bin\release\pl\ArdupilotMegaPlanner.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="Resources141" Name="Resources">
|
||||
<Component Id="_comp142" Guid="e25a586c-827b-424a-9bdf-7e0d14066caa">
|
||||
<File Id="_143" Source="..\bin\release\Resources\MAVCmd.txt" />
|
||||
<File Id="_144" Source="..\bin\release\Resources\Welcome_to_Michael_Oborne.rtf" />
|
||||
<Directory Id="Resources143" Name="Resources">
|
||||
<Component Id="_comp144" Guid="9deb956f-cdd6-4f22-9491-08629ff939a8">
|
||||
<File Id="_145" Source="..\bin\release\Resources\MAVCmd.txt" />
|
||||
<File Id="_146" Source="..\bin\release\Resources\Welcome_to_Michael_Oborne.rtf" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="ru_RU144" Name="ru-RU">
|
||||
<Component Id="_comp145" Guid="075ffb44-84aa-41f4-846e-d5b485d9c208">
|
||||
<File Id="_146" Source="..\bin\release\ru-RU\ArdupilotMegaPlanner.resources.dll" />
|
||||
<Directory Id="ru_RU146" Name="ru-RU">
|
||||
<Component Id="_comp147" Guid="4ec316f3-3453-4d0e-90c6-f9e8a38f870d">
|
||||
<File Id="_148" Source="..\bin\release\ru-RU\ArdupilotMegaPlanner.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="zh_Hans146" Name="zh-Hans">
|
||||
<Component Id="_comp147" Guid="07fef6eb-cdbb-4fb8-81a4-6a4cf64a5da0">
|
||||
<File Id="_148" Source="..\bin\release\zh-Hans\ArdupilotMegaPlanner.resources.dll" />
|
||||
<Directory Id="zh_Hans148" Name="zh-Hans">
|
||||
<Component Id="_comp149" Guid="7657c0fa-f361-4450-8e3f-cb6a16d2713f">
|
||||
<File Id="_150" Source="..\bin\release\zh-Hans\ArdupilotMegaPlanner.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="zh_TW148" Name="zh-TW">
|
||||
<Component Id="_comp149" Guid="b37d19f2-038f-4f40-bc6d-428bcd58447b">
|
||||
<File Id="_150" Source="..\bin\release\zh-TW\ArdupilotMegaPlanner.resources.dll" />
|
||||
<Directory Id="zh_TW150" Name="zh-TW">
|
||||
<Component Id="_comp151" Guid="48ef16c7-2d2e-477a-bdc9-9938d9172375">
|
||||
<File Id="_152" Source="..\bin\release\zh-TW\ArdupilotMegaPlanner.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
|
||||
|
|
@ -281,26 +283,26 @@
|
|||
<ComponentRef Id="InstallDirPermissions" />
|
||||
|
||||
<ComponentRef Id="_comp1" />
|
||||
<ComponentRef Id="_comp68" />
|
||||
<ComponentRef Id="_comp70" />
|
||||
<ComponentRef Id="_comp79" />
|
||||
<ComponentRef Id="_comp83" />
|
||||
<ComponentRef Id="_comp86" />
|
||||
<ComponentRef Id="_comp96" />
|
||||
<ComponentRef Id="_comp106" />
|
||||
<ComponentRef Id="_comp109" />
|
||||
<ComponentRef Id="_comp117" />
|
||||
<ComponentRef Id="_comp123" />
|
||||
<ComponentRef Id="_comp72" />
|
||||
<ComponentRef Id="_comp81" />
|
||||
<ComponentRef Id="_comp85" />
|
||||
<ComponentRef Id="_comp88" />
|
||||
<ComponentRef Id="_comp98" />
|
||||
<ComponentRef Id="_comp108" />
|
||||
<ComponentRef Id="_comp111" />
|
||||
<ComponentRef Id="_comp119" />
|
||||
<ComponentRef Id="_comp125" />
|
||||
<ComponentRef Id="_comp127" />
|
||||
<ComponentRef Id="_comp129" />
|
||||
<ComponentRef Id="_comp131" />
|
||||
<ComponentRef Id="_comp134" />
|
||||
<ComponentRef Id="_comp140" />
|
||||
<ComponentRef Id="_comp133" />
|
||||
<ComponentRef Id="_comp136" />
|
||||
<ComponentRef Id="_comp142" />
|
||||
<ComponentRef Id="_comp145" />
|
||||
<ComponentRef Id="_comp144" />
|
||||
<ComponentRef Id="_comp147" />
|
||||
<ComponentRef Id="_comp149" />
|
||||
<ComponentRef Id="_comp151" />
|
||||
|
||||
|
||||
<ComponentRef Id="ApplicationShortcut" />
|
||||
|
|
|
|||
|
|
@ -42,7 +42,31 @@ namespace ArdupilotMega
|
|||
//Common.linearRegression();
|
||||
|
||||
//Console.WriteLine(srtm.getAltitude(-35.115676879882812, 117.94178754638671,20));
|
||||
/*
|
||||
Arduino.ArduinoSTK comport = new Arduino.ArduinoSTK();
|
||||
|
||||
comport.PortName = "com4";
|
||||
|
||||
comport.BaudRate = 57600;
|
||||
|
||||
comport.Open();
|
||||
|
||||
comport.connectAP();
|
||||
|
||||
comport.sync();
|
||||
|
||||
comport.sync();
|
||||
|
||||
Console.WriteLine( comport.getChipType(0));
|
||||
|
||||
Console.WriteLine(comport.getChipType(1));
|
||||
|
||||
Console.WriteLine(comport.getChipType(2));
|
||||
|
||||
Console.ReadLine();
|
||||
|
||||
return;
|
||||
*/
|
||||
if (System.Diagnostics.Debugger.IsAttached)
|
||||
{
|
||||
// testing
|
||||
|
|
|
|||
|
|
@ -34,5 +34,5 @@ using System.Resources;
|
|||
// by using the '*' as shown below:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("1.1.*")]
|
||||
[assembly: AssemblyFileVersion("1.1.91")]
|
||||
[assembly: AssemblyFileVersion("1.1.92")]
|
||||
[assembly: NeutralResourcesLanguageAttribute("")]
|
||||
|
|
|
|||
|
|
@ -295,7 +295,7 @@
|
|||
<Z>Alt</Z>
|
||||
</LAND>
|
||||
<TAKEOFF>
|
||||
<P1>Angle</P1>
|
||||
<P1>Pitch Angle</P1>
|
||||
<P2></P2>
|
||||
<P3></P3>
|
||||
<P4></P4>
|
||||
|
|
|
|||
Loading…
Reference in New Issue