Changes have been pushed for the project "Fawkes Robotics Software Framework".
Gitweb: http://git.fawkesrobotics.org/fawkes.git Trac: http://trac.fawkesrobotics.org The branch, thofmann/ros-position-3d has been updated to a4ed4ca16d808bae156f5ec4bb58a0617d5b4ba1 (commit) from 21e2052345aa52c965c406cad4394681c8175d82 (commit) http://git.fawkesrobotics.org/fawkes.git/thofmann/ros-position-3d Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - *Log* --------------------------------------------------------------- commit a4ed4ca16d808bae156f5ec4bb58a0617d5b4ba1 Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> AuthorDate: Wed Aug 6 17:29:07 2014 +0200 Commit: Till Hofmann <hofm...@kbsg.rwth-aachen.de> CommitDate: Wed Aug 6 17:47:03 2014 +0200 ros: add plugin to publish Position3D interfaces to ROS This plugin publishes Position3D interfaces such as object positions to ROS. http://git.fawkesrobotics.org/fawkes.git/commit/a4ed4ca http://trac.fawkesrobotics.org/changeset/a4ed4ca - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - *Summary* ----------------------------------------------------------- src/plugins/ros/Makefile | 15 ++ .../{joint_plugin.cpp => position_3d_plugin.cpp} | 21 ++-- src/plugins/ros/position_3d_thread.cpp | 162 ++++++++++++++++++++ .../ros/{joint_thread.h => position_3d_thread.h} | 25 ++-- 4 files changed, 201 insertions(+), 22 deletions(-) copy src/plugins/ros/{joint_plugin.cpp => position_3d_plugin.cpp} (67%) create mode 100644 src/plugins/ros/position_3d_thread.cpp copy src/plugins/ros/{joint_thread.h => position_3d_thread.h} (80%) - *Diffs* ------------------------------------------------------------- - *commit* a4ed4ca16d808bae156f5ec4bb58a0617d5b4ba1 - - - - - - - - - - Author: Till Hofmann <hofm...@kbsg.rwth-aachen.de> Date: Wed Aug 6 17:29:07 2014 +0200 Subject: ros: add plugin to publish Position3D interfaces to ROS src/plugins/ros/Makefile | 15 ++ .../{joint_plugin.cpp => position_3d_plugin.cpp} | 21 ++-- src/plugins/ros/position_3d_thread.cpp | 162 ++++++++++++++++++++ .../ros/{joint_thread.h => position_3d_thread.h} | 25 ++-- 4 files changed, 201 insertions(+), 22 deletions(-) _Diff for modified files_: diff --git a/src/plugins/ros/Makefile b/src/plugins/ros/Makefile index 49de34d..c1bb6fd 100644 --- a/src/plugins/ros/Makefile +++ b/src/plugins/ros/Makefile @@ -72,6 +72,11 @@ LIBS_ros_move_base = fawkescore fawkesutils fawkesaspects fawkesblackboard \ fawkesinterface fawkestf fawkesrosaspect NavigatorInterface OBJS_ros_move_base = move_base_plugin.o move_base_thread.o +LIBS_ros_position_3d = fawkescore fawkesutils fawkesaspects fawkesblackboard \ + fawkesinterface fawkesrosaspect Position3DInterface +OBJS_ros_position_3d = position_3d_thread.o position_3d_plugin.o + + OBJS_all = $(OBJS_ros) $(OBJS_ros_talkerpub) $(OBJS_ros_webview) $(OBJS_ros_tf) \ $(OBJS_ros_pcl) $(OBJS_ros_images) $(OBJS_ros_laserscan) $(OBJS_ros_odometry) \ $(OBJS_ros_cmdvel) $(OBJS_ros_navigator) $(OBJS_ros_joint) $(OBJS_ros_robot_description) @@ -205,6 +210,14 @@ ifeq ($(HAVE_ROS),1) else WARN_TARGETS += warning_sensor_msgs endif + ifeq ($(call ros-have-pkg,fawkes_msgs),1) + CFLAGS_position_3d_thread += $(call ros-pkg-cflags,fawkes_msgs) + CFLAGS_position_3d_plugin = $(CFLAGS_position_3d_thread) + LDFLAGS_position_3d += $(call ros-pkg-lflags,fawkes_msgs) + PLUGINS_all += $(PLUGINDIR)/ros-position-3d.so + else + WARN_TARGETS += warning_fawkes_msgs + endif PLUGINS_all += $(PLUGINDIR)/ros-robot-description.so @@ -246,6 +259,8 @@ warning_actionlib: $(SILENT)echo -e "$(INDENT_PRINT)--> $(TRED)Omitting ROS navigator and move_base plugins$(TNORMAL) (ROS package actionlib not found)" warning_sensor_msgs: $(SILENT)echo -e "$(INDENT_PRINT)--> $(TRED)Omitting ROS JointState Plugin$(TNORMAL) (ROS package sensor_msgs not found)" +warning_fawkes_msgs: + $(SILENT)echo -e "$(INDENT_PRINT)--> $(TRED)Omitting ROS Position 3D Plugin$(TNORMAL) (ROS package fawkes_msgs not found)" endif include $(BUILDSYSDIR)/base.mk -- Fawkes Robotics Framework http://www.fawkesrobotics.org _______________________________________________ fawkes-commits mailing list fawkes-commits@lists.kbsg.rwth-aachen.de https://lists.kbsg.rwth-aachen.de/listinfo/fawkes-commits
