Stacey Sheldon 2119067722 Merge remote-tracking branch 'op-revo/james/revo' into revo-next ...

Conflicts:
	Makefile
	flight/Modules/Attitude/revolution/attitude.c
	flight/Modules/Battery/battery.c
	flight/Modules/FixedWingPathFollower/fixedwingpathfollower.c
	flight/Modules/GPS/GPS.c
	flight/Modules/ManualControl/inc/manualcontrol.h
	flight/Modules/ManualControl/manualcontrol.c
	flight/Modules/OveroSync/overosync.c
	flight/Modules/PathPlanner/inc/pathplanner.h
	flight/Modules/PathPlanner/pathplanner.c
	flight/Modules/Sensors/sensors.c
	flight/Modules/VtolPathFollower/vtolpathfollower.c
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/PiOS/Boards/pios_board.h
	flight/PiOS/STM32F4xx/library.mk
	flight/PiOS/inc/pios_hmc5883.h
	flight/PiOS/inc/pios_l3gd20.h
	flight/PiOS/inc/pios_rfm22b_priv.h
	flight/Revolution/Makefile
	flight/Revolution/Makefile.osx
	flight/Revolution/System/inc/pios_config.h
	flight/Revolution/UAVObjects.inc
	ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
	ground/openpilotgcs/src/libs/utils/homelocationutil.cpp
	ground/openpilotgcs/src/libs/utils/homelocationutil.h
	ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
	ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
	ground/openpilotgcs/src/plugins/plugins.pro
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	package/Makefile
	shared/uavobjectdefinition/fixedwingpathfollowersettings.xml
	shared/uavobjectdefinition/fixedwingpathfollowerstatus.xml
	shared/uavobjectdefinition/flightstatus.xml
	shared/uavobjectdefinition/hwsettings.xml
	shared/uavobjectdefinition/manualcontrolsettings.xml
	shared/uavobjectdefinition/pathdesired.xml
	shared/uavobjectdefinition/vtolpathfollowersettings.xml
	shared/uavobjectdefinition/waypoint.xml

2012-10-30 00:08:43 -04:00

..

images

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

abstractprocess_win.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

abstractprocess.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

basevalidatinglineedit.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

basevalidatinglineedit.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

cachedsvgitem.cpp

Compilation fix on mac

2011-08-22 09:10:25 +10:00

cachedsvgitem.h

Added missing Q_DECL_EXPORT to CachedSvgItem

2011-08-21 23:40:11 +10:00

checkablemessagebox.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

checkablemessagebox.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

checkablemessagebox.ui

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

classnamevalidatinglineedit.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

classnamevalidatinglineedit.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

codegeneration.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

codegeneration.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

consoleprocess_unix.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

consoleprocess_win.cpp

Fixes compile issues on windows with latest Qt

2011-05-25 16:15:01 +01:00

consoleprocess.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

consoleprocess.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

coordinateconversions.cpp

Added conversion from rotation matrix to quaternions.

2012-10-08 15:17:47 +02:00

coordinateconversions.h

Added conversion from rotation matrix to quaternions.

2012-10-08 15:17:47 +02:00

detailsbutton.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

detailsbutton.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

detailswidget.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

detailswidget.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

fancylineedit.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

fancylineedit.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

fancymainwindow.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

fancymainwindow.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

filenamevalidatinglineedit.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

filenamevalidatinglineedit.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

filesearch.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

filesearch.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

filewizarddialog.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

filewizarddialog.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

filewizardpage.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

filewizardpage.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

filewizardpage.ui

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

homelocationutil.cpp

Merge branch 'next' into revo

2012-09-28 01:00:10 -05:00

homelocationutil.h

Rewrote uavobjectutilmanager.cpp, such that upon UAVO changes it returns com

2012-09-27 11:45:59 +02:00

iwelcomepage.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

iwelcomepage.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

linecolumnlabel.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

linecolumnlabel.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

