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

..

Actuator

Merge branch 'next' into revolution

2011-12-11 22:55:54 -06:00

AHRSComms

INS: Try and get load down on event system.

2011-09-04 16:21:04 -05:00

Altitude

Merge branch 'stac/revo-usb' into revolution

2012-03-02 13:00:13 -06:00

AltitudeHold

Disable overosync by default. It was triggering event system warnings due to

2012-03-21 00:29:09 -05:00

Attitude

Attitude error timeout was 2 ms when sensors at 500 Hz. Caused lots of errors

2012-04-03 02:07:04 -05:00

Battery

Merge branch 'next' into camera_stabilization

2011-07-30 10:06:10 +09: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

Fault

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

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

FirmwareIAP

Make the firmwareIAP variable not a global

2012-04-03 02:07:03 -05:00

FlightPlan

Initialize objects for guidance in the correct place. Init some objects in

2011-08-19 09:52:05 -05:00

GPS

Merge branch 'next' into revolution3

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

Guidance

INS/Guidance: Convert distance to using m instead of cm. This is mainly to be

2011-09-11 23:02:05 -05:00

ManualControl

Merge branch 'next' into cc3d

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

MK/MKSerial

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

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

Osd/OsdEtStd

PiOS I2C: Swap the convention of returned values for I2C

2011-09-06 03:27:20 -05:00

OveroSync

Merge branch 'next' into MikeL

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

Sensors

Merge branch 'next' into MikeL

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

Stabilization

Fixed fmod() versus fmodf() usage in flight/...

2012-03-26 04:16:54 +02:00

System

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

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

Telemetry

Merge branch 'next' into cc3d

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

TxPID

TxPID module: add ILimit values to the list of settings

2012-02-21 19:57:10 +02:00