James Cotton 49a03a868b Merge branch 'altitudehold' into revolution_overo ...

Conflicts:
	flight/OpenPilot/UAVObjects.inc
	flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/project.pbxproj
	flight/Revolution/Makefile
	flight/Revolution/ins.c

2012-02-07 23:00:29 -06: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

Fix a few more merge conflicts

2012-01-23 04:47:35 -06:00

AltitudeHold

Add derivative term

2012-01-03 12:37:18 -06:00

Attitude

In the attitude loop need to check all the queues even if unused or the event

2012-02-07 08:46:34 -06: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

leds: use boot-time config for PiOS LED layer

2012-01-22 18:22:59 -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 'revolution' into altitudehold

2012-01-01 10:50:35 -06: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

Back to 1024 byte packets

2012-02-07 13:02:11 -06:00

Sensors

For L3GD20 sensor task run at the sensor speed

2012-01-28 10:11:30 -06:00

Stabilization

Merge branch 'altitudehold' into revolution_overo

2012-02-07 23:00:29 -06:00

System

Merge branch 'next' into revolution3

2012-01-24 10:46:35 -06:00

Telemetry

No longer hardcode baudrate

2012-01-24 23:42:43 -06:00