rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
Code Issues Releases Activity
11,899 Commits 5 Branches 8 Tags 266 MiB
2592f6b1a4
Commit Graph

813 Commits

Author SHA1 Message Date
Corvus Corax
e7aa12be94 Merge remote-tracking branch 'origin/corvuscorax/OP-1454_weakleveling-hotfix' into next 2014-08-23 15:25:24 +02:00
Alessio Morale
1d3f9399c3 OP-1370 - Fix sensortype not shown for non PVT GPSs 2014-08-22 23:35:13 +02:00
Alessio Morale
5a3ea5fde0 OP-1370 - Add an option to store the configuration onto GPS 2014-08-22 23:16:38 +02:00
Corvus Corax
c5e0e58e6a OP-1454 - fix weak leveling bug 2014-08-22 22:42:12 +02:00
Alessio Morale
5bf866c96e OP-1370 - Remove autoconfig from CC (removing sat info to spare some ram and adding autoconfig does not make much sense), fixed compilation for all other targets 2014-08-22 22:34:52 +02:00
Alessio Morale
c4d5234ee6 OP-1370 - Show AutoConfig status in GPSPositionSensor 2014-08-22 22:32:57 +02:00
Alessio Morale
69b76b665c OP-1370 - Add automatic sentence rate configuration based on HW version (llh+velned etc. vs PVT) 2014-08-22 21:27:50 +02:00
Alessio Morale
f430af83c5 OP-1370 - Add configuration support for nav rate and dynamic model. 
Added stub for sentence rate configuration (enable_sentences(...))
 2014-08-22 19:00:46 +02:00
Alessio Morale
1846806d17 OP-1370 - Refactor AutoConfig code out of UBX.* 2014-08-22 10:10:21 +02:00
Alessio Morale
903a77669e OP-1370 - Add "management tasks" support for UBX, used for self configuration. 
Initial state machine asking for gps version. Configuration messages definition
 2014-08-22 02:43:30 +02:00
Alessio Morale
c6a82c5d23 OP-1370 - refactors UBX code to use a table of messages and handler instead of neverending switches 2014-08-21 19:34:36 +02:00
Alessio Morale
002c35163a OP-1370 - Add support for mon-ver ack-ack and ack-nak messages for gps hw version detection 2014-08-21 19:34:36 +02:00
Alessio Morale
b6c053565e OP-1434 - use degrees for rotation, fix Calibration gui 2014-08-21 19:34:36 +02:00
Alessio Morale
85be5ba7af OP-1434 - handle mag rotation 2014-08-21 19:34:36 +02:00
Alessio Morale
8df34b01d7 OP-1434 - Fix heapremaining data type 2014-08-21 19:34:36 +02:00
Alessio Morale
0198129a1c OP-1434 - Add 230400 to GPS port speed list 2014-08-21 19:34:36 +02:00
Alessio Morale
ce1e4e728e OP-1434 - Support for mag calibration 2014-08-21 19:34:36 +02:00
Alessio Morale
397bfdc08b OP-1434 - Add support for OP custom sentences on flight board 2014-08-21 19:34:36 +02:00
Alessio Morale
83a3822798 OP-1406 - Reenable mag offset estimation for onboard mag only right now 2014-08-21 19:34:35 +02:00
Alessio Morale
84758a6731 OP-1406 - Always feeds mag data even if invalid 2014-08-21 19:34:35 +02:00
Alessio Morale
e511190ad3 OP-1406 - Improve handling of external magnetometer, add additional settings 2014-08-21 19:34:35 +02:00
Alessio Morale
9d7a493c26 OP-1406 - Allows filtermag to switch between onboard and aux mag 2014-08-21 19:34:35 +02:00
Alessio Morale
bb085ddab9 OP-1452 - Auto enable COMBridge module if a port is configured as ComBridge 2014-08-21 11:43:36 +02:00
Alessio Morale
8940b7a50b OP-1452 - Apply ComBridge port speed change without rebooting 2014-08-21 11:42:29 +02:00
Corvus Corax
4653c77296 OP-1156 removed old pathfollower implementations 2014-08-20 17:00:50 +02:00
Corvus Corax
1540fe0716 OP-1156 cleaned up updateAutoPilotVtol() function 2014-08-20 16:02:48 +02:00
Corvus Corax
70460e593e OP-1156 fixes as suggested per review 2014-08-20 15:29:29 +02:00
Corvus Corax
760ae118e9 OP-1156 changed yaw math from interval [0..360] to [-180..180] 2014-08-16 20:48:56 +02:00
Corvus Corax
8daa5dfa12 Merge branch 'next' into corvuscorax/OP-1156_pathfollower-unification 2014-08-16 13:58:40 +02:00
Corvus Corax
915c24c8b6 OP-1156 changed PID control loops to use generic pid library, readded unnecessary integral and derivative terms to vtolpathfollower 2014-08-15 21:00:48 +02:00
Corvus Corax
b1675a2804 OP-1156 added vtolpathfollower velocity limits to attitude control 2014-08-15 19:23:41 +02:00
Corvus Corax
b562fcb02e OP-1156 fix path logic to not deviate from correct altitude too much 2014-08-15 17:56:57 +02:00
Alessio Morale
5dbbda3adc Merge remote-tracking branch 'origin/amorale/OP-1404_ublox_pvt_support' into next 2014-08-13 15:27:10 +02:00
Alessio Morale
376aa0052f OP-1379 - Initial Notify module. Supports: 
1) predefined seqences associated with each flightmode. 2) fixed table with alarm index and assciated led warn/error sequences/repetition rate.
 2014-08-13 15:18:17 +02:00