listutils.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

mylistwidget.cpp

Add new widgets with simpler code than what is used currently (FancyTabWidget).

2011-08-03 10:02:51 +02:00

mylistwidget.h

Added new icons and fixed icon states when selected/highlighted.

2012-10-05 14:30:37 +02:00

mytabbedstackwidget.cpp

Complete set of new icons.

2012-10-06 16:12:15 +02:00

mytabbedstackwidget.h

OP-39 Added code to jump from the SetupWizard directly to the InputWizard in the ConfigurationPlugin to complete the vehicle setup and realize the 1-2-Fly idea.

2012-08-03 18:31:47 +02:00

mytabwidget.cpp

Add new widgets with simpler code than what is used currently (FancyTabWidget).

2011-08-03 10:02:51 +02:00

mytabwidget.h

Add new widgets with simpler code than what is used currently (FancyTabWidget).

2011-08-03 10:02:51 +02:00

newclasswidget.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

newclasswidget.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

newclasswidget.ui

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

parameteraction.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

parameteraction.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

pathchooser.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

pathchooser.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

pathlisteditor.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

pathlisteditor.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

pathutils.cpp

GCS-Change config file name

2012-10-08 22:36:32 +01:00

pathutils.h

Modify "StoragePath" to use the settings storage directory and not the home directory. Works on Linux.

2011-05-09 15:19:10 +02:00

projectintropage.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

projectintropage.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

projectintropage.ui

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

projectnamevalidatinglineedit.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

projectnamevalidatinglineedit.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

qtcassert.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

qtcolorbutton.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

qtcolorbutton.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

qwineventnotifier_p.h

Fixes compile issues on windows with latest Qt

2011-05-25 16:15:01 +01:00

reloadpromptutils.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

reloadpromptutils.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

savedaction.cpp

Merge remote branch 'origin/next' into os/features/pid-tuning-from-transmitter-next

2012-02-22 23:03:17 +02:00

savedaction.h

Merge remote branch 'origin/next' into os/features/pid-tuning-from-transmitter-next

2012-02-22 23:03:17 +02:00

settingsutils.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

settingsutils.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

styledbar.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

styledbar.h

GCS-Added gradient to edit gadgets bar

2012-08-16 23:30:31 +01:00

stylehelper.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

stylehelper.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

submiteditorwidget.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

submiteditorwidget.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

submiteditorwidget.ui

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

submitfieldwidget.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

submitfieldwidget.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

svgimageprovider.cpp

Added the border parameter to the svg image provider

2012-09-11 15:19:19 +10:00

svgimageprovider.h

SvgImageProvider signature correction to use utils_global macro QTCREATOR_UTILS_EXPORT

2012-08-01 09:40:33 +10:00

synchronousprocess.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

synchronousprocess.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

treewidgetcolumnstretcher.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

treewidgetcolumnstretcher.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

uncommentselection.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

uncommentselection.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

utils_global.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

utils.pri

OP-520 Change $$qtLibraryTarget to $$qtLibraryName

2011-08-04 15:17:08 +02:00

utils.pro

Moved svgimageprovider from qmlview plugin to utils lib

2012-07-23 15:36:53 +10:00

utils.qrc

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

welcomemodetreewidget.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

welcomemodetreewidget.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

winutils.cpp

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

winutils.h

build: Move openpilotgcs into its own subdirectory

2011-01-22 17:40:26 +00:00

worldmagmodel.cpp

Fixed World Magnetic Model to accept altitude in meters instead of kilometers

2012-07-31 00:18:10 +02:00

worldmagmodel.h

Changed the main function parameter format.

2011-01-23 18:03:59 +00:00

xmlconfig.cpp

Fix segfault on close. Fix _terrible_ variable naming. Fix excessive qDebug messages.

2011-05-31 23:31:40 -07:00

xmlconfig.h

Change default settings format from ini to xml

2011-05-29 14:02:10 +02:00