[Fawkes Git] branch/thofmann/ros-agent-vis: ros-agent-info: adapt to new continual_planning_msgs ros package

Tim Niemueller niemueller at kbsg.rwth-aachen.de
Fri Nov 25 11:45:55 CET 2016


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-agent-vis has been updated
        to  85df0a4d8bc1a6e172f1947801b62c0effbce4c5 (commit)
      from  ced5c314721681a8104400092f29ad6b95cb193f (commit)

http://git.fawkesrobotics.org/fawkes.git/thofmann/ros-agent-vis

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 85df0a4d8bc1a6e172f1947801b62c0effbce4c5
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Fri Nov 25 11:45:36 2016 +0100
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Fri Nov 25 11:45:36 2016 +0100

    ros-agent-info: adapt to new continual_planning_msgs ros package

http://git.fawkesrobotics.org/fawkes.git/commit/85df0a4
http://trac.fawkesrobotics.org/changeset/85df0a4

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -


- *Summary* -----------------------------------------------------------
 src/plugins/ros/Makefile              |   14 +++++++-------
 src/plugins/ros/agent_info_thread.cpp |   12 ++++++------
 src/plugins/ros/agent_info_thread.h   |    4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)


- *Diffs* -------------------------------------------------------------

- *commit* 85df0a4d8bc1a6e172f1947801b62c0effbce4c5 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Fri Nov 25 11:45:36 2016 +0100
Subject: ros-agent-info: adapt to new continual_planning_msgs ros package

 src/plugins/ros/Makefile              |   14 +++++++-------
 src/plugins/ros/agent_info_thread.cpp |   12 ++++++------
 src/plugins/ros/agent_info_thread.h   |    4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/ros/Makefile b/src/plugins/ros/Makefile
index 862a33a..a60db11 100644
--- a/src/plugins/ros/Makefile
+++ b/src/plugins/ros/Makefile
@@ -213,20 +213,20 @@ ifeq ($(HAVE_ROS),1)
 
   PLUGINS_all += $(PLUGINDIR)/ros-robot-description.so
 
-  ifeq ($(call ros-have-pkg,continual_planning_executive),1)
+  ifeq ($(call ros-have-pkg,continual_planning_msgs),1)
     ifeq ($(HAVE_CPP11),1)
 			CFLAGS_agent_info_thread += \
-				 $(call ros-pkg-cflags,continual_planning_executive) $(CFLAGS_CPP11) \
+				 $(call ros-pkg-cflags,continual_planning_msgs) $(CFLAGS_CPP11) \
 				 $(call ros-pkg-cflags,std_msgs)
       CFLAGS_agent_info_plugin = $(CFLAGS_agent_info_thread)
-      LDFLAGS_agent_info = $(call ros-pkg-lflags,continual_planning_executive) \
+      LDFLAGS_agent_info = $(call ros-pkg-lflags,continual_planning_msgs) \
 				 $(call ros-pkg-lflags,std_msgs)
       PLUGINS_all += $(PLUGINDIR)/ros-agent-info.so
     else
       WARN_TARGETS += warning_cpp11
     endif
   else
-    WARN_TARGETS += warning_continual_planning_executive
+    WARN_TARGETS += warning_continual_planning_msgs
   endif
 
 else
@@ -268,9 +268,9 @@ warning_actionlib:
 warning_sensor_msgs:
 	$(SILENT)echo -e "$(INDENT_PRINT)--> $(TRED)Omitting ROS JointState Plugin$(TNORMAL) (ROS package sensor_msgs not found)"
 warning_cpp11:
-	$(SILENT)echo -e "$(INDENT_PRINT)--> $(TRED)Omitting Agent Info Plugin$(TNORMAL) (C++11 not supported)"
-warning_continual_planning_executive:
-	$(SILENT)echo -e "$(INDENT_PRINT)--> $(TRED)Omitting Agent Info Plugin$(TNORMAL) (ROS package continual_planning_executive not found)"
+	$(SILENT)echo -e "$(INDENT_PRINT)--> $(TRED)Omitting ROS Agent Info Plugin$(TNORMAL) (C++11 not supported)"
+warning_continual_planning_msgs:
+	$(SILENT)echo -e "$(INDENT_PRINT)--> $(TRED)Omitting ROS Agent Info Plugin$(TNORMAL) (ROS package continual_planning_msgs not found)"
 endif
 
 include $(BUILDSYSDIR)/base.mk
