Commit Graph
91 Commits
Author SHA1 Message Date
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 6dd98cb311 mc att ctl: remove autostart id param 2014-12-22 15:18:20 +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 bbfe78e4f6 mc att ctl: fix subscription handlers, fix parameters 2014-12-17 13:50:29 +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
Thomas Gubler 75a8701537 mc att: correctly handle topics which are simultaneously subscribed and published 2014-12-12 11:21:43 +01:00
Thomas Gubler c0d386bce0 mc att: use multiplatform subscriptions type 2014-12-12 10:15:33 +01:00
Thomas Gubler 59d26f5c30 mc att: remove subscriber handles 2014-12-12 07:34:23 +01:00
Thomas Gubler ab35b6470c mc att: use multiplatform publisher 2014-12-11 19:02:14 +01:00
Thomas Gubler b755312a1e mc att: use PX4 macros to init and get params 2014-12-11 17:12:03 +01:00
Thomas Gubler 9d0ecc77bb mc att: convert param definitions to be compatible with multiplatform build 2014-12-11 17:05:12 +01:00
Thomas Gubler ce73a81602 WIP remove unnecessary functions 2014-12-11 16:41:04 +01:00
Thomas Gubler 9c09a9e8d5 mc att control: prepare for ros integration, move class into spearate file 2014-12-11 16:11:04 +01:00
Thomas Gubler 8ae1c9763d write publisher example as class 2014-12-10 16:22:19 +01:00
Thomas Gubler 03ba38d0a4 very much WIP, start to make mc att control p4 and ros compatible 2014-12-10 12:42:57 +01:00
Thomas Gubler fe6663ad9a add platforms/nuttx to default makefile 2014-12-08 15:09:31 +01:00
Thomas Gubler 377030bd8a mc att ctl: remove code which is already in base class 2014-12-08 14:20:11 +01:00
Thomas Gubler 77fd7b388b parameter update as msg 2014-12-08 14:04:20 +01:00
Thomas Gubler 88f4931fd1 actuator armed as msg 2014-12-08 13:44:08 +01:00
Thomas Gubler b93fcca433 vehicle cotnrol mode as msg 2014-12-08 12:34:57 +01:00
Thomas Gubler a71e6ed3c6 change headers to use vehicle attitude msg 2014-12-08 12:25:39 +01:00
Thomas Gubler fc4b722e72 fix headers, remove unneded uorb headers 2014-12-08 12:17:30 +01:00
Thomas Gubler dc945a3f3f actuator controls as msg 2014-12-08 12:12:23 +01:00
Thomas Gubler b3600e5ee6 manual_control_setpoint as msg 2014-12-08 11:06:56 +01:00
Thomas Gubler 87df7c3243 move vehicle_attitude_setpoint to msg format 2014-12-08 10:37:01 +01:00
Thomas Gubler 9c4fc14f23 fix base and sim file descriptions 2014-12-05 10:32:52 +01:00
Thomas Gubler c64c184948 whitespace 2014-12-05 09:43:35 +01:00
Thomas Gubler 417bc91363 mc att: more cleanup between base and main class 2014-12-05 09:29:57 +01:00
Thomas Gubler 85aa6554ad re-add hardcoded parameters for euroc 2014-12-05 09:29:20 +01:00
Thomas Gubler 2f646e7082 mc att control: ran fix code style script 2014-12-05 09:02:06 +01:00
Thomas Gubler 4c950eb76b mc att control: make the main app use the base class, move euroc functions into own class 2014-12-05 09:00:21 +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
Roman Bapst ff55652f9a adapted attitude controllers to support VTOL 2014-12-02 10:34:39 +01:00
Lorenz Meier 2a76b10f7a mc attitude controller: Less verbose 2014-11-22 16:34:29 +01:00
Roman Bapst 0acdf5927b cleaned up 2014-11-10 17:01:59 +01:00
Roman Bapst a2ec2ec857 cleaned up 2014-11-10 16:58:56 +01:00
Roman Bapst f72f0db996 include correct eigen lib header 2014-11-10 16:10:43 +01:00
Roman Bapst b5e34eac4f fixed typo 2014-11-05 15:40:22 +01:00
Roman Bapst 48cdbf3d0c added more setter and getter functions 2014-11-05 08:51:12 +01:00
Roman Bapst c51ec34118 added initialisation of parameters, added assignment of actuator controls, cleaned up 2014-11-05 08:50:20 +01:00
Roman Bapst b168ba92e0 added setter functions into base class. used when integrating the base class into a gazebo environment 2014-10-29 15:57:45 +01:00
Roman Bapst 4fdf8e1ff2 updated from remote 2014-10-23 16:59:21 +02:00
Lorenz Meier 77365188ad mc_att_control: Support circuit breakers 2014-05-25 20:35:37 +02:00
Anton Babushkin d8ef397b07 mc_att_control: reset yaw setpoint after ACRO 2014-05-20 16:40:44 +02:00