Commit Graph

1477 Commits

Author SHA1 Message Date
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
Thomas Gubler bb0d04212f remove copy of std_msgs 2015-01-08 11:33:59 +01:00
Thomas Gubler 9c06450d94 fix RC_CHANNELS_FUNCTION_MAX 2015-01-05 15:33:15 +01:00
Thomas Gubler a35818a288 update rc_channels.msg to latest master rc_channels.h 2015-01-05 15:23:12 +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
Thomas Gubler ac8b47b0c3 add missing msg and includes 2014-12-29 09:49:53 +01:00
Thomas Gubler 4567512d7a add actuator_controls_virtual_mc as msg, fix msg setup in CMakeList 2014-12-25 10:01:20 +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 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 9980e44821 moved msg files 2014-12-16 08:22:58 +01:00
Thomas Gubler afa835744c remove unnecessary type in msg.h template 2014-12-08 15:48:44 +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 99d89577cd vehicle rates sp as msg 2014-12-08 12:23:27 +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 141dda2092 fix uorb header template for constants 2014-12-02 12:17:34 +01:00
Thomas Gubler eba62a75a4 add missing timestamp field 2014-12-02 12:17:06 +01:00
Thomas Gubler dfb266565a update ros configuration for new file locations 2014-12-02 10:45:42 +01:00
Thomas Gubler 3856271abb remove embedded message test from rc_channels.msg 2014-12-01 17:46:25 +01:00
Thomas Gubler 2eeeab8ecd improve msg template file 2014-12-01 17:45:10 +01:00
Thomas Gubler 6a2fcb8874 move (for now) unused msg file 2014-12-01 17:44:15 +01:00
Thomas Gubler 8b5bc703a1 initial version of msg to uorb script
Standard and embedded types work, may need small refinements for some
types
2014-12-01 16:39:27 +01:00
Lorenz Meier 3b2b280a41 Get ROS examples to compile, add simple RC channels message 2014-10-06 00:49:25 -07:00
Lorenz Meier ac0f01e92e First stab at ROS integration 2014-11-03 07:41:05 +01:00