Alessio Morale
f556a5e335 OP-1379 - Split simple notification and external lednotifications libraries 2014-08-13 15:14:55 +02:00
Corvus Corax
09e8b38407 OP-1156 fixed EmergencyFlyaway detection algorithm 2014-08-12 19:12:05 +02:00
Corvus Corax
56e4127bca OP-1156: add path_direction as a source for yaw as suggested by Werner :) 2014-08-12 18:18:07 +02:00
Corvus Corax
ea4e7962a6 OP-1156 fixed wrong callback ID assignment for pathfollower callback diagnostics 2014-08-10 21:17:55 +02:00
Corvus Corax
8944419b0f OP-1156 refactored pathfollower - new unified module as delayed callback - compiles but untested 2014-08-10 19:41:40 +02:00
Corvus Corax
a3d18bb578 Merge remote-tracking branch 'origin/D-Lite/PathFollowerImprovements' into corvuscorax/OP-1156_pathfollower-unification 2014-08-10 13:53:52 +02:00
Corvus Corax
ca1923f76f OP-1156: Added new (stub template) pathFollower Module as well as builkd environment changes to compile it instead of old pathfollowers 2014-08-10 12:50:38 +02:00
Stefan Karlsson
454d491e48 Merge branch 'next' into skarlsso/OP-1397_add_responsiveness_to_txpid 
Conflicts:
	ground/openpilotgcs/src/plugins/config/configtxpidwidget.cpp
	ground/openpilotgcs/src/plugins/config/configtxpidwidget.h
 2014-08-10 10:06:44 +02:00
