Merge branch 'v10release' of github.com:pixhawk/qgroundcontrol into v10release

files/ardupilotmega/fixed_wing/widgets/ardupilot-heading-pid.qgw

@@ -0,0 +1,26 @@
+[Heading%20PID%20Tuning]
+QGC_TOOL_WIDGET_ITEMS\1\TYPE=SLIDER
+QGC_TOOL_WIDGET_ITEMS\1\QGC_PARAM_SLIDER_DESCRIPTION=Heading D Gain
+QGC_TOOL_WIDGET_ITEMS\1\QGC_PARAM_SLIDER_PARAMID=HDNG2RLL_D
+QGC_TOOL_WIDGET_ITEMS\1\QGC_PARAM_SLIDER_COMPONENTID=200
+QGC_TOOL_WIDGET_ITEMS\1\QGC_PARAM_SLIDER_MIN=0
+QGC_TOOL_WIDGET_ITEMS\1\QGC_PARAM_SLIDER_MAX=1
+QGC_TOOL_WIDGET_ITEMS\2\TYPE=SLIDER
+QGC_TOOL_WIDGET_ITEMS\2\QGC_PARAM_SLIDER_DESCRIPTION=Heading P Gain
+QGC_TOOL_WIDGET_ITEMS\2\QGC_PARAM_SLIDER_PARAMID=HDNG2RLL_P
+QGC_TOOL_WIDGET_ITEMS\2\QGC_PARAM_SLIDER_COMPONENTID=200
+QGC_TOOL_WIDGET_ITEMS\2\QGC_PARAM_SLIDER_MIN=0
+QGC_TOOL_WIDGET_ITEMS\2\QGC_PARAM_SLIDER_MAX=5
+QGC_TOOL_WIDGET_ITEMS\3\TYPE=SLIDER
+QGC_TOOL_WIDGET_ITEMS\3\QGC_PARAM_SLIDER_DESCRIPTION=Heading I Gain
+QGC_TOOL_WIDGET_ITEMS\3\QGC_PARAM_SLIDER_PARAMID=HDNG2RLL_I
+QGC_TOOL_WIDGET_ITEMS\3\QGC_PARAM_SLIDER_COMPONENTID=200
+QGC_TOOL_WIDGET_ITEMS\3\QGC_PARAM_SLIDER_MIN=0
+QGC_TOOL_WIDGET_ITEMS\3\QGC_PARAM_SLIDER_MAX=1
+QGC_TOOL_WIDGET_ITEMS\4\TYPE=SLIDER
+QGC_TOOL_WIDGET_ITEMS\4\QGC_PARAM_SLIDER_DESCRIPTION=Heading I Limit
+QGC_TOOL_WIDGET_ITEMS\4\QGC_PARAM_SLIDER_PARAMID=HDNG2RLL_IMAX
+QGC_TOOL_WIDGET_ITEMS\4\QGC_PARAM_SLIDER_COMPONENTID=200
+QGC_TOOL_WIDGET_ITEMS\4\QGC_PARAM_SLIDER_MIN=0
+QGC_TOOL_WIDGET_ITEMS\4\QGC_PARAM_SLIDER_MAX=3000
+QGC_TOOL_WIDGET_ITEMS\size=4

src/QGCCore.cc

@@ -67,8 +67,6 @@ This file is part of the QGROUNDCONTROL project
 
 QGCCore::QGCCore(int &argc, char* argv[]) : QApplication(argc, argv)
 {
-
-
     // Set application name
     this->setApplicationName(QGC_APPLICATION_NAME);
     this->setApplicationVersion(QGC_APPLICATION_VERSION);