diff --git a/cs4home_simple_project/CMakeLists.txt b/cs4home_simple_project/CMakeLists.txt index e1d1d9c..ec52dea 100644 --- a/cs4home_simple_project/CMakeLists.txt +++ b/cs4home_simple_project/CMakeLists.txt @@ -18,7 +18,7 @@ find_package(yolov8_msgs REQUIRED) find_package(sensor_msgs REQUIRED) find_package(ament_index_cpp REQUIRED) -set (dependencies +set(dependencies cs4home_core rclcpp rclcpp_components @@ -64,7 +64,7 @@ target_link_libraries(face_module face_core ) -target_link_libraries(yolo_module +target_link_libraries(yolo_module yolo_afferent yolo_efferent yolo_core diff --git a/cs4home_simple_project/include/cs4home_simple_project/FaceAfferent.hpp b/cs4home_simple_project/include/cs4home_simple_project/FaceAfferent.hpp index 4b8ab97..0a64c7e 100644 --- a/cs4home_simple_project/include/cs4home_simple_project/FaceAfferent.hpp +++ b/cs4home_simple_project/include/cs4home_simple_project/FaceAfferent.hpp @@ -41,9 +41,7 @@ class FaceAfferent : public cs4home_core::Afferent bool configure() override; private: - std::vector input_topic_names_; - }; } // namespace cs4home_simple_project diff --git a/cs4home_simple_project/include/cs4home_simple_project/FaceEfferent.hpp b/cs4home_simple_project/include/cs4home_simple_project/FaceEfferent.hpp index 4e878e2..e3279eb 100644 --- a/cs4home_simple_project/include/cs4home_simple_project/FaceEfferent.hpp +++ b/cs4home_simple_project/include/cs4home_simple_project/FaceEfferent.hpp @@ -43,9 +43,7 @@ class FaceEfferent : public cs4home_core::Efferent void publish_graph(knowledge_graph_msgs::msg::GraphUpdate::UniquePtr msg); private: - std::vector output_topic_names_; - }; } // namespace cs4home_simple_project diff --git a/cs4home_simple_project/src/FaceModule.cpp b/cs4home_simple_project/src/FaceModule.cpp index ef2268f..f0f0c2a 100644 --- a/cs4home_simple_project/src/FaceModule.cpp +++ b/cs4home_simple_project/src/FaceModule.cpp @@ -36,4 +36,4 @@ int main(int argc, char ** argv) rclcpp::shutdown(); return 0; -} \ No newline at end of file +} diff --git a/cs4home_simple_project/src/YoloModule.cpp b/cs4home_simple_project/src/YoloModule.cpp index 3f094b6..9bb9e91 100644 --- a/cs4home_simple_project/src/YoloModule.cpp +++ b/cs4home_simple_project/src/YoloModule.cpp @@ -28,9 +28,9 @@ int main(int argc, char ** argv) rclcpp::NodeOptions options; options.arguments( - {"--ros-args", "-r", "__node:=yolo_module", "--params-file", config_file}); + {"--ros-args", "--params-file", config_file}); - auto node = cs4home_core::CognitiveModule::make_shared(options); + auto node = cs4home_core::CognitiveModule::make_shared("yolo_module", options); node->trigger_transition(lifecycle_msgs::msg::Transition::TRANSITION_CONFIGURE); node->trigger_transition(lifecycle_msgs::msg::Transition::TRANSITION_ACTIVATE); @@ -40,4 +40,4 @@ int main(int argc, char ** argv) rclcpp::shutdown(); return 0; -} \ No newline at end of file +} diff --git a/cs4home_simple_project/src/cs4home_simple_project/FaceAfferent.cpp b/cs4home_simple_project/src/cs4home_simple_project/FaceAfferent.cpp index c085f19..8cda215 100644 --- a/cs4home_simple_project/src/cs4home_simple_project/FaceAfferent.cpp +++ b/cs4home_simple_project/src/cs4home_simple_project/FaceAfferent.cpp @@ -34,14 +34,10 @@ bool FaceAfferent::configure() parent_->get_parameter("face_afferent.topics", input_topic_names_); // Create the subscription to the input topics - for (const auto & topic_name : input_topic_names_) - { - if(this->create_subscriber(topic_name, "hri_msgs/msg/IdsList")) - { + for (const auto & topic_name : input_topic_names_) { + if(this->create_subscriber(topic_name, "hri_msgs/msg/IdsList")) { RCLCPP_INFO(parent_->get_logger(), "Subscribed to topic: %s", topic_name.c_str()); - } - else - { + } else { RCLCPP_ERROR(parent_->get_logger(), "Error subscribing to topic: %s", topic_name.c_str()); return false; } @@ -52,4 +48,4 @@ bool FaceAfferent::configure() CS_REGISTER_COMPONENT(FaceAfferent) -} // namespace cs4home_simple_project \ No newline at end of file +} // namespace cs4home_simple_project