Alessio Morale
1158c70a46 OP-1404 - minor cleanup, removed some duplicated code 2014-08-09 12:49:21 +02:00
Alessio Morale
2932045e3d OP-1404 Fix NMEA data parsing for GSV 2014-08-09 12:04:25 +02:00
Corvus Corax
c5fae5ee84 Merge branch 'next' into andrecillo/OP-1317_IMU_wind_estimation 2014-08-09 10:43:48 +02:00
Alessio Morale
a18009e875 OP-1429 Change datatype for elevation and azimuth respectively to int8 and int16. 2014-08-06 12:55:07 +02:00
Alessio Morale
d04d630273 OP-1404 fix include file path 2014-08-05 17:25:28 +02:00
Alessio Morale
23d2368984 OP-1404 Fix nav-pvt.pdop data type 2014-08-05 16:50:38 +02:00
Alessio Morale
ea63def1c8 OP-1404 fix compilation with PIOS_GPS_MINIMAL, fix some copy/pastem madness 2014-08-04 18:17:01 +02:00
Alessio Morale
240eb8e573 OP-1404 - Prevent mixing pvt and other sentence solution data. use PDOP from pvt 2014-08-04 17:56:28 +02:00
Alessio Morale
d3569927a0 OP-1404 fix unit scaling for pvt, use check_msgtracker, 2014-08-04 11:04:35 +02:00
Alessio Morale
6f4b1d5c03 OP-1404 uncrustify 2014-08-03 15:27:30 +02:00
Alessio Morale
c68dd3c00e OP-1404 - PVT will provide SOL+VELNED+POSLLH+Time. DOP will provide all dop values 2014-08-03 15:04:40 +02:00
Alessio Morale
1dd05c24cc OP-1404 - Fix compilation with PIOS_GPS_MINIMAL defined 2014-08-03 12:50:42 +02:00
Alessio Morale
0976fb6e1b OP-1404 - Add support for UBlox PVT sentence 2014-08-03 12:50:21 +02:00
Alessio Morale
016ba6940d OP-1403 - drop attitude/revolution as it has been supersede by StateEstimation module 2014-08-02 20:48:56 +02:00
Alessio Morale
d856bbdb50 OP-1403 - Update targets 2014-08-02 20:48:48 +02:00
Alessio Morale
57a43a5587 OP-1403 - Migrate to new HMC5x83 driver and remove old HMC5883 one 2014-08-02 20:48:34 +02:00
Stefan Karlsson
7f344da977 OP-1397 Round to instead of floor to uint8_t values in txpid.c 2014-08-01 14:51:39 +02:00
Stefan Karlsson
a7ee6fa764 OP-1397 Add initial support for rate mode response (deg/s) 2014-07-30 23:49:56 +02:00
Stefan Karlsson
2113e1a2e1 OP-1397 Add initial support for attitude mode response (deg) 2014-07-30 23:48:55 +02:00
Werner Backes
065ba1a0c8 Adds a 3D mode to path_vector. This allows vertical path segments without 
position changes. PathStatus now also contains correction_direction and
path_direction to make path following behaviour more transparent.
 2014-07-29 13:16:47 +02:00
Werner Backes
3e2961420d Add a 3D mode to path_endpoint. This allows FlyDirect waypoints to do 
vertical movements without changing position.
 2014-07-29 13:16:39 +02:00
Corvus Corax
5edb2dbae3 Merge branch 'andrecillo/OP-1317_IMU_wind_estimation' into corvuscorax/OP-1317_IMU_wind_estimation 2014-07-26 17:01:03 +02:00
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
Alessio Morale
e5b52d46d9 Merge remote-tracking branch 'origin/amorale/OP-1358_add_separate_rotation_calibration_offset_revo_only' into rel-14.06 2014-07-24 23:47:14 +02:00
Corvus Corax
a199fd1cb0 OP-1412 do not dicard mags after init 2014-07-23 22:40:43 +02:00
Andres
7f8e709e17 OP-1317 uncrustify 2014-07-23 08:04:52 +02:00
Andres
e195befc3a OP-1317 removed comments 2014-07-23 08:03:48 +02:00
Corvus Corax
95799cf11b OP-1412 delay ekf initialization until magnetometers are reporting valid data 2014-07-22 23:49:41 +02:00
Andres
ffabbc577c OP-1317 moved Butterworth filter code into flight/libraries/math/butterworth.* 2014-07-22 20:03:43 +02:00
Alessio Morale
9bee143476 OP-1358 Revo:Implement roll/pitch trim settings separated from "nominal" board rotation settings 2014-07-21 11:01:07 +02:00
Andres
df4d211f8b OP-1317 added a proper initialization of the Butterworth filter values 2014-07-20 16:22:27 +02:00
Andres
d7d20bb10f OP-1317 merge with branch corvuscorax/OP-1317_IMU_wind_estimation 2014-07-20 15:46:35 +02:00
Andres
ddde6d1f5e OP-1317 changed int into int32_t in function Quaternion2PY() 2014-07-20 15:26:05 +02:00
Alessio Morale
62755c4cab unrustify 2014-07-16 20:39:12 +02:00
Alessio Morale
25c54ac16d Merge remote-tracking branch 'origin/laurent/OP-1063_Multi_config_Hexa_fixes' into rel-14.06 2014-07-16 20:07:31 +02:00
Laurent Lalanne
1b447ee644 OP-1063 Multi_config_Hexa_fixes Stupid typo error with OctoX in VtolPathFollower. 2014-07-14 23:29:48 +02:00
Laurent Lalanne
c26e33964a OP-1063 Multi_config_Hexa_fixes Added OctoX, define new mixer table for Octo(p) and OctoX. New motor definition for OctoX (NNE, ENE...) Fixes for svg frames. Defined default settings for OctoP/X in setupwizard (but disabled) 2014-07-13 13:58:18 +02:00
Laurent Lalanne
a46480a99b OP-1063 Multi_config_Hexa_fixes : Added real HexaX, renamed HexaX > HexaH 
Added artwork in config and wizard svg. Cleanup on svg connection diagram (layers)
DO NOT USE until mixers are fixed
 2014-07-10 06:01:28 +02:00
