Stacey Sheldon 754f58c33a Merge remote-tracking branch 'op-public/next' into revo-next ...

Conflicts:
	flight/Modules/ManualControl/inc/manualcontrol.h
	flight/Revolution/Makefile.osx
	ground/openpilotgcs/src/plugins/plugins.pro
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
	shared/uavobjectdefinition/flightstatus.xml
	shared/uavobjectdefinition/hwsettings.xml
	shared/uavobjectdefinition/manualcontrolsettings.xml
	shared/uavobjectdefinition/taskinfo.xml

2012-09-16 09:56:35 -04:00

..

Actuator

actuator: factor out settings updates from main loop

2012-08-11 19:46:00 -04:00

AHRSComms

Merged latest origin/next.

2012-05-05 09:40:44 -07:00

Airspeed/revolution

Fix filtering rate for case where we have a baro sensor and a gps, but

2012-07-24 15:16:52 +02:00

Altitude

Merged latest origin/next.

2012-05-05 09:40:44 -07:00

AltitudeHold

Slow down update rate for the altitude hold smoothed EKF

2012-04-06 13:58:46 -05:00

Attitude

Merge remote-tracking branch 'op-public/next' into revo-next

2012-09-16 09:56:35 -04:00

Autotune

Autotuning: Increase the measurement time to 30 seconds.

2012-08-24 21:32:11 -05:00

Battery

Improved battery module to fully support regeneration. Fixed bug in builtin battery module. Improved ADC routing names.

2012-07-08 23:13:05 +02:00

CameraStab

Merge remote-tracking branch 'origin/stac/i2c_decoupling' into next

2012-01-17 22:35:36 -05:00

ComUsbBridge

modules: Allow optional modules to be used as built-in

2012-01-14 16:55:55 -05:00

Example

OP-423: simplify the MODULE_INITCALL macro and remove the ordering loops

2011-07-12 20:44:32 -07:00

Extensions/MagBaro

Optional modules for Revolution, compiles but not flight tested.

2012-07-30 12:20:18 +03:00

Fault

modules: Allow optional modules to be used as built-in

2012-01-14 16:55:55 -05:00

FirmwareIAP

Merged latest origin/next.

2012-05-05 09:40:44 -07:00

FixedWingPathFollower

Removed "airspeed" field from Airspeed UAVO. Now everything is done either with true airspeed or calibrated airspeed

2012-07-24 15:15:21 +02:00

FlightPlan

uavobjectmanager: remove uavo name field and related functions

2012-07-07 21:49:53 -04:00

GPS

Revert "Removed Revolution specific code"

2012-08-25 14:57:16 -04:00

ManualControl

Merge remote-tracking branch 'op-public/next' into revo-next

2012-09-16 09:56:35 -04:00

MK/MKSerial

OP-265 Flight reorganization of UAVObjects and Modules up a directory

2011-01-14 01:38:19 +00:00

Osd

Just some tests/fixes

2012-07-30 11:47:34 +03:00

OveroSync

Made OverSynce an optional module.

2012-07-07 11:53:58 +02:00

PathPlanner

Removed "airspeed" field from Airspeed UAVO. Now everything is done either with true airspeed or calibrated airspeed

2012-07-24 15:15:21 +02:00

PipXtreme

Cleanup on the PipX branch.

2012-05-18 17:42:25 -07:00

RadioComBridge

Fixed transparent comms on PipX.

2012-07-14 17:14:43 -07:00

Sensors

Merge branch 'next' into MikeL

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

Stabilization

Stabilization: For the inner loop call the setpoint shaping version so that

2012-09-11 13:21:53 -05:00

System

Re-enabled simposix SDCard support, and removed obsolete SDCard alarm usage from System module

2012-08-01 19:53:59 +09:30

Telemetry

Merged latest origin/next.

2012-05-05 09:40:44 -07:00

TxPID

TxPID: add GyroTau to the list of parameters (OP-637)

2012-05-28 12:48:55 +03:00

VtolPathFollower

Axislock as default for VtolPathFollower

2012-06-07 17:42:51 +03:00