1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-11 19:24:10 +01:00
Commit Graph

483 Commits

Author SHA1 Message Date
Alessio Morale
55557ecd60 OP-1434 - Add gps extended status 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
7abbf5fa5a OP-1406 - Fixes for all other targets 2014-08-21 19:34:35 +02:00
Alessio Morale
cced294760 OP-1406 - Add support for aux mag calibration settings.
todo:
- GCS handling for extenal mag calibration
2014-08-21 19:34:35 +02:00
Alessio Morale
52ad63be33 OP-1406 - Add support for Aux magnetometer on flight controllers 2014-08-21 19:34:35 +02:00
Corvus Corax
8daa5dfa12 Merge branch 'next' into corvuscorax/OP-1156_pathfollower-unification 2014-08-16 13:58:40 +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
Alessio Morale
1067ea59d1 OP-1379 - Split pios_ws2811.h in config and public api header 2014-08-12 22:19:30 +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
Corvus Corax
c5fae5ee84 Merge branch 'next' into andrecillo/OP-1317_IMU_wind_estimation 2014-08-09 10:43:48 +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
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
Andres
ffabbc577c OP-1317 moved Butterworth filter code into flight/libraries/math/butterworth.* 2014-07-22 20:03:43 +02:00
Alessio Morale
4389f767f3 uncrustify 2014-07-02 23:27:58 +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
263fd64ab5 Merge branch 'amorale/OP-1274_freertos_v8.0.0' into next 2014-06-22 16:06:21 +02:00
Alessio Morale
eb5deb3eca OP-1274 Remove unneeded cast from task name in xTaskCreate call 2014-06-18 01:47:43 +02:00
Alessio Morale
b3b90f1f66 OP-943 inline pios_mem function have issues with simposix. 2014-06-11 22:15:40 +02:00
Alessio Morale
6226aec2a7 OP-943 uses pios_mem API for heap allocation 2014-06-11 22:15:40 +02:00
Alessio Morale
de5aed6864 OP-1227 Fix high CPU usage: Disable Instrumentation 2014-06-09 16:29:53 +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
c9d97639b0 OP-1302 Renable Idle Hook in CC/CC3D 2014-06-08 20:33:35 +02:00
Alessio Morale
eb35803b5b OP-1365 Flight code instrumentation API: Add support for Revolution 2014-06-07 17:44:27 +02:00
Alessio Morale
9db264a457 OP-1365 Flight code instrumentation API: Add CopterControl support 2014-06-07 00:47:06 +02:00
Alessio Morale
5e9d107c0b OP-1365 Flight code instrumentation API: Add support to DiscoveryF4bare target 2014-06-06 22:23:02 +02:00
Alessio Morale
b2ecf23a07 OP-1350 simposix build fixes :( fix altitude calculation for RTB 2014-05-19 22:21:32 +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
070eccbf1f OP-1274 reenable idle hook for new led handling 2014-05-18 23:43:49 +02:00
Alessio Morale
5e83374af4 OP-1274 fixes for DiscoveryF4Bare target 2014-05-18 23:43:14 +02:00
Alessio Morale
4296b21025 OP-1274 looks like excluding vTaskSuspend does not cope with "strict" compilation options 2014-05-18 22:57:16 +02:00
Alessio Morale
af8fe1f921 OP-1274 Fixes for Simposix 2014-05-18 22:56:57 +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
9ec21d2ade OP-1350 fix simposix target 2014-05-16 02:30:17 +02:00
Alessio Morale
52892aa7d8 OP-1350 add uavo to DiscoveryF4Bare 2014-05-16 02:19:52 +02:00
Alessio Morale
86b0829823 OP-1350 Add takeofflocation UAVO 2014-05-16 00:40:19 +02:00
Alessio Morale
58bba31c72 Merge remote-tracking branch 'origin/amorale/OP-1312_pios_ws2811_driver' into next 2014-05-15 20:30:43 +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
711c5ea79d OP-1312 Fixes the flicker issue in Revo. Raised the Transfer complete irq priotity to prevent delays stopping the timer. 2014-05-11 10:43:24 +02:00
Corvus Corax
d916fa5aad uncrustification 2014-05-08 23:18:38 +02:00
Alessio Morale
16df6bc58c Merge branch 'amorale/OP-1307_discovery_f4_bare' into next 2014-05-08 22:56:03 +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
Corvus Corax
153d2fb786 OP-1309 Fixed bug in Quaternion Stabilization Error Calculation in regards to independent axis 2014-05-07 22:12:01 +02:00
m_thread
a0e661b77e Disabled malfunctioning PIOS_QUATERNION_STABILIZATION option. 2014-05-07 14:19:20 +02:00
Alessio Morale
19caa57dc6 OP-1312 fix copy/paste-naming issue 2014-05-03 11:45:30 +02:00
Corvus Corax
6993570cc9 OP-1309 integrated AltitudeHold into new Stabilization 2014-05-01 11:48:38 +02:00
Alessio Morale
3897106f4d OP-1312 remove boilerplate from config using macros.
Use four locations for ch1+update dma source to exploit fifo and memory read bursts
2014-05-01 10:33:44 +02:00
Corvus Corax
59bdab697a OP-1309 some CPU and memory optimizations to get it to run on CC 2014-04-29 18:17:29 +02:00
Corvus Corax
82d2c5a308 OP-1309 Implemented control of new stabilization framework (replaces old stabilization module) 2014-04-29 00:29:15 +02:00
Alessio Morale
4cece04166 OP-1312 fix documentation, get rid of stale comments from previous implementations 2014-04-27 19:12:36 +02:00
Corvus Corax
93f82652b7 OP-1309 outer loop fully implemented - some cleanups and changes in control flow to accomodate new logic 2014-04-27 15:15:59 +02:00
Alessio Morale
e75ed6a015 OP-1307 fix mispelling of usb product id 2014-04-26 21:55:25 +02:00
Alessio Morale
99f19dd809 OP-1312 Make WS2811 driver configurable.
Now output pin may be chosen among all servo outputs and Flexi-io pins 3 and 4 (they are not used for PWM input/output)
2014-04-26 19:48:44 +02:00
Alessio Morale
a0b857337f OP-1312 Add support for Revolution (right now always active on pin3). Configurability not yet added 2014-04-26 18:40:59 +02:00
Alessio Morale
28859d2305 OP-1312 Missing ifdefs on pios_board.c 2014-04-26 18:39:57 +02:00
Corvus Corax
e9d1a2af4b OP-1309 get rid of this horrible bound() function code duplication throughout entire flight code and put it into libraries/math 2014-04-26 17:48:54 +02:00
Alessio Morale
db9435b5ed OP-1312 add a switch to include/exclude the driver 2014-04-26 17:28:49 +02:00
Alessio Morale
46f70a74c8 OP-1312 Initial version running on DiscoveryF4 2014-04-26 16:57:16 +02:00
Corvus Corax
599661ba18 OP-1309 UAVObject changes, GCS changes and Makefile changes needed for Stabi refactoring 2014-04-26 15:14:40 +02:00
Alessio Morale
0aa9ef4b57 OP-1307 Bare f4 discovery platform with no sensor, for development pourpose 2014-04-22 23:46:27 +02:00
Alessio Morale
82139a6e44 Merge remote-tracking branch 'origin/amorale/OP-1294_fix_stacks_heap_cc' into next 2014-04-15 21:46:26 +02:00
Alessio Morale
299f388245 OP-1302 Add a stub pios_notify API for user interaction/notifications
right now all notifications produces the same output, the DRAW_ATTENTION sequence
2014-04-13 17:42:57 +02:00
Alessio Morale
132aa83dff OP-1302 Fix other targets 2014-04-13 12:38:07 +02:00
Alessio Morale
5d637fab87 OP-1302 move stuffs away from systemmod 2014-04-13 11:54:25 +02:00
Philippe Renon
3b7b06aad0 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next 2014-04-09 09:11:54 +02:00
Philippe Renon
c8397ee0b8 Merge remote-tracking branch 'origin/filnet/OP-1033_fw_usb_cleanups' into next 2014-04-09 09:08:09 +02:00
Alessio Morale
6d1fabdd5f OP-1294 declare controlHandler as const, add a new PIOS_EXCLUDE_ADVANCED_FEATURES that disables all nav features 2014-04-08 00:30:10 +02:00
Alessio Morale
b9d911c40f OP-1294 eventdipatcher stack can be further reduced 2014-04-07 00:32:34 +02:00
Alessio Morale
25ef201445 OP-1294 adjust FreeRTOS options to save some more heap 2014-04-06 19:19:48 +02:00
Alessio Morale
499efdf168 OP-1294 adjust some stack sizes for CC 2014-04-06 19:19:48 +02:00
Alessio Morale
eed5c098ab OP-1294 Allow to specify different stack sizes for rx and tx telemetry task. 2014-04-06 19:19:44 +02:00
Corvus Corax
bb91039f51 OP-1290 fixes in telemetry (and pios_board initialization) 2014-04-05 12:53:31 +02:00
Alessio Morale
e964c863eb Fix the broken revoproto target/sync with revolution 2014-04-01 22:24:05 +02:00
Alessio Morale
6540c69698 Merge remote-tracking branch 'origin/andrecillo/OP-1273_PixHawk_airspeed_sensor_MS4525DO' into next 2014-04-01 22:05:12 +02:00
Andres
c5dc556a43 OP-1273 Uncrustify 2014-03-27 16:19:22 +01:00
Andrés Chavarría Krauser
f8f53d8801 OP-1273 Adaptations to include MS4525DO PixHawk speed sensor 2014-03-25 09:18:25 +01:00
Alessio Morale
abd7da20df Merge branch 'amorale/OP-1026_cpu_idle' into next 2014-03-23 15:32:19 +01:00
Alessio Morale
519d74ad1b OP-1026 fix review issues 2014-03-09 16:08:27 +01:00
Alessio Morale
e407eb8126 Merge branch 'next' of git://git.openpilot.org/OpenPilot into next 2014-03-09 14:38:17 +01:00
Alessio Morale
0b30b79c98 Merge remote-tracking branch 'origin/amorale/OP-1149_gyro_accel_thermal_calibration' into next
Conflicts:
	ground/openpilotgcs/src/libs/eigen/Eigen/src/Core/util/Memory.h
	ground/openpilotgcs/src/plugins/config/revosensors.ui
	ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
2014-03-09 14:38:08 +01:00
Corvus Corax
be9f4b958d OP-1216 remove commented out define as review requested 2014-03-08 22:12:46 +01:00
Philippe Renon
ef137a27b3 OP-1033 Added note where appropriate that changing USB buffer length will require changes to the USB buffer setup 2014-03-03 22:01:13 +01:00
Corvus Corax
564a991222 adjusted Stabilization stack size to get rid of stack alarm 2014-03-02 19:11:49 +01:00
Corvus Corax
cdca8d835c OP-1216 manualcontrol refactoring 2014-03-02 14:45:17 +01:00
Alessio Morale
2bcbf7dc86 OP-1026 remove legacy idle time calculation in OPLink code 2014-02-22 00:31:06 +01:00
Alessio Morale
3fc3b5b01b OP-1026 replace idle time calculation with task monitor API 2014-02-22 00:30:03 +01:00
Corvus Corax
0ebc92d9f5 Merge branch 'corvuscorax/OP-942_task-diagnostics-for-callbacks' into corvuscorax/OP-1216_flight-control-refurbishment
Conflicts:
	flight/modules/AltitudeHold/altitudehold.c
2014-02-16 19:08:39 +01:00
Corvus Corax
1898d0ad35 OP-1217 create new receiver module
This module includes all the receiver IO and parsing/failsafe
functionality of ManualControl, but does none of the interpretations in
regards to flight mode / actuator control or arming that was included in
the old ManualControl

In a second step the old ManualControl module needs to be adapted to do
only these ommitted things in a modular way - as a delayed callback
2014-02-16 15:09:08 +01:00
Corvus Corax
b5a27d05e7 OP-1197 configurable failsafes OP-1219 thrust control OP-1217 separate manualcontrolsettings apart 2014-02-09 19:37:22 +01:00
Corvus Corax
9a6072d58c Merge branch 'next' into corvuscorax/OP-942_task-diagnostics-for-callbacks
Conflicts:
	flight/targets/boards/simposix/firmware/Makefile
2014-02-07 00:31:32 +01:00
Corvus Corax
216ec095e4 OP-1211 removed unneeded define 2014-02-06 19:34:34 +01:00
Corvus Corax
723e22aa1a OP-1211 time_measurement_helper 2014-02-04 19:05:17 +01:00
Corvus Corax
49a1c4c28f OP-942 refactored callback scheduler to fit into PiOS naming scheme 2014-02-02 22:08:16 +01:00
Corvus Corax
5b9a17f630 OP-942 moved DelayedCallbackScheduler into pios/common 2014-02-02 20:31:37 +01:00
Corvus Corax
b076ba02a1 OP-942 API change to CallbackScheduler - include unique ID for each callback for a taskinfo like UAVObject 2014-02-02 19:54:17 +01:00
Alessio Morale
02c7084196 Merge remote-tracking branch 'origin/next' into amorale/OP-1149_gyro_accel_thermal_calibration
Conflicts:
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
2014-01-23 01:02:13 +01:00
Alessio Morale
3ef980aa89 OP-1188 fix stack for coptercontrol 2014-01-22 00:01:58 +01:00
Alessio Morale
1f61676d0a Merge branch 'amorale/OP-1152_stack_verification' into next
Conflicts:
	flight/targets/boards/coptercontrol/firmware/inc/pios_config.h
2014-01-18 13:54:06 +01:00
Corvus Corax
41202a0227 Merge branch 'corvuscorax/OP-1022_AH_improvements_amorale' into next 2014-01-15 22:47:42 +01:00
Philippe Renon
694747cd27 Merge remote-tracking branch 'origin/next' into filnet/OP-1122_gcs_waypoint_editor_stabilization
Conflicts:
	ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
2014-01-15 20:12:08 +01:00
Philippe Renon
3f66d656ca OP-1122 OP-1158 - renamed uavobject FlightPlan to PathPlan 2014-01-15 20:04:54 +01:00
Corvus Corax
9997f14d68 Merge remote-tracking branch 'origin/next' into corvuscorax/OP-1022_AH_improvements_amorale 2014-01-15 18:45:09 +01:00
Corvus Corax
92beb54e2d OP-1022 some small cosmetic fixes for AltitudeHold as suggested by Alessio 2014-01-15 18:43:47 +01:00
Philippe Renon
7f2c24db2b OP-1122 OP-1158 - renamed uavobject FlightPlan to PathPlan
+review OPReview-609
2014-01-14 21:05:16 +01:00
Corvus Corax
3d5e27f5f2 OP-1122 fixed simposix so it will compile with new objects 2014-01-12 21:06:41 +01:00
Philippe Renon
aa24f2193a OP-1122 OP-1158 renamed FlightPlanInfo uavobject to FlightPlan 2014-01-12 15:23:21 +01:00
Philippe Renon
bcb59a3dca OP-1122 OP-1120 Added missing FligthPlanInfo uavobject to revoproto/firmware/UAVObjects.inc 2014-01-09 21:46:50 +01:00
Philippe Renon
8c7792b6e5 OP-1122 OP-1120 Added a new FligthPlanInfo uavobject
- FligthPlanInfo contains the number of waypoints and action pathes
- FligthPlanInfo contains a CRC of all waypoints and action pathes
- The CRC is not yet implemented
- These informations will be used to check the consistency of a flight plan
2014-01-09 01:06:00 +01:00
Philippe Renon
772c395e67 OP-1122 OP-1145 fixed handling of ground messages done by OPLM
- OPLM used to receive and relay all messages
- OPLM will now reveice only specific messages and relay others as required (needs to be reviewed...)
- add RadioComBridgeStats uavobject to collect and report tx/rx statistics
- made error handling more robust
- added a few FIXMEs
2014-01-06 21:35:00 +01:00
Alessio Morale
3aa7a1d352 OP-1152 change stack size to accomodate recent changes in dispatcher, telemetry for former CC (hw rev 1)
+review OPReview
2014-01-05 23:13:06 +01:00
Alessio Morale
260db3446c OP-1149 changes in CC/CC3D code to use AccelGyroSettings for bias/scale instead of AttitudeSettings.
Bias units of measure are now normalized between CC/CC3D/Revo.
2013-12-29 14:08:53 +01:00
Corvus Corax
1cccd152bd added AltitudeHold to simposix 2013-12-27 16:50:30 +01:00
Alessio Morale
7ac2f9f87f OP-1149 Move accel/gyro calibration setting to a separate object, to be reused also for CC3D 2013-12-26 16:55:57 +01:00
Les Newell
0afe6afd11 OP-984 Fixed insufficient stack for stabilization 2013-12-11 19:24:13 +00:00
Les Newell
b7cfc503ea OP-984 Updated makefiles and inc files for multiple pid bank objects 2013-12-11 17:09:00 +00:00
Les Newell
e4bcd87ddd OP-984 Added stabilizationbank to inc files 2013-12-11 17:08:35 +00:00
Corvus Corax
4ad0e730da added status uavobject for easier debugging 2013-12-08 12:23:16 +01:00
Corvus Corax
a4d53c18ac got rid of altholdsmoothed uavobject 2013-12-07 20:14:02 +01:00
Corvus Corax
3e1b0fd114 Merge branch 'next' into corvuscorax/OP-1022_AH_improvements_amorale 2013-12-07 16:33:57 +01:00
Corvus Corax
be9faabe92 Merge branch 'next' into corvuscorax/onboardlogging 2013-11-26 00:34:01 +01:00
Alessio Morale
bacc4d3d79 Merge branch 'master' into next
Conflicts:
	flight/targets/boards/oplinkmini/firmware/pios_board.c
	ground/openpilotgcs/copydata.pro
2013-11-25 01:12:10 +01:00
Corvus Corax
18ad56d4ed removed identical files from pios/posix (use files from common instead) 2013-11-24 15:40:32 +01:00
Corvus Corax
32b5ff22cf cleanup defect in OP-Review-586 2013-11-24 15:27:33 +01:00
Corvus Corax
d235a24e23 Merge branch 'next' into corvuscorax/onboardlogging 2013-11-19 18:49:58 +01:00
Corvus Corax
7a6c0b61e8 Merge branch 'next' into corvuscorax/callbackeventdispatcher2 2013-11-19 18:36:20 +01:00
Corvus Corax
9414f3513f adapted telemetry stack sizes for flight firmware to include more space needed for logging feature 2013-11-17 22:39:39 +01:00
Corvus Corax
c6031ed963 fixed usr flash system definition 2013-11-17 21:03:08 +01:00
Corvus Corax
c7431623af changed hardware definition for revolution to have usr space in just one arena
(no flash garbage collection since used primarily for logging where there are no deletes)
2013-11-17 20:43:53 +01:00
Corvus Corax
fcc479f5cb more intelligent log interfacing, including flash formatting option 2013-11-17 20:14:50 +01:00
Corvus Corax
3d8625abaf Enabled logging on revolution (added module and uavobjects) 2013-11-17 18:50:51 +01:00
Corvus Corax
9dbac5d060 Enabled printf-stdarg on all targets, implemented vsnprintf() (needed for logging) 2013-11-17 18:49:50 +01:00
Corvus Corax
a0746d87fa Logging facility: logs debug data to logfs and exports it through container UAVObject 2013-11-17 02:54:26 +01:00
Corvus Corax
00321b09dc Modified uavobjectmanager to only use logfs calls for UAVObject flash transactions, abstracted dosfs calls to use logfs wrapper class for simpiosix and SD-card access 2013-11-16 17:30:40 +01:00
Alessio Morale
b003109eea OP-1104: Update BL to version 6, raise to 0xA0000 so 640Kbyte program size.
+review OPReview
 #resolve
2013-11-05 19:07:36 +01:00
Alessio Morale
e91bc28667 OP-1058 Get rid of Unions.
They caused stack usage increase with -fstrict-aliasing as stack slots are not reused when dealing with unions.
It has now been added the cast_struct_to_array macro in pios_struct_helper.h to handle such case where it is useful to access those homogeneous structs as arrays

+review OPReview-552
2013-09-01 12:10:55 +02:00
Alessio Morale
11b269f898 Merge remote-tracking branch 'origin/next' into amorale/OP-1058_uavo_named_accessors 2013-08-31 16:03:30 +02:00
Alessio Morale
8351e97faa OP-1058: fix needed for fw_revoproto code compilation 2013-08-01 01:18:53 +02:00
Brian Webb
2340f4f0d9 OP-1050: Moves LED configuration above settings erase in OPLink pios_board.c to prevent crashing when settings are erased. 2013-07-29 20:37:00 -07:00
Corvus Corax
9537cac701 Merge branch 'next' into corvuscorax/callbackeventdispatcher2 2013-07-28 17:10:20 +02:00
Brian Webb
e246ecf536 Moves pios_led functionality to pios_gpio and makes pios_led a thin layer over pios_gpio. Supports configuring multiple sets of GPIOs. 2013-07-28 07:01:08 -07:00
Corvus Corax
be583dd8bf fixes to gps airspeed sensor 2013-07-19 15:30:33 +02:00
Werner Backes
7708aab313 Added vertical velocity as a control loop input to improve dynamics during
commanded ascend/decent.

Conflicts:
	flight/modules/AltitudeHold/altitudehold.c
	flight/modules/ManualControl/manualcontrol.c
	shared/uavobjectdefinition/altitudeholdsettings.xml
2013-07-16 21:17:32 +00:00
Alessio Morale
11bc7804d0 Merge branch 'amorale/OP-994_adc_cleanup' into next 2013-07-16 12:23:25 +00:00
Corvus Corax
27eadc200b Merge branch 'corvuscorax/lla2nedfilter' into next
Conflicts:
	flight/modules/StateEstimation/stateestimation.c
2013-07-10 14:38:12 +02:00