Mike LaBranche bf591ebe45 Merge branch 'next' into MikeL ...

Conflicts:
	flight/Bootloaders/Revolution/inc/pios_config.h
	flight/Modules/OveroSync/inc/overosync.h
	flight/Modules/Sensors/inc/sensors.h
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/PiOS/STM32F4xx/pios_iap.c
	flight/Revolution/System/inc/pios_config.h
	ground/openpilotgcs/src/plugins/config/config.pro
	ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
	ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp

2012-06-04 15:38:57 -07:00

..

accels.xml

Update the logging modes for these objects to match the new meta information

2012-05-03 17:00:41 -05:00

accessorydesired.xml

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

actuatorcommand.xml

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

actuatordesired.xml

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

actuatorsettings.xml

Merge branch 'next' into MikeL

2012-06-04 15:38:57 -07:00

altholdsmoothed.xml

Update the logging modes for these objects to match the new meta information

2012-05-03 17:00:41 -05:00

altitudeholddesired.xml

Rework the altitude hold code a bit

2012-02-08 09:42:10 -06:00

altitudeholdsettings.xml

Update the logging modes for these objects to match the new meta information

2012-05-03 17:00:41 -05:00

attitudeactual.xml

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

attitudesettings.xml

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

baroaltitude.xml

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

cameradesired.xml

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

camerastabsettings.xml

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

faultsettings.xml

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

firmwareiapobj.xml

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

flightbatterysettings.xml

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

flightbatterystate.xml

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

flightplancontrol.xml

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

flightplansettings.xml

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

flightplanstatus.xml

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

flightstatus.xml

Merge branch 'next' into cc3d

2012-05-03 16:31:49 -05:00

flighttelemetrystats.xml

UAVObjects-xml: Move UAVObject definitions outside of gcs dir

2011-01-22 17:38:43 +00:00

gcsreceiver.xml

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

gcstelemetrystats.xml

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

gpsposition.xml

gpsposition: minor text changes to description text

2011-02-12 22:19:38 +00:00

gpssatellites.xml

UAVObjects-xml: Move UAVObject definitions outside of gcs dir

2011-01-22 17:38:43 +00:00

gpstime.xml

OP-316 UAVObject Fix typo, indents, units, default values

2011-02-27 00:38:59 +00:00

guidancesettings.xml

Merge branch 'next' into cc3d

2012-05-03 16:31:49 -05:00

gyros.xml

Update the logging modes for these objects to match the new meta information

2012-05-03 17:00:41 -05:00

gyrosbias.xml

Update the logging modes for these objects to match the new meta information

2012-05-03 17:00:41 -05:00

homelocation.xml

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

hwsettings.xml

Merge branch 'next' into cc3d

2012-05-03 16:31:49 -05:00

i2cstats.xml

OP-316 UAVObject Fix typo, indents, units, default values

2011-02-27 00:38:59 +00:00

magnetometer.xml

Update the logging modes for these objects to match the new meta information

2012-05-03 17:00:41 -05:00

manualcontrolcommand.xml

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

manualcontrolsettings.xml

Merge branch 'next' into cc3d

2012-05-03 16:31:49 -05:00

mixersettings.xml

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

mixerstatus.xml

fixed indentation

2012-03-27 10:06:27 -05:00

nedaccel.xml

Merge branch 'next' into cc3d

2012-05-03 16:31:49 -05:00

objectpersistence.xml

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

overosyncstats.xml

Add the number of dropped updates to the overosync stats

2012-02-07 09:13:26 -06:00

positionactual.xml

Fixed [cm] vs. [m] unit discrepencies in PFD and xml files, as per revo update to [m-kg-s] units.

2012-04-20 06:11:44 -04:00

positiondesired.xml

Fixed [cm] vs. [m] unit discrepencies in PFD and xml files, as per revo update to [m-kg-s] units.

2012-04-20 06:11:44 -04:00

ratedesired.xml

UAVObjects-xml: Move UAVObject definitions outside of gcs dir

2011-01-22 17:38:43 +00:00

receiveractivity.xml

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

revocalibration.xml

Update the logging modes for these objects to match the new meta information

2012-05-03 17:00:41 -05:00

sonaraltitude.xml

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

stabilizationdesired.xml

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

stabilizationsettings.xml

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

systemalarms.xml

Merge branch 'next' into revolution3

2012-01-21 11:27:03 -06:00

systemsettings.xml

Merge branch 'next' into MikeL

2012-06-04 15:38:57 -07:00

systemstats.xml

When the event system or object manager has an error store the object ID in the

2012-03-20 23:18:07 -05:00

taskinfo.xml

Update task info to cover the AltitudeHold module

2012-03-10 11:14:30 -06:00

txpidsettings.xml

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

velocityactual.xml

Fixed [cm] vs. [m] unit discrepencies in PFD and xml files, as per revo update to [m-kg-s] units.

2012-04-20 06:11:44 -04:00

velocitydesired.xml

Fixed [cm] vs. [m] unit discrepencies in PFD and xml files, as per revo update to [m-kg-s] units.

2012-04-20 06:11:44 -04:00

watchdogstatus.xml

UAVObjects-xml: Move UAVObject definitions outside of gcs dir

2011-01-22 17:38:43 +00:00