Commit Graph

141 Commits

Author SHA1 Message Date
Lorenz Meier 21fde4b3f6 fw att control: Code style fixes 2015-06-05 22:45:06 +02:00
Lorenz Meier 5197be67a7 FW control: Add skeleton for distinct altitude control and position control flight modes
Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
2015-06-05 22:45:05 +02:00
Ban Siesta 96bfe85ceb fw_att_control: another ugly way to prevent a newline 2015-05-26 23:05:26 -07:00
Ban Siesta d3fe6fd256 fw_att_control: whitespace 2015-05-26 23:05:18 -07:00
Ban Siesta e2277bbe2d fw_att_control: don't brag about being running 2015-05-26 23:05:11 -07:00
Lorenz Meier 66e6dccfee FW att control: Better param docs 2015-05-19 07:18:25 +02:00
Daniel Agar 2e824bbeea fix incorrect argc < 1 check for no arguments
-requiring arguments should be argc < 2
2015-04-18 12:02:58 +02:00
Lorenz Meier 80b5abeb0d Fix comment in FW params 2015-04-18 11:40:25 +02:00
Lorenz Meier 644fb1c0bb Revert "Remove newline so meta data parser can parse"
This reverts commit 3a70e7bf1b.
2015-04-18 11:38:34 +02:00
Don Gagne 3a70e7bf1b Remove newline so meta data parser can parse 2015-04-18 11:14:12 +02:00
Simon Wilks ea521844fe Correct formatting of parameter definition to unbreak documentation generation. 2015-04-17 14:34:53 +02:00
Daniel Agar 8aae66b893 trivial code style cleanup round 2 2015-03-27 23:38:58 -04:00
Matt Beall 9e6d318d68 Added flag to uorb publish wrapper...resolves no actuators in manual mode in fw_att_control 2015-03-27 10:39:18 -06:00
Lorenz Meier d5c59b515b FW att control: Adjust stack size to real use 2015-03-08 08:13:54 +01:00
Matt Beall 220fb19eb7 Removed actuator_control_mode flags...Using pre-existing flags instead 2015-02-28 15:19:16 +01:00
Matt Beall e2de72b882 Added offboard actuator controls flags to offboard control mode and vehicle control mode to disable controls in att_control apps 2015-02-28 15:19:16 +01:00
Matt Beall 877232119f Small changes 2015-02-28 15:19:16 +01:00
Andreas Antener 5f326650fd added max values for airspeed 2015-02-28 11:14:49 +01:00
Andreas Antener d6962de445 change FW airspeed defaults 2015-02-28 10:57:09 +01:00
Thomas Gubler e14023e98f fw att control: update param description 2015-02-15 10:13:49 +01:00
Thomas Gubler d1e9868b9b fw att: add acceleration to control_input 2015-02-15 10:13:49 +01:00
Thomas Gubler 53ffde30c2 fw att: add param to select yawrate control method 2015-02-15 10:13:49 +01:00
Thomas Gubler 84ff3c671d Merge remote-tracking branch 'upstream/master' into ros_messagelayer_merge2_attctrl_posctrl
Conflicts:
	src/drivers/px4fmu/fmu.cpp
2015-02-01 11:06:47 +01:00
Lorenz Meier c4cf28fa95 Move FW att control to multi pub sub API 2015-01-29 16:33:53 +01:00
Thomas Gubler 9b4a210495 missing headers for fmu2 target 2015-01-25 15:55:32 +01:00
Thomas Gubler 96db9e8188 Merge remote-tracking branch 'upstream/master' into ros
Conflicts:
	src/platforms/px4_middleware.h
2015-01-15 12:42:28 +01:00
Lorenz Meier 1bee73af22 Latency measurements: Estimate latency based on sensor timestamp through full system 2015-01-11 11:03:56 +01:00
Thomas Gubler f86c0ed892 remove fw_att_control base classes: as long as they are not integrated into fw_att_control_main they are useless 2015-01-08 09:21:11 +01:00
Thomas Gubler fe279d340d Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
	Makefile
2015-01-07 16:00:59 +01:00
Thomas Gubler c6722fce0b fw att control: cleanup, create base class for ECL
Adding a new base class to remove a lot of boilerplate code, no
functionality changes
2015-01-06 16:11:31 +01:00
Thomas Gubler 16b9f666e7 Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
	src/lib/mathlib/math/Matrix.hpp
	src/modules/mc_att_control/mc_att_control_main.cpp
	src/modules/uORB/topics/vehicle_status.h
	src/platforms/px4_includes.h
2015-01-05 10:02:07 +01:00
Lorenz Meier b6f6a99799 FW attitude control: Build with space optimization 2015-01-04 12:08:25 +01:00
Lorenz Meier ef065808a3 Merged master 2014-12-30 11:01:09 +01:00
Thomas Gubler f05aa01e69 fw att: fix comment style 2014-12-29 16:55:22 +01:00
Mark Whitehorn a0b767f467 add yaw_manual override variable, effective only in ALTCTL and do not publish it in attitude rates 2014-12-29 16:49:42 +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 6f83f77bf4 fw att ctl: remove autostart id param 2014-12-22 15:18:09 +01:00
Thomas Gubler ad189cf7d6 fix small compile error after merge 2014-12-19 16:02:13 +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
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
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