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

APM Planner 1.1.24

Browse Source 
change verify alt action
fix hil throttle scaling Thanks Justin
This commit is contained in:
Michael Oborne 2012-01-20 15:36:01 +08:00
parent b3158cae38
commit b72719cc77
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Tools/ArdupilotMegaPlanner/GCSViews/FlightPlanner.cs
View File

@ -297,10 +297,17 @@ namespace ArdupilotMega.GCSViews
cell.Value = alt.ToString(); cell.Value = alt.ToString();
// online verify height // online verify height
if (isonline && CHK_geheight.Checked) if (isonline && CHK_geheight.Checked)
{
if (CHK_altmode.Checked)
{ {
cell.Value = ((int)getGEAlt(lat, lng) + int.Parse(TXT_DefaultAlt.Text)).ToString(); cell.Value = ((int)getGEAlt(lat, lng) + int.Parse(TXT_DefaultAlt.Text)).ToString();
} }
else else
{
cell.Value = ((int)getGEAlt(lat, lng) + int.Parse(TXT_DefaultAlt.Text) - float.Parse(TXT_homealt.Text)).ToString();
}
}
else
{ {
// is absolute but no verify // is absolute but no verify
if (CHK_altmode.Checked) if (CHK_altmode.Checked)
@ -2970,7 +2977,7 @@ namespace ArdupilotMega.GCSViews
if (MainV2.cs.firmware == MainV2.Firmwares.ArduPlane) if (MainV2.cs.firmware == MainV2.Firmwares.ArduPlane)
{ {
routes.Markers.Add(new GMapMarkerPlane(currentloc, MainV2.cs.yaw, MainV2.cs.groundcourse, MainV2.cs.nav_bearing, MainV2.cs.target_bearing)); routes.Markers.Add(new GMapMarkerPlane(currentloc, MainV2.cs.yaw, MainV2.cs.groundcourse, MainV2.cs.nav_bearing, MainV2.cs.target_bearing) { ToolTipText = MainV2.cs.alt.ToString("0"), ToolTipMode = MarkerTooltipMode.Always });
} }
else else
{ {

2
Tools/ArdupilotMegaPlanner/GCSViews/Simulation.cs
View File

@ -1328,7 +1328,7 @@ namespace ArdupilotMega.GCSViews
roll_out = (float)MainV2.cs.hilch1 / rollgain; roll_out = (float)MainV2.cs.hilch1 / rollgain;
pitch_out = (float)MainV2.cs.hilch2 / pitchgain; pitch_out = (float)MainV2.cs.hilch2 / pitchgain;
throttle_out = ((float)MainV2.cs.hilch3 + 5000) / throttlegain; throttle_out = ((float)MainV2.cs.hilch3 / 2 + 5000) / throttlegain;
rudder_out = (float)MainV2.cs.hilch4 / ruddergain; rudder_out = (float)MainV2.cs.hilch4 / ruddergain;
} }

2
Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs
View File

@ -34,5 +34,5 @@ using System.Resources;
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.1.23")] [assembly: AssemblyFileVersion("1.1.24")]
[assembly: NeutralResourcesLanguageAttribute("")] [assembly: NeutralResourcesLanguageAttribute("")]