James Cotton 53ca934b2b Merge branch 'heli_stabilization' ...

Conflicts:
	flight/CopterControl/System/inc/pios_config.h
	flight/Modules/Attitude/attitude.c
	flight/Modules/ManualControl/manualcontrol.c
	flight/Modules/Stabilization/stabilization.c

2011-07-12 13:28:20 -05:00

..

Actuator

OP-423: remove ';' at the end of macro

2011-07-05 19:44:54 -07:00

AHRSComms

OP-423: remove ';' at the end of macro

2011-07-05 19:44:54 -07:00

Altitude

OP-423: remove ';' at the end of macro

2011-07-05 19:44:54 -07:00

Attitude

Merge branch 'heli_stabilization'

2011-07-12 13:28:20 -05:00

Battery

OP-423: remove ';' at the end of macro

2011-07-05 19:44:54 -07:00

Example

OP-423: remove ';' at the end of macro

2011-07-05 19:44:54 -07:00

FirmwareIAP

Merge branch 'heli_stabilization'

2011-07-12 13:28:20 -05:00

FlightPlan

OP-423: remove ';' at the end of macro

2011-07-05 19:44:54 -07:00

GPS

OP-423: remove ';' at the end of macro

2011-07-05 19:44:54 -07:00

Guidance

OP-423: remove ';' at the end of macro

2011-07-05 19:44:54 -07:00

ManualControl

Merge branch 'heli_stabilization'

2011-07-12 13:28:20 -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

OP-174 ET OSD: barometric altitude works now, units must be set metric with E-Logger

2011-04-29 19:08:28 +03:00

Stabilization

Merge branch 'heli_stabilization'

2011-07-12 13:28:20 -05:00

System

OP-423: remove ';' at the end of macro

2011-07-05 19:44:54 -07:00

Telemetry

OP-423: remove ';' at the end of macro

2011-07-05 19:44:54 -07:00