rodneygrainger
3aaf1a3367 OP-1391 - Fix to prevent arming if unsafe due to current Thrust Mode (Altitude Hold/Vario) 2014-07-07 20:47:23 +12:00
Corvus Corax
80d3d7c954 OP-1374 hotfix to filtercf on checking of magnetometer calibration fabsf() 2014-06-29 18:36:46 +02:00
Alessio Morale
30491c7992 OP-1374 - Autostart the relevant PathFollower for known frame types 2014-06-29 17:23:57 +02:00
Alessio Morale
3ae85f6434 OP-1374 - Issue a Boot Alarm (reboot) if frame type is changed 2014-06-29 17:23:15 +02:00
Alessio Morale
1b823b7b92 Merge remote-tracking branch 'origin/Bertrand/OP-1308_Set_Same_Logic_To_Alarms' into next 
Conflicts:
	flight/libraries/sanitycheck.c
	flight/modules/StateEstimation/filtermag.c
	flight/modules/System/systemmod.c
 2014-06-26 20:31:27 +02:00
Alessio Morale
c6a773363f Merge branch 'amorale/OP-943_add_malloc_for_ccsram' into next 
Conflicts:
	flight/pios/common/pios_adxl345.c
	make/apps-defs.mk
 2014-06-22 19:31:03 +02:00
Alessio Morale
a03ad41bab Merge branch 'amorale/OP-1365_pios_instrumentation' into next 
Conflicts:
	flight/modules/Attitude/attitude.c
 2014-06-22 19:13:46 +02:00
Alessio Morale
263fd64ab5 Merge branch 'amorale/OP-1274_freertos_v8.0.0' into next 2014-06-22 16:06:21 +02:00
Alessio Morale
f30dd414ac Merge branch 'amorale/OP-1227_cc_high_cpu_utilization' into next 2014-06-22 16:06:08 +02:00
Corvus Corax
3f11f4f6b2 OP-1371 fix for hitl: turn of receiver alarm if in gcs control mode (but set warning) 2014-06-18 22:46:44 +02:00
Corvus Corax
7898d507ca drive-by bugfix in #ifdefed code affecting simposix 2014-06-18 20:41:58 +02:00
Corvus Corax
7933f2154c OP-1317 - project 3d airspeed vector unto fuselage vector to get scalar airspeed estimate 2014-06-18 12:44:10 +02:00
Alessio Morale
eb5deb3eca OP-1274 Remove unneeded cast from task name in xTaskCreate call 2014-06-18 01:47:43 +02:00
Corvus Corax
3d9f1ca93a OP-1317 changed imu wind estimation to actually estimate wind (and lowpass filter it) 2014-06-17 18:51:26 +02:00
Corvus Corax
205edac762 Merge branch 'next' into corvuscorax/OP-1317_IMU_wind_estimation 2014-06-17 18:14:27 +02:00
Alessio Morale
6226aec2a7 OP-943 uses pios_mem API for heap allocation 2014-06-11 22:15:40 +02:00
Alessio Morale
16cb081f5c OP-1365 Flight code instrumentation API: Sample use of instrumentation in Atittude module. 
When instrumentation is enabled at board level (pios_board.h, enable PIOS_INCLUDE_INSTRUMENTATION) PIOS_INSTRUMENT_MODULE setups the module to be instrumented.
 2014-06-10 21:38:12 +02:00
Alessio Morale
8710ff4070 OP-1227 Fix high CPU usage: Some minor to Actuator module. 2014-06-08 22:39:16 +02:00
Alessio Morale
52c1d69c19 OP-1227 Fix high CPU usage: Change gyro oversampling to 46 (400Hz update rate) to lessen the cpu load and jitter due accel rate mismatch 2014-06-08 22:14:06 +02:00
Alessio Morale
843987484b OP-1227 Fix high CPU usage: Avoid several float division in Attitude module, change optimization for attitude estimation function 2014-06-08 21:48:35 +02:00
Alessio Morale
d51b7ce2d4 OP-1227 Fix high CPU usage: Changes to attitude module: 
- changed Expected rate to 500 (it was erroneously defined as 666Hz)
- use the optimized api to fetch accel samples
 2014-06-08 21:47:00 +02:00
