Corvus Corax 5451003a58 Merge branch 'next' into corvuscorax/OP-1317_IMU_wind_estimation ...

Conflicts:
	flight/modules/Airspeed/airspeed.c
	flight/modules/Airspeed/gps_airspeed.c

2014-07-26 16:16:02 +02:00

..

Actuator

Merge branch 'amorale/OP-1274_freertos_v8.0.0' into next

2014-06-22 16:06:21 +02:00

Airspeed

Merge branch 'next' into corvuscorax/OP-1317_IMU_wind_estimation

2014-07-26 16:16:02 +02:00

Altitude

OP-1274 Remove unneeded cast from task name in xTaskCreate call

2014-06-18 01:47:43 +02:00

Attitude

Merge branch 'amorale/OP-1365_pios_instrumentation' into next

2014-06-22 19:13:46 +02:00

Autotune

OP-1309 correctly set StabilizationMode.Thrust in all other modules that set StabilizationDesired (Autotune,Pathfollowers)

2014-05-03 17:25:53 +02:00

Battery

OP-1299 uncrustify.

2014-04-13 14:08:34 +02:00

CallbackTest

OP-942 refactored callback scheduler to fit into PiOS naming scheme

2014-02-02 22:08:16 +01:00

CameraStab

OP-943 uses pios_mem API for heap allocation

2014-06-11 22:15:40 +02:00

ComUsbBridge

Merge branch 'amorale/OP-943_add_malloc_for_ccsram' into next

2014-06-22 19:31:03 +02:00

Example

OP-942 refactored callback scheduler to fit into PiOS naming scheme

2014-02-02 22:08:16 +01:00

Extensions/MagBaro

OP-1274 Remove unneeded cast from task name in xTaskCreate call

2014-06-18 01:47:43 +02:00

Fault

OP-943 uses pios_mem API for heap allocation

2014-06-11 22:15:40 +02:00

FirmwareIAP

OP-943 uses pios_mem API for heap allocation

2014-06-11 22:15:40 +02:00

FixedWingPathFollower

OP-1374 - Autostart the relevant PathFollower for known frame types

2014-06-29 17:23:57 +02:00

FlightPlan

OP-1122 OP-1158 remove unused flightplan.h (fixes conflict with new FlightPlan uavobject)

2014-01-12 15:10:15 +01:00

GPS

Merge branch 'amorale/OP-943_add_malloc_for_ccsram' into next

2014-06-22 19:31:03 +02:00

Logging

OP-943 uses pios_mem API for heap allocation

2014-06-11 22:15:40 +02:00

ManualControl

OP-1391 - Fix to prevent arming if unsafe due to current Thrust Mode (Altitude Hold/Vario)

2014-07-07 20:47:23 +12:00

MK/MKSerial

Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES

2013-05-19 17:37:30 +03:00

OPLink

OP-1274 Remove unneeded cast from task name in xTaskCreate call

2014-06-18 01:47:43 +02:00

Osd

Merge branch 'amorale/OP-943_add_malloc_for_ccsram' into next

2014-06-22 19:31:03 +02:00

OveroSync

OP-943 uses pios_mem API for heap allocation

2014-06-11 22:15:40 +02:00

PathPlanner

Merge remote-tracking branch 'origin/Bertrand/OP-1308_Set_Same_Logic_To_Alarms' into next

2014-06-26 20:31:27 +02:00

RadioComBridge

Merge branch 'amorale/OP-943_add_malloc_for_ccsram' into next

2014-06-22 19:31:03 +02:00

Receiver

Merge branch 'amorale/OP-1274_freertos_v8.0.0' into next

2014-06-22 16:06:21 +02:00

Sensors

OP-1358 Revo:Implement roll/pitch trim settings separated from "nominal" board rotation settings

2014-07-21 11:01:07 +02:00

Stabilization

Merge remote-tracking branch 'origin/Bertrand/OP-1308_Set_Same_Logic_To_Alarms' into next

2014-06-26 20:31:27 +02:00

StateEstimation

OP-1412 do not dicard mags after init

2014-07-23 22:40:43 +02:00

System

OP-1374 - Issue a Boot Alarm (reboot) if frame type is changed

2014-06-29 17:23:15 +02:00

Telemetry

OP-1274 Remove unneeded cast from task name in xTaskCreate call

2014-06-18 01:47:43 +02:00

TxPID

Merge remote-tracking branch 'origin/laurent/OP-1241_TxPID_Bank3' into next

2014-04-01 21:34:18 +02:00

VtolPathFollower

unrustify

2014-07-16 20:39:12 +02:00