Commit Graph

4003 Commits

Author SHA1 Message Date
Thomas Gubler 195472fddf fix init of published structs 2014-12-25 13:40:14 +01:00
Thomas Gubler a93362c700 re-add accidentally removed parameter init 2014-12-25 11:50:41 +01:00
Thomas Gubler ef61ba5454 fix compile/merge error in mc_att_control 2014-12-25 10:43:25 +01:00
Thomas Gubler b376316fb1 Merge remote-tracking branch 'upstream/isvtol' into dev_ros
Conflicts:
	src/modules/mc_att_control/mc_att_control_main.cpp
	src/modules/uORB/topics/vehicle_status.h
2014-12-25 09:59:58 +01:00
Thomas Gubler 25af4b266c Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
	.gitignore
	src/lib/uavcan
2014-12-25 09:48:15 +01:00
Lorenz Meier 9b535f6553 Merge pull request #1465 from PX4/mcposoffbaltitude
MC pos control offb: read altitude sp separately
2014-12-25 00:26:59 +01:00
Mark Whitehorn 9292c8f405 add interrupt latency printout command and mean/variance to interval performance counter 2014-12-24 14:06:05 -07:00
Lorenz Meier d8eefa3053 VTOL: Do not allow manual override 2014-12-23 21:50:16 +01:00
Lorenz Meier 0aaabaee09 VTOL: Remove unneeded headers 2014-12-23 15:02:01 +01:00
Lorenz Meier 84d744707d UAVCAN: Move into lib directory 2014-12-23 14:34:53 +01:00
Thomas Gubler ba4b8c8e00 Merge pull request #1523 from bansiesta/geofence_parse_fix
Geofence parse fix
2014-12-23 09:20:00 +01:00
Thomas Gubler 6a8ebc8afd Merge pull request #1518 from bansiesta/do_jump_feedback
DO_JUMP feedback in QGC
2014-12-23 09:19:10 +01:00
Lorenz Meier 46dd95ab34 Merge branch 'master' of github.com:PX4/Firmware into isvtol 2014-12-22 21:50:25 +01:00
Thomas Gubler 6dd98cb311 mc att ctl: remove autostart id param 2014-12-22 15:18:20 +01:00
Thomas Gubler 6f83f77bf4 fw att ctl: remove autostart id param 2014-12-22 15:18:09 +01:00
Ban Siesta 82383533c1 geofence: be more verbose if import fails 2014-12-21 14:09:30 +00:00
Ban Siesta b1f462a266 geofence: don't fall over lines containing just a LF 2014-12-21 14:09:04 +00:00
M.H.Kabir 54b68b73fd Remove vel reset 2014-12-21 09:03:18 +05:30
Lorenz Meier 752198352e IO firmware: Change to inttypes header 2014-12-20 19:32:43 +01:00
Lorenz Meier a20b8d037b PX4IO firmware: Add required include. 2014-12-20 19:22:53 +01:00
Ban Siesta a4e27fd849 navigator: reset some flags after the mission result has been published 2014-12-19 23:39:25 +00:00
Ban Siesta 180e17de33 navigator: report using mission result if a DO_JUMP waypoint has been changed 2014-12-19 23:38:55 +00:00
Ban Siesta 7cb4786e79 navigator: report when a waypoint has been reached not when the whole mission is finished 2014-12-19 23:38:10 +00:00
Ban Siesta f0ff914b62 navigator: don't publish mission result immediately but only after every iteration of the navigator 2014-12-19 23:36:32 +00:00
Ban Siesta c9ca61ef5b mavlink: don't slow mission updates down like this, otherwise we might miss mission results 2014-12-19 23:34:18 +00:00
Ban Siesta 5bbd0743e0 navigator: deleted some verbose output 2014-12-19 22:27:25 +00:00
Ban Siesta 2a09473e5f topics: move geofence status to its own topic 2014-12-19 22:26:31 +00:00
Thomas Gubler ad189cf7d6 fix small compile error after merge 2014-12-19 16:02:13 +01:00
Thomas Gubler 19d5383c56 Merge pull request #1493 from PX4/fwposcontrolmode
Fw pos control: small mode cleanup
2014-12-19 11:04:56 +01:00
Thomas Gubler 32675ff1c1 fix flag_external_manual_override_ok
The flag should not depend on the vtol state anymore. The intended
functionality of this is by now handled via the is_rotary_wing flag
2014-12-18 15:05:33 +01:00
Thomas Gubler e18065081a is_vtol flag in vehicle_status
Getting rid of the autostart based checks if the system is a vtol
Fixes #1503
2014-12-18 14:46:31 +01:00
Roman Bapst f3b5b67eec shortened parameter names to max 16 bytes 2014-12-18 12:43:23 +01:00
Thomas Gubler 16618f1ada Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
	src/examples/subscriber/subscriber_params.c
	src/modules/mc_att_control/mc_att_control_main.cpp
	src/modules/uORB/topics/vehicle_attitude.h
	src/modules/uORB/topics/vehicle_attitude_setpoint.h
	src/platforms/px4_middleware.h
2014-12-18 12:11:05 +01:00
Roman Bapst 669e1f96d8 fixed parameter issue for VTOL so that parameter wiki tool can document them 2014-12-18 10:46:36 +01:00
Thomas Gubler 8fdd694f12 fw pos ctl: compile with -Os 2014-12-17 21:13:50 +01:00
Thomas Gubler 262b9fc754 fw pos ctl: make loop performance counter more meaningful 2014-12-17 21:13:13 +01:00
Thomas Gubler 4402d7106b improve and fix multiplatform param by name macro 2014-12-17 16:31:40 +01:00
Thomas Gubler 0a1e94d504 circuit breaker: move to cpp, all platforms use the same file 2014-12-17 15:50:01 +01:00
Thomas Gubler bbfe78e4f6 mc att ctl: fix subscription handlers, fix parameters 2014-12-17 13:50:29 +01:00
Thomas Gubler 851415e48e Merge commit 'aa40c69853be0dc7e79bc3084472b77f9667c1f1' into dev_ros_mcatt
Conflicts:
	makefiles/config_px4fmu-v2_test.mk
2014-12-16 10:23:41 +01:00
Thomas Gubler 71f6a34367 mc att: increase stack size 2014-12-16 10:12:50 +01:00
Thomas Gubler 9520983e08 lots' of header juggling and small changes to make mc att control compile for NuttX and ROS 2014-12-16 08:24:51 +01:00
tumbili 89e2e08de0 removed white space noise 2014-12-15 22:47:10 +01:00
tumbili 736f57f436 Merge branch 'master' of https://github.com/PX4/Firmware into vtol_merge 2014-12-15 22:34:01 +01:00
tumbili 51a7fbeee0 added sanity checkto prevent false low airspeed readings during transition 2014-12-15 22:12:11 +01:00
Thomas Gubler ea4876da38 mavlink: distance sensor: fix max value 2014-12-13 18:19:12 +01:00
Thomas Gubler 6f89514beb fix comment style and type 2014-12-13 17:20:53 +01:00
Thomas Gubler d0325f2b12 fw pos ctrl: takeoff special case only in takeoff 2014-12-13 17:20:42 +01:00
Thomas Gubler 7b7c85dc96 Merge remote-tracking branch 'upstream/master' into fwposcontrolmode 2014-12-13 15:38:54 +01:00
Thomas Gubler 5cd2ee8342 fw pos control: improve mode logic slightly 2014-12-13 12:36:33 +01:00