Commit Graph

151 Commits

Author SHA1 Message Date
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
tumbili 736f57f436 Merge branch 'master' of https://github.com/PX4/Firmware into vtol_merge 2014-12-15 22:34:01 +01:00
Thomas Gubler 87df7c3243 move vehicle_attitude_setpoint to msg format 2014-12-08 10:37:01 +01:00
Roman Bapst fbedd3ed20 removed whitespaces removed small unused code block 2014-12-04 14:23:19 +01:00
tumbili 0e33e52d4a use uORB ID to determine the correct rate_sp- and actuator topic to publish on 2014-12-03 09:44:34 +01:00
Thomas Gubler ad499a5944 Merge remote-tracking branch 'upstream/ROS_shared_lib_base_class' into dev_ros_rossharedlib
Conflicts:
	src/modules/uORB/topics/vehicle_attitude.h
	src/platforms/px4_defines.h
2014-12-02 16:52:38 +01:00
Thomas Gubler 05a87a706a move px4_defines file 2014-12-02 16:17:17 +01:00
Thomas Gubler e28e8c11bb make default apps compatible with autogenerated attitude and rc_channels message 2014-12-02 12:19:24 +01:00
Roman Bapst ff55652f9a adapted attitude controllers to support VTOL 2014-12-02 10:34:39 +01:00
Friedemann Ludwig 6efc63d709 fixed somereview comments 2014-11-30 20:51:01 +01:00
Friedemann Ludwig 8e8b622f4f Implemented altitude and velocity hold mode 2014-11-28 04:11:39 +01:00
Roman Bapst 44127363b1 added setter and getter functions for use with euroc-gazebo simulator 2014-11-12 16:01:36 +01:00
Roman Bapst a0e2e4e8b3 pixhawk specific files 2014-11-11 15:01:47 +01:00
Roman Bapst 7e350555ea checked out from PX4 master to avoid eclipse formatting which happened in the past 2014-11-11 12:36:05 +01:00
Roman Bapst 31238516b5 pulled from PX4 master 2014-11-10 17:16:30 +01:00
Roman Bapst 43ebaf287c cleaned up 2014-11-10 17:06:14 +01:00
Thomas Gubler 3efffb68e7 Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
	src/modules/navigator/geofence.cpp
	src/modules/navigator/mission.cpp
2014-09-28 12:36:26 +02:00
Roman Bapst c8b1c5b119 Adapted for shared library use with ROS 2014-09-27 12:01:11 +02:00
Roman Bapst 4305625883 Added control_attitude function 2014-09-25 10:29:30 +02:00
Roman Bapst 43d9ebc231 Added control_attitude function and cleaned up 2014-09-25 10:28:49 +02:00
Roman Bapst f347e87391 Added base class for fixed wing attitude controller -> still working on it 2014-09-24 15:54:34 +02:00
Thomas Gubler e174117698 gps failure has priority over engine falure, in case both fail make sure
that the gps failure mode does not turn on the engine
2014-09-22 10:54:27 +02:00
Thomas Gubler f315be5416 FW: in seatbelt/althold on ground reset integrators 2014-09-06 10:36:51 +02:00
Thomas Gubler d1a183b7f7 Merge remote-tracking branch 'upstream/master' into obcfailsafe 2014-08-25 22:06:11 +02:00
Lorenz Meier 2f5c0cbd13 Deal with zero airspeed measurements 2014-08-24 23:05:28 +02:00
Thomas Gubler 1a14ff250e fw att control: use RC only if in manual 2014-08-22 00:39:44 +02:00
Lorenz Meier e696ed5509 Merged master 2014-07-15 22:07:03 +02:00
Lorenz Meier 8a0e83c9cd fw att ctrl: Only return from start handler with all allocations done 2014-07-14 08:11:55 +02:00
Lorenz Meier 8a6e69ed67 Fix up RAM usage of fixed wing apps 2014-07-12 20:08:36 +02:00
Thomas Gubler 9a911f7388 fw att control: reset integrators when requested via attitude setpoint topic 2014-06-24 17:40:56 +02:00
Lorenz Meier 79aa600d29 Merge branch 'master' of github.com:PX4/Firmware into logging 2014-06-11 20:39:16 +02:00
Lorenz Meier e3e8bf25be FW att control: Add support for multi uORB topics 2014-06-10 15:09:41 +02:00
Andrew Chambers 128389d3b1 Converted style to work with wiki. Cleaned up bad fields. 2014-06-09 16:01:44 -07:00
Thomas Gubler b9b81beb17 fw att: add performance counter 2014-05-21 21:49:00 +02:00
Thomas Gubler 05de7fb7a0 Merge remote-tracking branch 'upstream/master' into fwattrobustify
Conflicts:
	src/modules/fw_att_control/fw_att_control_main.cpp
2014-05-21 20:43:32 +02:00
Lorenz Meier 328fc04d29 apps: Compile warning fixes 2014-05-21 14:22:01 +02:00
Thomas Gubler e72a7a7dd7 fw att: robustify main loop against non finite numbers and limit error output rate 2014-05-18 00:15:14 +02:00
Lorenz Meier ba51ab2545 Merge branch 'ekf_params' of github.com:PX4/Firmware 2014-05-15 13:14:25 +02:00
Thomas Gubler 8f6cd3a3ae Merge remote-tracking branch 'upstream/master' into manualcontrolrename
Conflicts:
	src/modules/fw_att_control/fw_att_control_main.cpp
2014-05-13 09:28:46 +02:00
Thomas Gubler bafa344dcb fw att control: manual setpoint: fix comment and trim sign 2014-05-13 09:00:12 +02:00
Thomas Gubler 7c75f61863 Merge remote-tracking branch 'upstream/master' into manualcontrolrename
Conflicts:
	src/modules/commander/commander.cpp
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
	src/modules/uORB/topics/manual_control_setpoint.h
2014-05-12 09:39:52 +02:00
Thomas Gubler 3779e216be fw att control: use new manual control setpoint variable names 2014-05-12 09:22:07 +02:00
Lorenz Meier 3e3a64f0ed Merge branch 'master' of github.com:PX4/Firmware into ekf_params 2014-05-09 21:36:43 +02:00
Lorenz Meier 88194c5971 Remove noreturn attribute from all apps that actually can return 2014-05-09 09:20:08 +02:00
Lorenz Meier 22d3bcdab6 Merged mpc_rc into ekf_params 2014-04-26 15:13:03 +02:00
Lorenz Meier a30411e9f2 Fixed printing in attitude control 2014-04-22 11:02:53 +02:00
Anton Babushkin 606660d94a fw_att_control: renamed FW_R_MAX/FW_P_MAX to FW_MAN_R_MAX/FW_MAN_P_MAX 2014-04-07 14:07:16 +04:00
Anton Babushkin b6e00431dc Merge branch 'master' into rc_timeout 2014-04-06 22:20:18 +04:00
Lorenz Meier ab60b13b6d fw_att_controller: Forcing actuator scaling to at least minimum speed 2014-04-05 21:26:17 +02:00
Lorenz Meier 4a0c660088 Do not make minimum airspeed assumptions, as we can trust our digital sensor a bit. A blocked pitot also most likely will result in more than just 6.5 m/s airspeed and so the check is based on a bunch of weak assumptions 2014-04-05 21:06:21 +02:00