diff --git a/src/plugins/ros/agent_info_thread.cpp b/src/plugins/ros/agent_info_thread.cpp
index 1a19077..13548c9 100644
--- a/src/plugins/ros/agent_info_thread.cpp
+++ b/src/plugins/ros/agent_info_thread.cpp
@@ -22,7 +22,7 @@
 #include "agent_info_thread.h"
 
 #include <ros/this_node.h>
-#include <continual_planning_executive/ContinualPlanningStatus.h>
+#include <continual_planning_msgs/ContinualPlanningStatus.h>
 #include <std_msgs/String.h>
 #include <algorithm>
 
@@ -51,7 +51,7 @@ void
 RosAgentInfoThread::init()
 {
   last_agent_message_ = "";
-  ros_pub_planner_ = rosnode->advertise<continual_planning_executive::ContinualPlanningStatus>("continual_planning_status", 10);
+  ros_pub_planner_ = rosnode->advertise<continual_planning_msgs::ContinualPlanningStatus>("continual_planning_status", 10);
   ros_pub_agent_message_ = rosnode->advertise<std_msgs::String>("agent_info", 10);
   // open interface and listen for changed data
   agent_if_ = blackboard->open_for_reading<AgentInterface>("Agent");
@@ -85,9 +85,9 @@ RosAgentInfoThread::bb_interface_data_changed(Interface *interface) throw()
   if (history.back() != ';') {
     history.push_back(';');
   }
-  publish_plan(history + iface->plan(), continual_planning_executive::ContinualPlanningStatus::PLANNING);
+  publish_plan(history + iface->plan(), continual_planning_msgs::ContinualPlanningStatus::PLANNING);
 
-  publish_plan(iface->plan(), continual_planning_executive::ContinualPlanningStatus::CURRENT_PLAN);
+  publish_plan(iface->plan(), continual_planning_msgs::ContinualPlanningStatus::CURRENT_PLAN);
 
   if (iface->message() != last_agent_message_) {
     std_msgs::String message;
@@ -98,8 +98,8 @@ RosAgentInfoThread::bb_interface_data_changed(Interface *interface) throw()
 }
 
 void
-RosAgentInfoThread::publish_plan(string plan, continual_planning_executive::ContinualPlanningStatus::_component_type component) {
-  continual_planning_executive::ContinualPlanningStatus status;
+RosAgentInfoThread::publish_plan(string plan, continual_planning_msgs::ContinualPlanningStatus::_component_type component) {
+  continual_planning_msgs::ContinualPlanningStatus status;
   status.component = component;
   replace(plan.begin(), plan.end(), ';', '\n');
   status.description = plan;
diff --git a/src/plugins/ros/agent_info_thread.h b/src/plugins/ros/agent_info_thread.h
index c74b60a..81d3a24 100644
--- a/src/plugins/ros/agent_info_thread.h
+++ b/src/plugins/ros/agent_info_thread.h
@@ -37,7 +37,7 @@
 // from ROS
 #include <ros/node_handle.h>
 
-#include <continual_planning_executive/ContinualPlanningStatus.h>
+#include <continual_planning_msgs/ContinualPlanningStatus.h>
 
 class RosAgentInfoThread
 : public fawkes::Thread,
@@ -56,7 +56,7 @@ class RosAgentInfoThread
   virtual void bb_interface_data_changed(fawkes::Interface *interface) throw();
 
  private:
-  void publish_plan(std::string plan, continual_planning_executive::ContinualPlanningStatus::_component_type);
+  void publish_plan(std::string plan, continual_planning_msgs::ContinualPlanningStatus::_component_type);
  private:
   ros::Publisher ros_pub_planner_;
   ros::Publisher ros_pub_agent_message_;




-- 
Fawkes Robotics Framework                 http://www.fawkesrobotics.org


More information about the fawkes-commits mailing list