James Cotton 38e9d105aa Merge branch 'pidt1' into test2 ...

Conflicts:
	flight/Modules/ManualControl/inc/manualcontrol.h
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	shared/uavobjectdefinition/flightstatus.xml
	shared/uavobjectdefinition/hwsettings.xml
	shared/uavobjectdefinition/manualcontrolsettings.xml
	shared/uavobjectdefinition/taskinfo.xml

2012-09-10 14:37:52 -05:00

..

tests

Fixed metadata settings in object browswer, and removed update mode never from all uavobjects that used it (changed to manual).

2012-04-21 11:59:14 -07:00

wireshark

uavobjgenerator: Add generator for wireshark UAVO plugin

2012-06-19 00:21:35 -04:00

OPPlots.m

build: Move openpilotgcs into its own subdirectory

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

uavdataobject.cpp

build: Move openpilotgcs into its own subdirectory

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

uavdataobject.h

WIP configtaskwidget enhancements.

2012-02-02 16:22:40 +00:00

uavmetaobject.cpp

Merge branch 'next' into thread/OP-642

2012-06-30 16:51:19 +02:00

uavmetaobject.h

build: Move openpilotgcs into its own subdirectory

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

uavobject.cpp

Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next

2012-08-21 14:46:16 +01:00

uavobject.h

Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next

2012-08-21 14:46:16 +01:00

uavobject.py

build: Move openpilotgcs into its own subdirectory

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

uavobjectfield.cpp

GCS-Allow for more than 1 limit per index

2012-08-02 23:56:02 +01:00

uavobjectfield.h

GCS-Allow for more than 1 limit per index

2012-08-02 23:56:02 +01:00

uavobjectmanager.cpp

GCS - added uavo per instance "new instance" signal.

2012-06-18 00:16:23 +01:00

uavobjectmanager.h

build: Move openpilotgcs into its own subdirectory

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

uavobjects_dependencies.pri

build: move openpilotgcs output under <top>/build/ground

2011-01-22 17:41:48 +00:00

uavobjects_global.h

build: Move openpilotgcs into its own subdirectory

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

UAVObjects.pluginspec

build: Move openpilotgcs into its own subdirectory

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

uavobjects.pri

OP-520 Change $$qtLibraryTarget to $$qtLibraryName

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

uavobjects.pro

Merge branch 'pidt1' into test2

2012-09-10 14:37:52 -05:00

uavobjectsinit.h

build: Move openpilotgcs into its own subdirectory

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

uavobjectsinittemplate.cpp

build: Move openpilotgcs into its own subdirectory

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

uavobjectsplugin.cpp

build: Move openpilotgcs into its own subdirectory

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

uavobjectsplugin.h

build: Move openpilotgcs into its own subdirectory

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

uavobjecttemplate.cpp

OP-642 Added <category> element which is a string in uavo object type definition to be used in uavo browser to categorise uavo:s visually into subtrees. Category value is assigned in generated code and accessible via getter method. OP-644 Fixed option for uavo browser to enable disable hilights for objects which values wasn't really changed to indicate stream activity in uavo object tree.

2012-06-20 21:26:18 +02:00

uavobjecttemplate.h

OP-642 Added <category> element which is a string in uavo object type definition to be used in uavo browser to categorise uavo:s visually into subtrees. Category value is assigned in generated code and accessible via getter method. OP-644 Fixed option for uavo browser to enable disable hilights for objects which values wasn't really changed to indicate stream activity in uavo object tree.

2012-06-20 21:26:18 +02:00

uavobjecttemplate.m

Merge branch 'next' into test2

2012-09-10 14:29:26 -05:00

uavobjecttemplate.py

build: Move openpilotgcs into its own subdirectory

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