Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-22 08:38:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

APM Planner 1.1.22

Browse Source 
fix joystick mode function - thanks doug
fix rc trim issue - thanks doug
arduinoccp seem to be working nicerly now.
This commit is contained in:
Michael Oborne 2012-01-17 17:49:18 +08:00
parent 25be642bf8
commit 79ba9443e9
5 changed files with 2146 additions and 756 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/ArdupilotMegaPlanner/CurrentState.cs
View File

@ -138,7 +138,7 @@ namespace ArdupilotMega
//battery
public float battery_voltage { get { return _battery_voltage; } set { _battery_voltage = value / 1000; } }
private float _battery_voltage;
public float battery_remaining { get { return _battery_remaining; } set { _battery_remaining = value / 1000; if (_battery_remaining < 0) _battery_remaining = 0; } }
public float battery_remaining { get { return _battery_remaining; } set { _battery_remaining = value / 1000; if (_battery_remaining < 0 || _battery_remaining > 100) _battery_remaining = 0; } }
private float _battery_remaining;
// HIL

3
Tools/ArdupilotMegaPlanner/Joystick.cs
View File

@ -322,11 +322,12 @@ namespace ArdupilotMega
{
if (but.buttonno != -1 && getButtonState(but.buttonno))
{
string mode = but.mode;
MainV2.instance.BeginInvoke((System.Windows.Forms.MethodInvoker)delegate()
{
try
{
MainV2.comPort.setMode(but.mode);
MainV2.comPort.setMode(mode);
}
catch { System.Windows.Forms.MessageBox.Show("Failed to change Modes"); }

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

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

2
Tools/ArdupilotMegaPlanner/Setup/Setup.cs
View File

@ -240,7 +240,7 @@ namespace ArdupilotMega.Setup
MainV2.comPort.setParam("RC" + (a + 1).ToString("0") + "_MIN", rcmin[a]);
MainV2.comPort.setParam("RC" + (a + 1).ToString("0") + "_MAX", rcmax[a]);
}
if (rctrim[a] < 1195 && rctrim[a] > 1205)
if (rctrim[a] < 1195 || rctrim[a] > 1205)
MainV2.comPort.setParam("RC" + (a + 1).ToString("0") + "_TRIM", rctrim[a]);
}
catch { MessageBox.Show("Failed to set Channel " + (a + 1).ToString()); }

2893
Tools/ArdupilotMegaPlanner/Setup/Setup.resx
View File

File diff suppressed because it is too large Load Diff