APM Planner 1.1.22

fix joystick mode function - thanks doug
fix rc trim issue - thanks doug
arduinoccp seem to be working nicerly now.

Tools/ArdupilotMegaPlanner/CurrentState.cs

@@ -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

Tools/ArdupilotMegaPlanner/Joystick.cs

@@ -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"); }

Tools/ArdupilotMegaPlanner/Properties/AssemblyInfo.cs

@@ -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("")]

Tools/ArdupilotMegaPlanner/Setup/Setup.cs

@@ -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()); }