Merge branch 'master' of https://github.com/mavlink/qgroundcontrol into exposeSysTime

.gitignore

@@ -1,55 +1,57 @@
-*.swp
-*.nfs
-CMakeFiles
-*Makefile*
-tags
-build*/
-Info.plist
-obj
-.DS_Store
-*.log
-*~
-*~.skp
-bin/*.exe
-bin/*.txt
-bin/mac
-*pro.user*
-qrc_*.cpp
-*.Debug
-*.Release
-tmp
-debug
-release
-qgroundcontrol
-mavlinkgen-build-desktop
-qgroundcontrol.xcodeproj/**
-doc/html
-doc/doxy.log
-deploy/mac
-deploy/linux
-deploy/qgroundcontrol*
-controller_log*
-user_config.pri
-*.app
-*.ncb
-*.vcproj
-*.vcxproj*
-*.sdf
-*.ipch
-*.pdb
-*.sln
-*.sln
-*.vcproj
-*.user
-*.ncb
-*.idb
-*.project
-*.cproject
-*.sln
-*.suo
-*.uhf.txt
-*.opensdf
-
-thirdParty/qserialport-build-desktop/
-thirdParty/qserialport/bin/
-thirdParty/qserialport/lib/
+*.swp
+*.nfs
+CMakeFiles
+*Makefile*
+tags
+build*/
+Info.plist
+obj
+.DS_Store
+*.log
+*~
+*~.skp
+bin/*.exe
+bin/*.txt
+bin/mac
+*pro.user*
+qrc_*.cpp
+*.Debug
+*.Release
+tmp
+debug
+release
+/qgroundcontrol
+mavlinkgen-build-desktop
+qgroundcontrol.xcodeproj/**
+doc/html
+doc/doxy.log
+deploy/mac
+deploy/linux
+deploy/qgroundcontrol*
+controller_log*
+user_config.pri
+*.app
+*.ncb
+*.vcproj
+*.vcxproj*
+*.sdf
+*.ipch
+*.pdb
+*.sln
+*.sln
+*.vcproj
+*.user
+*.ncb
+*.idb
+*.project
+*.cproject
+*.sln
+*.suo
+*.uhf.txt
+*.opensdf
+thirdParty/qserialport-build-desktop/
+thirdParty/qserialport/bin/
+thirdParty/qserialport/lib/
+GeneratedFiles/
+
+*.autosave

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "qupgrade"]
+	path = qupgrade
+	url = https://github.com/LorenzMeier/qupgrade.git

Custom-Info.plist

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
+<plist version="0.9">
+<dict>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>CFBundleIconFile</key>
+	<string>macx.icns</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleVersion</key>
+	<string>227</string>
+	<key>CFBundleShortVersionString</key>
+	<string>2.0.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleExecutable</key>
+	<string>@EXECUTABLE@</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.qgroundcontrol.qgroundcontrol</string>
+	<key>NOTE</key>
+	<string>Open source ground control app provided by QGroundControl dev team</string>
+</dict>
+</plist>

README

@@ -1,173 +0,0 @@
-maah
-QGroundControl Open Source Micro Air Vehicle Ground Control Station
-
-Project:
-http://qgroundcontrol.org
-
-Files:
-http://github.com/mavlink/qgroundcontrol
-
-Credits:
-http://qgroundcontrol.org/credits
-
-
-Documentation
-=============
-For generating documentation, refer to README in the doc directory.
-
-
-Mac OS X
-========
-
-To build on Mac OS X (10.6 or later):
-
-Install SDL
------------
-1) Download SDL from:  <http://www.libsdl.org/release/SDL-1.2.14.dmg>
-
-2) From the SDL disk image, copy the `sdl.framework` bundle to `/Library/Frameworks` directory (if you are not an admin copy to `~/Library/Framewroks`)
-
-Install QT
------------
-1) Download Qt 4.8+
-
-2) Double click the package installer
-
-Build QGroundControl
---------------------
-1) From the terminal go to the `groundcontrol` directory
-
-2) Run `qmake -spec macx-g++`
-
-3) Run `make -j8`
-
-
-Linux 
-=====
-
-
-To build on Linux:
-
-sudo apt-get install phonon libqt4-dev \
- libphonon-dev libphonon4 phonon-backend-gstreamer \
- qtcreator libsdl1.2-dev libflite1 flite1-dev build-essential \
- libopenscenegraph-dev
-
-cd directory
-
-git clone https://github.com/mavlink/qgroundcontrol.git
-
-go to libs/thirdParty -> libxbee 
-
-Create Library -> Readme file in folder
-
-Ubuntu Application Menu -> Development -> Qt Creator
-
-QtCreator Menu File -> Open File or Project..
-
-Open directory/qgroundcontrol/qgroundcontrol.pro
-
-Hit the green play button to compile and launch it
-
-Done.
-
-
-Windows
-=======
-
-GNU GCC / MINGW IS UNTESTED, COULD WORK
-VISUAL STUDIO 2008 / 2010 EXPRESS EDITION IS FREE!
-
-Steps for Visual Studio 2008 / 2010:
-
-Windows XP/7:
-
-1) Download and install the Qt libraries for Windows from https://qt.nokia.com/downloads/ (the Visual Studio 2008 or 2010 version as appropriate)
-
-2) Download and install Visual Studio 2008 or 2010 Express Edition (free) from https://www.microsoft.com/visualstudio. If using Visual Studio 2010, make sure you are running at least SP1. There is a linking error you'll encounter otherwise that will prevent compilation.
-
-3) Go to the QGroundControl folder and then to thirdParty/libxbee and build it following the instructions in win32.README
-
-4) Open the Qt Command Prompt program (should be in the Start Menu), navigate to the source folder of QGroundControl and create the Visual Studio project by typing:
-
-`qmake -tp vc qgroundcontrol.pro`
-
-5) Now start Visual Studio and load the qgroundcontrol.vcproj if using Visual Studio 2008 or qgroundcontrol.vcxproj if using Visual Studio 2010
-
-6) Compile and edit in Visual Studio. If you need to add new files, add them to qgroundcontrol.pro and re-run `qmake -tp vc qgroundcontrol.pro
-
-
-Repository Layout
-=================
-
-qgroundcontrol:
-	demo-log.txt
-	license.txt 
-	qgcunittest.pro - For the unit tests.
-	qgcunittest.pro.user
-	qgcvideo.pro
-	qgroundcontrol.pri - Used by qgroundcontrol.pro
-	qgroundcontrol.pro - Project opened in QT to run qgc.
-	qgroundcontrol.pro.user 
-	qgroundcontrol.qrc - Holds many images.
-	qgroundcontrol.rc - line of code to point toward the images
-	qserialport.pri - generated by qmake.
-	testlog.txt
-	testlog2.txt 
-	user_config.pri.dist - Custom message specs to be added here. 
-data: 
-	Maps from yahoo and kinect and earth. 
-deploy: 
-	Install and uninstall for win32.
-	Create a debian packet.
-	Create .DMG file for publishing for mac.
-	Audio test on mac.	
-doc: 
-	Doxyfile is in this directory and information for creating html documentation for qgc.
-files: 
-	Has the audio for the vehicle and data output. 
-		ardupilotmega: 
-			widgets and tool tips for pilot heading for the fixed wing.
-			tooltips for quadrotor
-		flightgear:
-			Aircraft: 
-				Different types of planes and one jeep. 
-			Protocol: 
-				The protocol for the fixed_wings and quadrotor and quadhil.holds info about the fixed wing yaw, roll etc. 					Quadrotor. Agian holds info about yaw, roll etc.
-		Pixhawk:
-			Widgets for hexarotor. Widgets and tooltips for quadrotor.
-		vehicles: 
-			different vehicles. Seems to hold the different kinds of aircrafts as well as files for audio and the hexarotor 			and quadrotor.
-		widgets: 
-			Has a lot of widgets defined for buttons and sliders.
-
-images: 
-	For the UI. Has a bunch of different images such as images for applications or actions or buttons.
-lib: 
-	SDL is located in this direcotry. 
-	Msinttypes: 
-		Defines intteger types for microsoft visual studio. 
-	sdl:
-		Information about the library and to run the library on different platforms. 
-mavlink: 
-	The files for the library mavlink. 
-qgcunittest: 
-	Has the unittests for qgc
-settings: 
-	Parameter lists for alpha, bravo and charlie. 
-	Data for stereo, waypoints and radio calibrartion. 
-src:
-	Code for QGCCore, audio output, configuration, waypoints, main and log compressor.
-	apps - Code for mavlink generation and for a video application.
-	comm - Code for linking to simulation, mavlink, udp, xbee, opal, flight gear and interface.
-	Has other libraries. Qwt is in directory named lib. The other libraries are in libs.
-	lib - qwt library
-	libs - eigen, opmapcontrol, qestserialport, qtconcurrent, utils.
-	input - joystick and freenect code.
-	plugins - Qt project for PIXHAWK plugins.
-	uas - Ardu pilot, UAS, mavlink factory, uas manager, interface, waypoint manager and slugs.
-	ui - Has code for data plots, waypoint lists and window congfiguration. All of the ui code.
-thirdParty: 
-	Library called lxbee.
-	Library called QSerialPort.
-

README.md

@@ -0,0 +1,179 @@
+# QGroundControl 
+## Open Source Micro Air Vehicle Ground Control Station
+
+
+* Project:
+<http://qgroundcontrol.org>
+
+* Files:
+<http://github.com/mavlink/qgroundcontrol>
+
+* Credits:
+<http://qgroundcontrol.org/credits>
+
+
+## Documentation
+For generating documentation, refer to /doc/README.
+
+## Notes
+Please make sure to delete your build folder before re-building. Independent of which 
+build system you use (this is not related to Qt or your OS) the dependency checking and 
+cleaning is based on the current project revision. So if you change the project and don't remove the build folder before your next build, incremental building can leave you with stale object files.
+
+## QGC2.0 Tech Preview
+Developers: In order to build the tech preview branch you need to:
+
+    git clone https://github.com/mavlink/qgroundcontrol -b config qgc2
+    git submodule init
+    git submodule update
+
+This procedure:
+
+* Clones the config branch (which contains QGC2) from github into your qgc2 directory
+* initializes all the submodules required for QGC, such as qupdate, the firmware installer
+* gets the latest code for all submodules
+
+
+# Build on Mac OSX
+
+To build on Mac OSX (10.6 or later):
+- - -
+### Install SDL
+
+1. Download SDL from:  <http://www.libsdl.org/release/SDL-1.2.14.dmg>
+2. From the SDL disk image, copy the `sdl.framework` bundle to `/Library/Frameworks` directory (if you are not an admin copy to `~/Library/Frameworks`)
+
+### Install QT
+- - -
+1. Download Qt 4.8+ from <http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-mac-opensource-4.8.5.dmg > 
+2. Double click the package installer and follow instructions: <http://qt-project.org/doc/qt-4.8/install-mac.html>
+
+### Build QGroundControl
+- - -
+ (use clang compiler - not gcc)
+
+1. From the terminal go to the `groundcontrol` directory
+2. Run `qmake qgroundcontrol.pro -r -spec unsupported/macx-clang CONFIG+=x86_64`
+3. Run `make -j4`
+
+
+# Build on Linux 
+
+
+To build on Linux:
+- - -
+    sudo apt-get install phonon libqt4-dev libphonon-dev libphonon4 phonon-backend-gstreamer qtcreator libsdl1.2-dev libflite1 flite1-dev build-essential libopenscenegraph-dev
+    cd directory
+    git clone https://github.com/mavlink/qgroundcontrol.git
+
+* go to `libs/thirdParty -> libxbee` 
+* Create Library -> Readme file in folder
+* Ubuntu Application Menu -> Development -> Qt Creator
+* QtCreator Menu File -> Open File or Project..
+* Open `directory/qgroundcontrol/qgroundcontrol.pro`
+* Hit the green play button to compile and launch it
+
+
+# Build on Windows
+- - -
+
+__GNU GCC / MINGW IS UNTESTED, COULD WORK WITH
+VISUAL STUDIO 2008 / 2010 EXPRESS EDITION (FREE!)__
+
+Steps for Visual Studio 2008 / 2010:
+
+Windows XP/7:
+
+1. Download and install the Qt libraries for Windows from https://qt.nokia.com/downloads/ (the Visual Studio 2008 or 2010 version as appropriate)
+
+2. Download and install Visual Studio 2008 or 2010 Express Edition (free) from https://www.microsoft.com/visualstudio. If using Visual Studio 2010, make sure you are running at least SP1. There is a linking error you'll encounter otherwise that will prevent compilation.
+
+3. Go to the QGroundControl folder and then to thirdParty/libxbee and build it following the instructions in win32.README
+
+4. Open the Qt Command Prompt program (should be in the Start Menu), navigate to the source folder of QGroundControl and create the Visual Studio project by typing `qmake -tp vc qgroundcontrol.pro`
+
+5. Now start Visual Studio and load the qgroundcontrol.vcproj if using Visual Studio 2008 or qgroundcontrol.vcxproj if using Visual Studio 2010
+
+6. Compile and edit in Visual Studio. If you need to add new files, add them to qgroundcontrol.pro and re-run `qmake -tp vc qgroundcontrol.pro`
+
+
+## Repository Layout
+    qgroundcontrol:
+	    demo-log.txt
+	    license.txt 
+	    qgcunittest.pro - For the unit tests.
+	    qgcunittest.pro.user
+	    qgcvideo.pro
+	    qgroundcontrol.pri - Used by qgroundcontrol.pro
+	    qgroundcontrol.pro - Project opened in QT to run qgc.
+	    qgroundcontrol.pro.user 
+	    qgroundcontrol.qrc - Holds many images.
+	    qgroundcontrol.rc - line of code to point toward the images
+	    qserialport.pri - generated by qmake.
+	    testlog.txt - sample log file
+	    testlog2.txt - sample log file
+	    user_config.pri.dist - Custom message specs to be added here. 
+    data: 
+	    Maps from yahoo and kinect and earth. 
+    deploy: 
+	    Install and uninstall for win32.
+	    Create a debian packet.
+	    Create .DMG file for publishing for mac.
+	    Audio test on mac.	
+    doc: 
+	    Doxyfile is in this directory and information for creating html documentation for qgc.
+    files: 
+	    Has the audio for the vehicle and data output. 
+		    ardupilotmega: 
+			    widgets and tool tips for pilot heading for the fixed wing.
+			    tooltips for quadrotor
+		    flightgear:
+			    Aircraft: 
+				    Different types of planes and one jeep. 
+			    Protocol: 
+				    The protocol for the fixed_wings and quadrotor and quadhil.holds info about the fixed wing yaw, roll etc. 	
+			    Quadrotor:
+			        Again holds info about yaw, roll etc.
+			    Pixhawk:
+			        Widgets for hexarotor. Widgets and tooltips for quadrotor.
+			    vehicles: 
+			        different vehicles. Seems to hold the different kinds of aircrafts as well as files for audio and the hexarotor and quadrotor.
+			    widgets: 
+			        Has a lot of widgets defined for buttons and sliders.
+
+    images: 
+	    For the UI. Has a bunch of different images such as images for applications or actions or buttons.
+    lib: 
+	    SDL is located in this direcotry. 
+	Msinttypes: 
+	    Defines intteger types for microsoft visual studio. 
+	sdl:
+	    Information about the library and to run the library on different platforms. 
+    mavlink: 
+	    The files for the library mavlink. 
+    qgcunittest: 
+	    Has the unittests for qgc
+    settings: 
+	    Parameter lists for alpha, bravo and charlie. Data for stereo, waypoints and radio calibration. 
+    src:
+	    Code for QGCCore, audio output, configuration, waypoints, main and log compressor.
+	apps
+	    Code for mavlink generation and for a video application.
+	comm
+	    Code for linking to simulation, mavlink, udp, xbee, opal, flight gear and interface.
+	Has other libraries. Qwt is in directory named lib. The other libraries are in libs.
+	lib
+	    qwt library
+	libs
+	    eigen, opmapcontrol, qestserialport, qtconcurrent, utils.
+	input
+	    joystick and freenect code.
+	plugins
+	    Qt project for PIXHAWK plugins.
+	uas
+	    Ardu pilot, UAS, mavlink factory, uas manager, interface, waypoint manager and slugs.
+	ui
+	    Has code for data plots, waypoint lists and window congfiguration. All of the ui code.
+thirdParty: 
+	    Library called lxbee.
+	    Library called QSerialPort.

files/flightgear/Protocol/qgroundcontrol-fixed-wing.xml

@@ -141,6 +141,41 @@
      <node>/velocities/airspeed-kt</node>
      <factor>0.514444444444444</factor>      <!-- knots to mps -->
    </chunk>
+
+   <!-- Magnetometer -->
+   <chunk>
+    <name>Magnetic Variation (rad)</name>
+    <type>float</type>
+    <format>%.8f</format>
+    <node>/environment/magnetic-variation-deg</node>
+    <factor>0.01745329251994329576</factor>  <!-- degrees to radians -->
+   </chunk>
+
+   <chunk>
+    <name>Magnetic Dip (rad)</name>
+    <type>float</type>
+    <format>%.8f</format>
+    <node>/environment/magnetic-dip-deg</node>
+    <factor>0.01745329251994329576</factor>  <!-- degrees to radians -->
+   </chunk>
+
+   <!-- Temperature -->
+   <chunk>
+    <name>Temperature (deg C)</name>
+    <type>float</type>
+    <format>%.8f</format>
+    <node>/environment/temperature-degc</node>
+    <factor>1</factor>
+   </chunk>
+
+   <!-- Pressure -->
+   <chunk>
+    <name>Pressure (hPa)</name>
+    <type>float</type>
+    <format>%.8f</format>
+    <node>/environment/pressure-inhg</node>
+    <factor>33.86389</factor>                  <!-- inhg to hpa -->
+   </chunk>
    
   </output>
 
@@ -184,4 +219,4 @@
 
  </generic>
 
-</PropertyList>
+</PropertyList>

files/images/px4/rc/rc_backgrounds.graffle

@@ -0,0 +1,674 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>ActiveLayerIndex</key>
+	<integer>0</integer>
+	<key>ApplicationVersion</key>
+	<array>
+		<string>com.omnigroup.OmniGraffle</string>
+		<string>139.18.0.187838</string>
+	</array>
+	<key>AutoAdjust</key>
+	<true/>
+	<key>BackgroundGraphic</key>
+	<dict>
+		<key>Bounds</key>
+		<string>{{0, 0}, {559.28001499176025, 782.8900146484375}}</string>
+		<key>Class</key>
+		<string>SolidGraphic</string>
+		<key>ID</key>
+		<integer>2</integer>
+		<key>Style</key>
+		<dict>
+			<key>shadow</key>
+			<dict>
+				<key>Draws</key>
+				<string>NO</string>
+			</dict>
+			<key>stroke</key>
+			<dict>
+				<key>Draws</key>
+				<string>NO</string>
+			</dict>
+		</dict>
+	</dict>
+	<key>BaseZoom</key>
+	<integer>0</integer>
+	<key>CanvasOrigin</key>
+	<string>{0, 0}</string>
+	<key>ColumnAlign</key>
+	<integer>1</integer>
+	<key>ColumnSpacing</key>
+	<real>36</real>
+	<key>CreationDate</key>
+	<string>2013-08-23 20:20:16 +0000</string>
+	<key>Creator</key>
+	<string>Lorenz</string>
+	<key>DisplayScale</key>
+	<string>1 0/72 in = 1 0/72 in</string>
+	<key>GraphDocumentVersion</key>
+	<integer>8</integer>
+	<key>GraphicsList</key>
+	<array>
+		<dict>
+			<key>Bounds</key>
+			<string>{{188.3818359375, 271.5}, {29, 16}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>FitText</key>
+			<string>YES</string>
+			<key>Flow</key>
+			<string>Resize</string>
+			<key>FontInfo</key>
+			<dict>
+				<key>Color</key>
+				<dict>
+					<key>b</key>
+					<string>0.379293</string>
+					<key>g</key>
+					<string>0.379287</string>
+					<key>r</key>
+					<string>0.379298</string>
+				</dict>
+				<key>Font</key>
+				<string>Helvetica-Bold</string>
+				<key>Size</key>
+				<real>13</real>
+			</dict>
+			<key>ID</key>
+			<integer>38</integer>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>fill</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Pad</key>
+				<integer>0</integer>
+				<key>RTFD</key>
+				<data>
+				BAtzdHJlYW10eXBlZIHoA4QBQISEhBJOU0F0dHJpYnV0
+				ZWRTdHJpbmcAhIQITlNPYmplY3QAhZKEhIQITlNTdHJp
+				bmcBlIQBKwVyaWdodIaEAmlJAQWShISEDE5TRGljdGlv
+				bmFyeQCUhAFpA5KElpYHTlNDb2xvcoaShISEB05TQ29s
+				b3IAlIQBYwKEBGZmZmaD6ujoPoPq6Og+g+ro6D4BhpKE
+				lpYQTlNQYXJhZ3JhcGhTdHlsZYaShISEEE5TUGFyYWdy
+				YXBoU3R5bGUAlIQEQ0NAUwIAhISEB05TQXJyYXkAlJkM
+				koSEhAlOU1RleHRUYWIAlIQCQ2YAHIaShKKhADiGkoSi
+				oQBUhpKEoqEAcIaShKKhAIGMAIaShKKhAIGoAIaShKKh
+				AIHEAIaShKKhAIHgAIaShKKhAIH8AIaShKKhAIEYAYaS
+				hKKhAIE0AYaShKKhAIFQAYaGgQAIhARbMWZdg83MTD2G
+				koSWlgZOU0ZvbnSGkoSEhAZOU0ZvbnQelJkohAVbNDBj
+				XQYAAAAeAAAA//5IAGUAbAB2AGUAdABpAGMAYQAtAEIA
+				bwBsAGQAAACEAWYNmwCbAZsAmwCGhoY=
+				</data>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf390
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;\red97\green97\blue97;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\b\fs26 \cf2 right}</string>
+				<key>VerticalPad</key>
+				<integer>0</integer>
+			</dict>
+			<key>Wrap</key>
+			<string>NO</string>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{153, 271.5}, {20, 16}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>FitText</key>
+			<string>YES</string>
+			<key>Flow</key>
+			<string>Resize</string>
+			<key>FontInfo</key>
+			<dict>
+				<key>Color</key>
+				<dict>
+					<key>b</key>
+					<string>0.379293</string>
+					<key>g</key>
+					<string>0.379287</string>
+					<key>r</key>
+					<string>0.379298</string>
+				</dict>
+				<key>Font</key>
+				<string>Helvetica-Bold</string>
+				<key>Size</key>
+				<real>13</real>
+			</dict>
+			<key>ID</key>
+			<integer>36</integer>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>fill</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Pad</key>
+				<integer>0</integer>
+				<key>RTFD</key>
+				<data>
+				BAtzdHJlYW10eXBlZIHoA4QBQISEhBJOU0F0dHJpYnV0
+				ZWRTdHJpbmcAhIQITlNPYmplY3QAhZKEhIQITlNTdHJp
+				bmcBlIQBKwRsZWZ0hoQCaUkBBJKEhIQMTlNEaWN0aW9u
+				YXJ5AJSEAWkEkoSWlg5OU09yaWdpbmFsRm9udIaShISE
+				Bk5TRm9udB6UmRyEBVsyOGNdBgAAABQAAAD//kgAZQBs
+				AHYAZQB0AGkAYwBhAIQBZgyEAWMAnQGdAJ0AhpKElpYQ
+				TlNQYXJhZ3JhcGhTdHlsZYaShISEF05TTXV0YWJsZVBh
+				cmFncmFwaFN0eWxlAISEEE5TUGFyYWdyYXBoU3R5bGUA
+				lIQEQ0NAUwIAhYEACIQEWzFmXYPNzEw9hpKElpYGTlNG
+				b250hpKEm5kohAVbNDBjXQYAAAAeAAAA//5IAGUAbAB2
+				AGUAdABpAGMAYQAtAEIAbwBsAGQAAACcDZ0AnQGdAJ0A
+				hpKElpYHTlNDb2xvcoaShISEB05TQ29sb3IAlJ0ChARm
+				ZmZmg+ro6D6D6ujoPoPq6Og+AYaGhg==
+				</data>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf390
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;\red97\green97\blue97;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\b\fs26 \cf2 left}</string>
+				<key>VerticalPad</key>
+				<integer>0</integer>
+			</dict>
+			<key>Wrap</key>
+			<string>NO</string>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{124, 268}, {23, 23}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>ID</key>
+			<integer>35</integer>
+			<key>Rotation</key>
+			<real>180</real>
+			<key>Shape</key>
+			<string>HorizontalTriangle</string>
+			<key>Style</key>
+			<dict>
+				<key>fill</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>b</key>
+						<string>0.380387</string>
+						<key>g</key>
+						<string>0.380387</string>
+						<key>r</key>
+						<string>0.380387</string>
+					</dict>
+				</dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>VerticalPad</key>
+				<integer>0</integer>
+			</dict>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{224, 268}, {23, 23}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>ID</key>
+			<integer>34</integer>
+			<key>Shape</key>
+			<string>HorizontalTriangle</string>
+			<key>Style</key>
+			<dict>
+				<key>fill</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>b</key>
+						<string>0.380387</string>
+						<key>g</key>
+						<string>0.380387</string>
+						<key>r</key>
+						<string>0.380387</string>
+					</dict>
+				</dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>VerticalPad</key>
+				<integer>0</integer>
+			</dict>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{251.99999284744263, 106}, {23, 23}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>ID</key>
+			<integer>33</integer>
+			<key>Rotation</key>
+			<real>270</real>
+			<key>Shape</key>
+			<string>HorizontalTriangle</string>
+			<key>Style</key>
+			<dict>
+				<key>fill</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>b</key>
+						<string>0.380387</string>
+						<key>g</key>
+						<string>0.380387</string>
+						<key>r</key>
+						<string>0.380387</string>
+					</dict>
+				</dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>VerticalPad</key>
+				<integer>0</integer>
+			</dict>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{167.80909729003906, 160}, {42.381816864013672, 42}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>ID</key>
+			<integer>32</integer>
+			<key>Shape</key>
+			<string>Circle</string>
+			<key>Style</key>
+			<dict>
+				<key>fill</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>b</key>
+						<string>0.379293</string>
+						<key>g</key>
+						<string>0.379287</string>
+						<key>r</key>
+						<string>0.379298</string>
+					</dict>
+				</dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>VerticalPad</key>
+				<integer>0</integer>
+			</dict>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{252, 205}, {23, 23}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>ID</key>
+			<integer>13</integer>
+			<key>Rotation</key>
+			<real>90</real>
+			<key>Shape</key>
+			<string>HorizontalTriangle</string>
+			<key>Style</key>
+			<dict>
+				<key>fill</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>b</key>
+						<string>0.380387</string>
+						<key>g</key>
+						<string>0.380387</string>
+						<key>r</key>
+						<string>0.380387</string>
+					</dict>
+				</dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>VerticalPad</key>
+				<integer>0</integer>
+			</dict>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{171.5, 147.5}, {128, 23}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>ID</key>
+			<integer>30</integer>
+			<key>Rotation</key>
+			<real>90</real>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>fill</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>b</key>
+						<string>0.409312</string>
+						<key>g</key>
+						<string>0.828576</string>
+						<key>r</key>
+						<string>0.468975</string>
+					</dict>
+				</dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+			</dict>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{119, 237}, {128, 23}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>ID</key>
+			<integer>29</integer>
+			<key>Shape</key>
+			<string>Rectangle</string>
+			<key>Style</key>
+			<dict>
+				<key>fill</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>b</key>
+						<string>0.409312</string>
+						<key>g</key>
+						<string>0.828576</string>
+						<key>r</key>
+						<string>0.468975</string>
+					</dict>
+				</dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+			</dict>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{78, 71}, {222, 220}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>ID</key>
+			<integer>28</integer>
+			<key>Shape</key>
+			<string>Circle</string>
+			<key>Style</key>
+			<dict>
+				<key>fill</key>
+				<dict>
+					<key>Color</key>
+					<dict>
+						<key>b</key>
+						<string>0.877468</string>
+						<key>g</key>
+						<string>0.877468</string>
+						<key>r</key>
+						<string>0.877468</string>
+					</dict>
+				</dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>VerticalPad</key>
+				<integer>0</integer>
+			</dict>
+		</dict>
+	</array>
+	<key>GridInfo</key>
+	<dict/>
+	<key>GuidesLocked</key>
+	<string>NO</string>
+	<key>GuidesVisible</key>
+	<string>YES</string>
+	<key>HPages</key>
+	<integer>1</integer>
+	<key>ImageCounter</key>
+	<integer>1</integer>
+	<key>KeepToScale</key>
+	<false/>
+	<key>Layers</key>
+	<array>
+		<dict>
+			<key>Lock</key>
+			<string>NO</string>
+			<key>Name</key>
+			<string>Ebene 1</string>
+			<key>Print</key>
+			<string>YES</string>
+			<key>View</key>
+			<string>YES</string>
+		</dict>
+	</array>
+	<key>LayoutInfo</key>
+	<dict>
+		<key>Animate</key>
+		<string>NO</string>
+		<key>circoMinDist</key>
+		<real>18</real>
+		<key>circoSeparation</key>
+		<real>0.0</real>
+		<key>layoutEngine</key>
+		<string>dot</string>
+		<key>neatoSeparation</key>
+		<real>0.0</real>
+		<key>twopiSeparation</key>
+		<real>0.0</real>
+	</dict>
+	<key>LinksVisible</key>
+	<string>NO</string>
+	<key>MagnetsVisible</key>
+	<string>NO</string>
+	<key>MasterSheets</key>
+	<array/>
+	<key>ModificationDate</key>
+	<string>2013-08-26 18:20:11 +0000</string>
+	<key>Modifier</key>
+	<string>Lorenz</string>
+	<key>NotesVisible</key>
+	<string>NO</string>
+	<key>Orientation</key>
+	<integer>2</integer>
+	<key>OriginVisible</key>
+	<string>NO</string>
+	<key>PageBreaks</key>
+	<string>YES</string>
+	<key>PrintInfo</key>
+	<dict>
+		<key>NSBottomMargin</key>
+		<array>
+			<string>float</string>
+			<string>41</string>
+		</array>
+		<key>NSHorizonalPagination</key>
+		<array>
+			<string>coded</string>
+			<string>BAtzdHJlYW10eXBlZIHoA4QBQISEhAhOU051bWJlcgCEhAdOU1ZhbHVlAISECE5TT2JqZWN0AIWEASqEhAFxlwCG</string>
+		</array>
+		<key>NSLeftMargin</key>
+		<array>
+			<string>float</string>
+			<string>18</string>
+		</array>
+		<key>NSPaperSize</key>
+		<array>
+			<string>size</string>
+			<string>{595.28001499176025, 841.8900146484375}</string>
+		</array>
+		<key>NSPrintReverseOrientation</key>
+		<array>
+			<string>int</string>
+			<string>0</string>
+		</array>
+		<key>NSRightMargin</key>
+		<array>
+			<string>float</string>
+			<string>18</string>
+		</array>
+		<key>NSTopMargin</key>
+		<array>
+			<string>float</string>
+			<string>18</string>
+		</array>
+	</dict>
+	<key>PrintOnePage</key>
+	<false/>
+	<key>ReadOnly</key>
+	<string>NO</string>
+	<key>RowAlign</key>
+	<integer>1</integer>
+	<key>RowSpacing</key>
+	<real>36</real>
+	<key>SheetTitle</key>
+	<string>Arbeitsfläche 1</string>
+	<key>SmartAlignmentGuidesActive</key>
+	<string>YES</string>
+	<key>SmartDistanceGuidesActive</key>
+	<string>YES</string>
+	<key>UniqueID</key>
+	<integer>1</integer>
+	<key>UseEntirePage</key>
+	<false/>
+	<key>VPages</key>
+	<integer>1</integer>
+	<key>WindowInfo</key>
+	<dict>
+		<key>CurrentSheet</key>
+		<integer>0</integer>
+		<key>ExpandedCanvases</key>
+		<array/>
+		<key>Frame</key>
+		<string>{{76, 4}, {918, 774}}</string>
+		<key>ListView</key>
+		<true/>
+		<key>OutlineWidth</key>
+		<integer>142</integer>
+		<key>RightSidebar</key>
+		<false/>
+		<key>ShowRuler</key>
+		<true/>
+		<key>Sidebar</key>
+		<true/>
+		<key>SidebarWidth</key>
+		<integer>120</integer>
+		<key>VisibleRegion</key>
+		<string>{{-112, 0}, {783, 635}}</string>
+		<key>Zoom</key>
+		<real>1</real>
+		<key>ZoomValues</key>
+		<array>
+			<array>
+				<string>Arbeitsfläche 1</string>
+				<real>1</real>
+				<real>1</real>
+			</array>
+		</array>
+	</dict>
+</dict>
+</plist>

files/px4/widgets/px4_calibration.qgw

@@ -58,4 +58,16 @@ QGC_TOOL_WIDGET_ITEMS\5\QGC_COMMAND_BUTTON_PARAM4=1
 QGC_TOOL_WIDGET_ITEMS\5\QGC_COMMAND_BUTTON_PARAM5=0
 QGC_TOOL_WIDGET_ITEMS\5\QGC_COMMAND_BUTTON_PARAM6=0
 QGC_TOOL_WIDGET_ITEMS\5\QGC_COMMAND_BUTTON_PARAM7=0
-QGC_TOOL_WIDGET_ITEMS\size=5
+QGC_TOOL_WIDGET_ITEMS\6\TYPE=COMMANDBUTTON
+QGC_TOOL_WIDGET_ITEMS\6\QGC_COMMAND_BUTTON_DESCRIPTION=Reboot to Bootloader
+QGC_TOOL_WIDGET_ITEMS\6\QGC_COMMAND_BUTTON_BUTTONTEXT=BOOTLOADER
+QGC_TOOL_WIDGET_ITEMS\6\QGC_COMMAND_BUTTON_COMMANDID=246
+QGC_TOOL_WIDGET_ITEMS\6\QGC_COMMAND_BUTTON_PARAMS_VISIBLE=false
+QGC_TOOL_WIDGET_ITEMS\6\QGC_COMMAND_BUTTON_PARAM1=3
+QGC_TOOL_WIDGET_ITEMS\6\QGC_COMMAND_BUTTON_PARAM2=0
+QGC_TOOL_WIDGET_ITEMS\6\QGC_COMMAND_BUTTON_PARAM3=0
+QGC_TOOL_WIDGET_ITEMS\6\QGC_COMMAND_BUTTON_PARAM4=0
+QGC_TOOL_WIDGET_ITEMS\6\QGC_COMMAND_BUTTON_PARAM5=0
+QGC_TOOL_WIDGET_ITEMS\6\QGC_COMMAND_BUTTON_PARAM6=0
+QGC_TOOL_WIDGET_ITEMS\6\QGC_COMMAND_BUTTON_PARAM7=0
+QGC_TOOL_WIDGET_ITEMS\size=7

files/styles/style-dark.css

@@ -208,6 +208,32 @@ QGCToolBar .QWidget {
     background-color: transparent;
 }
 
+QGCPX4SensorCalibration QLabel#magLabel {
+    font-size: 15pt;
+    font-weight: bold;
+    border-radius: 4px;
+    min-height: 25px;
+}
+
+QGCPX4SensorCalibration QLabel#gyroLabel {
+    font-size: 15pt;
+    font-weight: bold;
+    border-radius: 4px;
+    min-height: 25px;
+}
+
+QGCPX4SensorCalibration QLabel#accelLabel {
+    font-size: 15pt;
+    font-weight: bold;
+    border-radius: 4px;
+    min-height: 25px;
+}
+
+QGCPX4VehicleConfig QLabel#rcLabel {
+    color: #FEC654;
+    font-size: 18pt;
+}
+
 QGCToolWidgetItem {
     border: 1px solid #666;
     border-radius: 3px;
@@ -248,6 +274,31 @@ QLabel#noUas {
     font-size: 30pt;
 }
 
+QMessageBox QLabel {
+    font-size: 14pt;
+}
+
+QMessageBox {
+    min-width: 400px;
+    min-height: 300px;
+}
+
+QLabel#calibrationExplanationLabel {
+    font-size: 20pt;
+}
+
+QLabel#tabTitleLabel {
+    font-size: 28pt;
+    font-weight: lighter;
+    margin-top: 16px;
+    margin-bottom: 8px;
+}
+
+QLabel#instructionLabel {
+    color: #FEC654;
+    font-size: 26pt;
+}
+
 QLineEdit {
     border: 1px solid #777;
     border-radius: 2px;
@@ -345,6 +396,34 @@ QPushButton, QToolButton {
     background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #777, stop: 1 #333);
 }
 
+QPushButton#advancedMenuButton, QPushButton#airframeMenuButton, QPushButton#firmwareMenuButton,
+QPushButton#generalMenuButton, QPushButton#rcMenuButton, QPushButton#sensorMenuButton {
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #333, stop: 1 #111);
+    border-radius: 5px;
+    min-height: 64px;
+    max-height: 64px;
+    min-width: 80px;
+    border: 1px solid #000000;
+}
+
+QPushButton#planePushButton, QPushButton#flyingWingPushButton, QPushButton#quadXPushButton,
+QPushButton#quadPlusPushButton, QPushButton#hexaXPushButton, QPushButton#hexaPlusPushButton,
+QPushButton#octoXPushButton, QPushButton#octoPlusPushButton, QPushButton#hPushButton {
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #777, stop: 1 #333);
+    border-radius: 5px;
+    min-height: 140px;
+    max-height: 240px;
+    min-width: 140px;
+    border: 1px solid #465158;
+}
+
+QPushButton:checked#planePushButton, QPushButton:checked#flyingWingPushButton, QPushButton:checked#quadXPushButton,
+QPushButton:checked#quadPlusPushButton, QPushButton:checked#hexaXPushButton, QPushButton:checked#hexaPlusPushButton,
+QPushButton:checked#octoXPushButton, QPushButton:checked#octoPlusPushButton, QPushButton:checked#hPushButton {
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #77F, stop: 1 #33A);
+    border: 3px solid #4651A8;
+}
+
 QPushButton#viewModeGeneric, QPushButton#viewModePX4, QPushButton#viewModeAPM, QPushButton#viewModeAR {
     background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #73D95D, stop: 1 #18A154);
     border-radius: 12px;
@@ -355,6 +434,24 @@ QPushButton#viewModeGeneric, QPushButton#viewModePX4, QPushButton#viewModeAPM, Q
     border: 3px solid #465158;
 }
 
+QPushButton#magButton, QPushButton#gyroButton, QPushButton#accelButton {
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #757575, stop: 1 #333);
+    border-radius: 5px;
+    border: 1px solid #000000;
+}
+
+QWidget#containerWidget {
+    background-color: qlineargradient(spread:pad, x1:0.527222, y1:0.961, x2:0.536946, y2:0.198864, stop:0.103448 rgba(65, 65, 65, 255), stop:1 rgba(119, 119, 119, 255));
+    border-radius: 16px;
+    border: 2px solid #CCCCCC;
+}
+
+QWidget#navBarWidget {
+    background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 #404040, stop:1 #727272);
+    border-radius: 0px;
+    border: 1px solid #222222;
+}
+
 QPushButton#connectButton, QPushButton#controlButton {
     background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #73D95D, stop: 1 #18A154);
 }