Alessio Morale
11d0bbf5f8 OP-1365 Flight code instrumentation API: Use systemMod to publish counters 2014-06-07 17:43:36 +02:00
Corvus Corax
de7e0d0781 OP-1287 added handler definitions for new flightmodes 2014-06-04 10:29:45 +02:00
Corvus Corax
07667027ee OP-1287 added autocruise mode too to manualcontrol 2014-06-04 10:23:59 +02:00
Corvus Corax
ec5052bdba OP-1287 added new flightmodes to manualcontrol.c 2014-06-04 10:04:40 +02:00
Corvus Corax
f0c4b8f9c7 OP-1287 renamed VELOCITYCONTROL back to AltitudeVario for consistency 2014-06-03 18:42:54 +02:00
Corvus Corax
5bfb57e081 Merge branch 'next' into amorale/OP-1355_fix_mag_board_rotation_issue 2014-05-26 17:19:56 +02:00
Corvus Corax
c6e168c972 Merge branch 'next' into corvuscorax/OP-1352_Headwind-improvements 2014-05-26 17:17:43 +02:00
Corvus Corax
bf16738fd3 Merge branch 'next' into amorale/OP-1350_takeoff_location_handling 2014-05-26 17:16:47 +02:00
Corvus Corax
76f83fc131 OP-1352 some cosmetic cleanups, explicitly marked float constants as type float 2014-05-25 13:27:38 +02:00
Alessio Morale
3d67b7567e OP-1355 Fix Mag scaling being calculated after applying board rotation. 2014-05-25 11:28:43 +02:00
Andres
642f740be3 OP-1317 Bettered jump treatment in yaw calculation and some cosmetics 2014-05-24 10:04:39 +02:00
Andres
9e80c4da9c OP-1317 Low-pass filter parameters added to airpeedSettings: IMUBasedEstimationLowPassPeriod1 pre-filter period in seconds, IMUBasedEstimationLowPassPeriod2 filter period in seconds. Oscillations with shorter periods than these, are filtered. If airspeed has too much noise increase IMUBasedEstimationLowPassPeriod2, else if it is too smooth descrease it. 2014-05-23 11:55:06 +02:00
Andres
822b067d98 OP-1317 Corrected error in calculation of low pass filter cut-off frequencies 2014-05-23 07:37:57 +02:00
Andres
f273abf6c8 OP-1317 Merged with next 2014-05-22 17:01:38 +02:00
Andres
a83379425c OP-1317 Small optimizations of code, delete of debug variables in airspeed object and uncrustify 2014-05-22 10:00:50 +02:00
Andres
423645392b OP-1317 Changed filtering method of IMU airspeed calculation into a Butterworth second order filter 2014-05-21 19:32:02 +02:00
Andres
41dd85b741 OP-1317 Changed filtering method of IMU airspeed calculation into a Butterworth second order filter 2014-05-21 19:25:27 +02:00
Alessio Morale
92bf876654 OP-1350 refactor into a plans library all functions dealing with initialization and execution of PathFollower/pathplanner commands for manualcontrol 2014-05-19 18:35:18 +02:00
Alessio Morale
3ec8c18fad OP-1274 fixes for RevoProto 2014-05-18 22:56:54 +02:00
Alessio Morale
99540d5db5 OP-1274 fixes for OSD 2014-05-18 22:56:51 +02:00
Alessio Morale
36e304f579 OP-1274 fixes for revolution 2014-05-18 22:56:48 +02:00
Alessio Morale
e9fff2b6fa OP-1274 fixes for OPLink 2014-05-18 22:56:44 +02:00
Alessio Morale
be5cc66bd3 OP-1274 fixes for Coptercontrol firmware 2014-05-18 22:56:29 +02:00
Alessio Morale
d88d73e7fe OP-1350 Make RTB safer pick the lowest between PositionState.Down and TakeOffLocation.Down. 2014-05-18 14:41:45 +02:00
Corvus Corax
5153806289 OP-1352 cleaned up some code comments 2014-05-17 23:27:30 +02:00
Corvus Corax
5544e9c984 OP-1352 redesigned course calculation to take complete wind vector into account 2014-05-17 22:02:04 +02:00
Corvus Corax
2357ee1774 hotfix: allow arming in Stabilized 4,5,6 2014-05-16 23:39:36 +02:00
Alessio Morale
2048440053 OP-1350 fix a review defect(a set intead of TakeOffLocationStatusGetget). Check if status is valid beside locationSet 2014-05-16 23:32:11 +02:00
Alessio Morale
f3df459278 OP-1350 remove checks for valid TakeOffLocation. It is already handled in takeoffLocationHandler 2014-05-16 21:56:44 +02:00
Alessio Morale
ffa5e66d8b OP-1350 fix a bug that overwrite TakeOffLocation when changing mode to preset after an arming sequence. cleanup and get rid of "pending" status 2014-05-16 21:53:05 +02:00
Corvus Corax
9306cbc7c5 OP-1352 Headwind-improvements for FixedWingPathFollower 2014-05-16 20:20:40 +02:00
Alessio Morale
80bd04075f OP-1350 Rename ReturnToHomeAltitudeOffset to ReturnToBaseAltitudeOffset 2014-05-16 18:51:04 +02:00
Alessio Morale
edba1bc71d OP-1350 split Init function out of Handler, added missing UAVO initalize, cleanup code 2014-05-16 18:31:49 +02:00
Alessio Morale
8dcee11cb8 OP-1350 change destination for ReturnToBase to takeoffLocation 2014-05-16 12:38:18 +02:00
Alessio Morale
063ae8afe0 OP-1350 add a TakeOffLocation Handler to manualcontrol 2014-05-16 02:28:12 +02:00
Alessio Morale
e082fbc04e Merge remote-tracking branch 'origin/amorale/OP-1330_cannot_set_homelocation.set_false' into next 2014-05-15 20:30:32 +02:00
Alessio Morale
7182fe0194 Merge remote-tracking branch 'origin/amorale/OP-1329_airspeed_fixes' into next 2014-05-15 20:30:10 +02:00
Corvus Corax
065a632123 Merge branch 'corvuscorax/OP-1325_Event-System-Error-Alarm' into next 2014-05-15 00:13:20 +02:00
Alessio Morale
47976312c2 OP-1330 reset Home Set delay timer if Set==true 2014-05-12 22:56:28 +02:00
Alessio Morale
953b7cc2a7 OP-1330 Fix a compilation issue with CC/CC3D 2014-05-11 12:37:20 +02:00
Alessio Morale
3c5a41049b Merge branch 'amorale/OP-1302_updated_led_behaviour' into next 2014-05-11 12:01:53 +02:00
Alessio Morale
45efaffcf1 OP-1330 fix namings/uncrustify 2014-05-11 11:38:08 +02:00
Alessio Morale
7155805b79 OP-1329 Move gps airspeed initialization checks under "sensor changed" test 2014-05-11 11:33:11 +02:00
Andres
530c0aa967 OP-1317 Added two file (actually renames) 2014-05-10 14:51:22 +02:00
Andres
02e62f91ed OP-1317 Apadted airspeed calculation from ground speed and orientattion changes: applied extended IMU wind estimation, filtering takes place now with Holt-Winters double exponential smoothing on orientation vector and speed vector, matrix calculation replaced by a direct calculation of the fuselage vector, renamed gps_airspeed into imu_airspeed because estimation relies on imu results and a n estimate of ground speed and not directly a GPS signal 2014-05-10 14:50:24 +02:00
Corvus Corax
47a891e594 OP-1325 fix event system warnings to be errors 2014-05-08 23:05:55 +02:00
Bertrand Oresve
743cf4e4b5 OP-1308 Merge with next (conflict with stabilization) 2014-05-08 22:33:45 +02:00
Alessio Morale
e5d6726bb6 Merge remote-tracking branch 'origin/next' into amorale/OP-1302_updated_led_behaviour 2014-05-08 22:27:08 +02:00
Bertrand Oresve
fd1b786868 Merge branch 'next' 
Conflicts:
	flight/libraries/sanitycheck.c
	flight/modules/Stabilization/stabilization.c
 2014-05-08 21:36:54 +02:00