Merge branch 'rel-15.05' into next

CREDITS.txt

@@ -20,9 +20,11 @@ Stefan Cenkov
 Andrés Chavarría Krauser
 Cosimo Corrado
 James Cotton
+Kalyn Doerr
 Steve Doll
 James Duley
 Piotr Esden-Tempski
+Steve Evans
 Peter Farnworth
 Ed Faulkner
 Andrew Finegan
@@ -50,6 +52,7 @@ Stefan Karlsson
 Ricky King
 Thorsten Klose
 Karl Knutsson
+Daniël Koek
 Sami Korhonen
 Hallvard Kristiansen
 Alan Krum

WHATSNEW.txt

@@ -1,4 +1,4 @@
-Release Notes - OpenPilot - Version RELEASE-15.05
+Release Notes - OpenPilot - Version RELEASE-15.05 RC2
 Fully autonomous flight is now possible with autotakeoff and landing as flight modes available to path plans.  
 An all new implementation of altitude vario provides improved altitude maintenance and smoother flight.
 A new RateTrainer mode for beginners and aerial photography make it easier to learn this mode my limiting the pitch and roll extents.
@@ -7,9 +7,12 @@ It is now easier to takeoff with an improved axislock on yaw implementation.
 Full speed flight just got faster with new motor constraints that maintain your ability to enact roll without requiring a upper throttle limit.
 Setup on GPS just got easier. See the wiki for details.
 New control protocols and support for due telemtry and OSD programing have been added.
+CC3D is no longer supported.
 
 The full list of bugfixes in this release is accessible here:
 
+Release Notes - OpenPilot - Version RELEASE-15.05 RC2
+
 ** Bug
     * [OP-1691] - PIOS_DELAY_WaitmS() in RFM22B causes jitter
     * [OP-1756] - Add option to Vehicle Setup Wizard to calibrate all motor outputs at the same time.
@@ -18,11 +21,14 @@ The full list of bugfixes in this release is accessible here:
     * [OP-1794] - AxisLock windup not cleared with low throttle while armed
     * [OP-1834] - Piro Comp - adverse effect in Atti/Ratti Modes
     * [OP-1841] - Serial telemetry is not reliable 
+    * [OP-1847] - GPS assist does not update destination when reusing a flight mode for assist
     * [OP-1855] - Limit parsing error in logs when starting GCS
     * [OP-1858] - PathPlanner AutoTakeoff fixes
     * [OP-1867] - PathPlanner AutoLand simplification
     * [OP-1869] - Allow Analog Airspeed scale
     * [OP-1872] - Vehicle Wiz Tricopter tail servo settings don't save
+    * [OP-1888] - SIGSEGV after starting simulator in HITL
+    * [OP-1893] - Deadband changes max stick input
 
 
 ** Improvement
@@ -47,7 +53,11 @@ The full list of bugfixes in this release is accessible here:
     * [OP-1844] - Create a vagrant environment that contains all the bits for Android development, including Android. 
     * [OP-1848] - Rewrite AltVario/Hold in C++ for functional improvements
     * [OP-1852] - Include version number in window title bar.
+    * [OP-1853] - Ground build tidy
     * [OP-1874] - Various improvements to led notifications
+    * [OP-1882] - vtol path follower thrust control now set to auto as a default
+    * [OP-1884] - Improve low pass filter and gyro tau values
+    * [OP-1887] - PFD update 
 
 ** New Feature
     * [OP-1696] - PathFollower C++ Rewrite: Autonomous Landing, Velocity Roam, RTBL, GroundPathFollower
@@ -61,7 +71,6 @@ The full list of bugfixes in this release is accessible here:
     * [OP-1863] - RateTrainer mode - add maxpitch for beginners and aerial photography
 
 
-
 --- RELEASE-15.02.02 ---
 This release fixes a bug that prevents revo onboard mag to work correctly.
 

ground/openpilotgcs/share/openpilotgcs/pfd/default/Panels.qml

@@ -379,7 +379,6 @@ Item {
         width: scaledBounds.width * sceneItem.width
         height: scaledBounds.height * sceneItem.height
 
-        x: (scaledBounds.x * sceneItem.width) + (ManualControlCommand.Roll * rc_stick.width * 2.5)
         y: (scaledBounds.y * sceneItem.height) + (ManualControlCommand.Pitch * rc_stick.width * 2.5)
 
         smooth: true
@@ -394,7 +393,7 @@ Item {
         states: State {
              name: "fading"
              when: show_panels == true
-             PropertyChanges { target: rc_stick; x: Math.floor(scaledBounds.x * sceneItem.width) + offset_value; }
+             PropertyChanges { target: rc_stick; x: Math.floor(scaledBounds.x * sceneItem.width) + (ManualControlCommand.Roll * rc_stick.width * 2.5) + offset_value; }
         }
 
         transitions: Transition {

ground/openpilotgcs/src/plugins/config/configinputwidget.cpp

@@ -1703,23 +1703,15 @@ void ConfigInputWidget::simpleCalibration(bool enable)
     } else {
         manualCommandData  = manualCommandObj->getData();
         manualSettingsData = manualSettingsObj->getData();
+        systemSettingsData = systemSettingsObj->getData();
 
-        QMessageBox::StandardButton reply;
+        if (systemSettingsData.AirframeType == SystemSettings::AIRFRAMETYPE_GROUNDVEHICLECAR) {
-        reply = QMessageBox::question(this, tr("Ground vehicle"),
+            QMessageBox::warning(this, tr("Ground Vehicle"),
-                                      tr("<p>Are you configuring a transmitter for your <b>ground vehicle</b> with reversible motor<br>"
+                                 tr("<p>Please <b>center</b> throttle control and press OK when ready.</p>"));
-                                         "controlled by throttle stick?</p>"
-                                         "<p>If so, please make sure you've centered throttle control and press <b>Yes</b> button. Otherwise, press No.</p>"
-                                         "<p>Attention, if you press <b>Yes</b>, then the <b>Flight Mode Count</b> will be set to 1.</p>"),
-                                      QMessageBox::Yes | QMessageBox::No);
 
-        if (reply == QMessageBox::Yes) {
             transmitterType = ground;
             manualSettingsData.ChannelNeutral[ManualControlSettings::CHANNELNEUTRAL_THROTTLE] =
                 manualCommandData.Channel[ManualControlSettings::CHANNELNUMBER_THROTTLE];
-            /* Make sure to tell controller, this is really a ground vehicle. */
-            systemSettingsData = systemSettingsObj->getData();
-            systemSettingsData.AirframeType = SystemSettings::AIRFRAMETYPE_GROUNDVEHICLECAR;
-            systemSettingsObj->setData(systemSettingsData);
         }
 
         restoreMdataSingle(manualCommandObj, &manualControlMdata);