From 9616e6a243b37eb9b055507b91177d1b09b68103 Mon Sep 17 00:00:00 2001 From: brettpac Date: Mon, 29 Jul 2024 21:08:54 -0700 Subject: [PATCH 1/3] dual arm demo pr --- .../moveit2z_client/CHANGELOG.rst | 13 ---- .../components/cp_tf_listener.hpp | 4 +- .../moveit2z_client/package.xml | 2 +- .../panda_arm_1_moveit_config/CHANGELOG.rst | 60 ------------------ .../panda_arm_1_moveit_config/package.xml | 5 +- .../panda_arm_2_moveit_config/CHANGELOG.rst | 60 ------------------ .../panda_arm_2_moveit_config/package.xml | 3 +- .../sm_multi_panda_sim/CHANGELOG.rst | 61 ------------------- .../cb_move_synchronized_link_goals.hpp | 4 +- .../client_behaviors/cb_wait_joint_states.hpp | 2 +- .../sm_multi_panda_sim/package.xml | 3 +- 11 files changed, 14 insertions(+), 203 deletions(-) delete mode 100644 smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_1_moveit_config/CHANGELOG.rst delete mode 100644 smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_2_moveit_config/CHANGELOG.rst delete mode 100644 smacc2_sm_reference_library/sm_multi_panda_sim/sm_multi_panda_sim/CHANGELOG.rst diff --git a/smacc2_client_library/moveit2z_client/CHANGELOG.rst b/smacc2_client_library/moveit2z_client/CHANGELOG.rst index a6b0e1685..1a0268511 100644 --- a/smacc2_client_library/moveit2z_client/CHANGELOG.rst +++ b/smacc2_client_library/moveit2z_client/CHANGELOG.rst @@ -2,19 +2,6 @@ Changelog for package moveit2z_client ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -2.3.16 (2023-07-16) -------------------- -* Merge branch 'humble' of https://github.com/robosoft-ai/SMACC2 into humble -* Brettpac branch (`#518 `_) - * Attempt to fix weird issue with ros buildfarm - * More on this buildfarm issue - --------- - Co-authored-by: brettpac -* Contributors: brettpac, pabloinigoblasco - -2.3.6 (2023-03-12) ------------------- - 1.22.1 (2022-11-09) ------------------- * pre-release diff --git a/smacc2_client_library/moveit2z_client/include/moveit2z_client/components/cp_tf_listener.hpp b/smacc2_client_library/moveit2z_client/include/moveit2z_client/components/cp_tf_listener.hpp index acc37488d..224248a66 100644 --- a/smacc2_client_library/moveit2z_client/include/moveit2z_client/components/cp_tf_listener.hpp +++ b/smacc2_client_library/moveit2z_client/include/moveit2z_client/components/cp_tf_listener.hpp @@ -29,7 +29,7 @@ #include #include -namespace cl_moveit2z +namespace cl_move_base_z { struct TfPoseTrack { @@ -96,4 +96,4 @@ class CpTFListener : public smacc2::ISmaccComponent, public smacc2::ISmaccUpdata std::mutex m_mutex_; std::list> poseTracks_; }; -} // namespace cl_moveit2z +} // namespace cl_move_base_z diff --git a/smacc2_client_library/moveit2z_client/package.xml b/smacc2_client_library/moveit2z_client/package.xml index 3e6aac6fd..1c567f956 100644 --- a/smacc2_client_library/moveit2z_client/package.xml +++ b/smacc2_client_library/moveit2z_client/package.xml @@ -2,7 +2,7 @@ moveit2z_client - 2.3.18 + 2.3.1 The moveit2z_client package Pablo Iñigo Blasco diff --git a/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_1_moveit_config/CHANGELOG.rst b/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_1_moveit_config/CHANGELOG.rst deleted file mode 100644 index c1f87820e..000000000 --- a/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_1_moveit_config/CHANGELOG.rst +++ /dev/null @@ -1,60 +0,0 @@ -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Changelog for package panda_arm_1_moveit_config -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -2.3.16 (2023-07-16) -------------------- -* Merge branch 'humble' of https://github.com/robosoft-ai/SMACC2 into humble -* Brettpac branch (`#518 `_) - * Attempt to fix weird issue with ros buildfarm - * More on this buildfarm issue - --------- - Co-authored-by: brettpac -* Contributors: brettpac, pabloinigoblasco - -2.3.6 (2023-03-12) ------------------- -* minor -* Contributors: pabloinigoblasco - -* fix -* removing mongo dependency (`#402 `_) - * removing mongo dependency - * fix - * fix -* Contributors: Pablo Iñigo Blasco, pabloinigoblasco - -2.3.3 (2023-03-02 22:58) ------------------------- - -2.3.2 (2023-03-02 22:22) ------------------------- -* Feature/format fix humble (`#383 `_) - * several changes for panda demo - * panda configs - * updating and refactoring code - * fixing format check - * fixing format - * missing - * fixing format - * format fix - * humble moveit environment - * fixes - * missing - * minor - * missing - * missing - * fix - * fixing - * fixing format fix - * fix -* Contributors: Pablo Iñigo Blasco - -2.3.1 (2022-11-28) ------------------- - -1.22.1 (2022-11-09 20:22) -------------------------- - -1.22.0 (2022-11-09 19:53) -------------------------- diff --git a/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_1_moveit_config/package.xml b/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_1_moveit_config/package.xml index 1bcba91de..9bed09854 100644 --- a/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_1_moveit_config/package.xml +++ b/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_1_moveit_config/package.xml @@ -1,7 +1,7 @@ panda_arm_1_moveit_config - 2.3.18 + 2.0.4

MoveIt Resources for testing: Franka Emika Panda @@ -36,6 +36,9 @@ + + ament_cmake diff --git a/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_2_moveit_config/CHANGELOG.rst b/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_2_moveit_config/CHANGELOG.rst deleted file mode 100644 index b8d942c19..000000000 --- a/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_2_moveit_config/CHANGELOG.rst +++ /dev/null @@ -1,60 +0,0 @@ -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Changelog for package panda_arm_2_moveit_config -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -2.3.16 (2023-07-16) -------------------- -* Merge branch 'humble' of https://github.com/robosoft-ai/SMACC2 into humble -* Brettpac branch (`#518 `_) - * Attempt to fix weird issue with ros buildfarm - * More on this buildfarm issue - --------- - Co-authored-by: brettpac -* Contributors: brettpac, pabloinigoblasco - -2.3.6 (2023-03-12) ------------------- -* minor -* Contributors: pabloinigoblasco - -* fix -* removing mongo dependency (`#402 `_) - * removing mongo dependency - * fix - * fix -* Contributors: Pablo Iñigo Blasco, pabloinigoblasco - -2.3.3 (2023-03-02 22:58) ------------------------- - -2.3.2 (2023-03-02 22:22) ------------------------- -* Feature/format fix humble (`#383 `_) - * several changes for panda demo - * panda configs - * updating and refactoring code - * fixing format check - * fixing format - * missing - * fixing format - * format fix - * humble moveit environment - * fixes - * missing - * minor - * missing - * missing - * fix - * fixing - * fixing format fix - * fix -* Contributors: Pablo Iñigo Blasco - -2.3.1 (2022-11-28) ------------------- - -1.22.1 (2022-11-09 20:22) -------------------------- - -1.22.0 (2022-11-09 19:53) -------------------------- diff --git a/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_2_moveit_config/package.xml b/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_2_moveit_config/package.xml index de38a8fae..a33c2fe9d 100644 --- a/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_2_moveit_config/package.xml +++ b/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_2_moveit_config/package.xml @@ -1,7 +1,7 @@ panda_arm_2_moveit_config - 2.3.18 + 2.0.4

MoveIt Resources for testing: Franka Emika Panda @@ -39,6 +39,7 @@ --> + ament_cmake diff --git a/smacc2_sm_reference_library/sm_multi_panda_sim/sm_multi_panda_sim/CHANGELOG.rst b/smacc2_sm_reference_library/sm_multi_panda_sim/sm_multi_panda_sim/CHANGELOG.rst deleted file mode 100644 index 36d970494..000000000 --- a/smacc2_sm_reference_library/sm_multi_panda_sim/sm_multi_panda_sim/CHANGELOG.rst +++ /dev/null @@ -1,61 +0,0 @@ -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Changelog for package sm_multi_panda_sim -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -2.3.16 (2023-07-16) -------------------- -* Merge branch 'humble' of https://github.com/robosoft-ai/SMACC2 into humble -* Brettpac branch (`#518 `_) - * Attempt to fix weird issue with ros buildfarm - * More on this buildfarm issue - --------- - Co-authored-by: brettpac -* Contributors: brettpac, pabloinigoblasco - -2.3.6 (2023-03-12) ------------------- -* minor -* Contributors: pabloinigoblasco - -* fix -* version -* removing mongo dependency (`#402 `_) - * removing mongo dependency - * fix - * fix -* Contributors: Pablo Iñigo Blasco, pabloinigoblasco - -2.3.3 (2023-03-02 22:58) ------------------------- - -2.3.2 (2023-03-02 22:22) ------------------------- -* Feature/format fix humble (`#383 `_) - * several changes for panda demo - * panda configs - * updating and refactoring code - * fixing format check - * fixing format - * missing - * fixing format - * format fix - * humble moveit environment - * fixes - * missing - * minor - * missing - * missing - * fix - * fixing - * fixing format fix - * fix -* Contributors: Pablo Iñigo Blasco - -2.3.1 (2022-11-28) ------------------- - -1.22.1 (2022-11-09 20:22) -------------------------- - -1.22.0 (2022-11-09 19:53) -------------------------- diff --git a/smacc2_sm_reference_library/sm_multi_panda_sim/sm_multi_panda_sim/include/sm_multi_panda_sim/clients/move_group/client_behaviors/cb_move_synchronized_link_goals.hpp b/smacc2_sm_reference_library/sm_multi_panda_sim/sm_multi_panda_sim/include/sm_multi_panda_sim/clients/move_group/client_behaviors/cb_move_synchronized_link_goals.hpp index e670abac9..aa163b419 100644 --- a/smacc2_sm_reference_library/sm_multi_panda_sim/sm_multi_panda_sim/include/sm_multi_panda_sim/clients/move_group/client_behaviors/cb_move_synchronized_link_goals.hpp +++ b/smacc2_sm_reference_library/sm_multi_panda_sim/sm_multi_panda_sim/include/sm_multi_panda_sim/clients/move_group/client_behaviors/cb_move_synchronized_link_goals.hpp @@ -34,7 +34,7 @@ namespace cl_moveit2z class CbMoveSynchronizedLinkGoals : public smacc2::SmaccAsyncClientBehavior { public: - CbMoveSynchronizedLinkGoals(const std::vector& /*poses*/, const std::vector& /*names*/) + CbMoveSynchronizedLinkGoals(const std::vector& poses, const std::vector& names) { } @@ -66,7 +66,7 @@ class CbMoveSynchronizedLinkGoals : public smacc2::SmaccAsyncClientBehavior } private: - void onMessageReceived(const sensor_msgs::msg::JointState & /*msg*/) + void onMessageReceived(const sensor_msgs::msg::JointState & msg) { postSuccessEvent(); mutex.unlock(); diff --git a/smacc2_sm_reference_library/sm_multi_panda_sim/sm_multi_panda_sim/include/sm_multi_panda_sim/clients/move_group/client_behaviors/cb_wait_joint_states.hpp b/smacc2_sm_reference_library/sm_multi_panda_sim/sm_multi_panda_sim/include/sm_multi_panda_sim/clients/move_group/client_behaviors/cb_wait_joint_states.hpp index 213c640b1..05064af89 100644 --- a/smacc2_sm_reference_library/sm_multi_panda_sim/sm_multi_panda_sim/include/sm_multi_panda_sim/clients/move_group/client_behaviors/cb_wait_joint_states.hpp +++ b/smacc2_sm_reference_library/sm_multi_panda_sim/sm_multi_panda_sim/include/sm_multi_panda_sim/clients/move_group/client_behaviors/cb_wait_joint_states.hpp @@ -70,7 +70,7 @@ class CbWaitJointState : public smacc2::SmaccAsyncClientBehavior } private: - void onMessageReceived(const sensor_msgs::msg::JointState & /*msg*/) + void onMessageReceived(const sensor_msgs::msg::JointState & msg) { RCLCPP_INFO(getLogger(), "CbWaitJointState::onMessageReceived, posting event"); postSuccessEvent(); diff --git a/smacc2_sm_reference_library/sm_multi_panda_sim/sm_multi_panda_sim/package.xml b/smacc2_sm_reference_library/sm_multi_panda_sim/sm_multi_panda_sim/package.xml index ab93bddc7..18918a545 100644 --- a/smacc2_sm_reference_library/sm_multi_panda_sim/sm_multi_panda_sim/package.xml +++ b/smacc2_sm_reference_library/sm_multi_panda_sim/sm_multi_panda_sim/package.xml @@ -2,7 +2,7 @@ sm_multi_panda_sim - 2.3.18 + 0.0.0 The sm_multi_panda_sim package SMACC2 is cool Apache-2.0 @@ -16,6 +16,7 @@ smacc2 moveit2z_client controller_manager + warehouse_ros_mongo moveit_configs_utils moveit_resources_panda_description From 02a838ff20317aaa53a8af9a5e0e960210a3bf62 Mon Sep 17 00:00:00 2001 From: brettpac Date: Tue, 30 Jul 2024 00:44:06 -0700 Subject: [PATCH 2/3] Versioning issues and misc changes --- .../moveit2z_client/CHANGELOG.rst | 12 ++++ .../components/cp_tf_listener.hpp | 4 +- .../moveit2z_client/package.xml | 2 +- .../panda_arm_1_moveit_config/CHANGELOG.rst | 60 +++++++++++++++++++ .../panda_arm_1_moveit_config/package.xml | 2 +- .../panda_arm_2_moveit_config/CHANGELOG.rst | 60 +++++++++++++++++++ .../panda_arm_2_moveit_config/package.xml | 2 +- .../sm_multi_panda_sim/package.xml | 4 +- 8 files changed, 139 insertions(+), 7 deletions(-) create mode 100644 smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_1_moveit_config/CHANGELOG.rst create mode 100644 smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_2_moveit_config/CHANGELOG.rst diff --git a/smacc2_client_library/moveit2z_client/CHANGELOG.rst b/smacc2_client_library/moveit2z_client/CHANGELOG.rst index 1a0268511..d11f2cef3 100644 --- a/smacc2_client_library/moveit2z_client/CHANGELOG.rst +++ b/smacc2_client_library/moveit2z_client/CHANGELOG.rst @@ -1,6 +1,18 @@ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Changelog for package moveit2z_client ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.3.16 (2023-07-16) +------------------- +* Merge branch 'humble' of https://github.com/robosoft-ai/SMACC2 into humble +* Brettpac branch (`#518 `_) + * Attempt to fix weird issue with ros buildfarm + * More on this buildfarm issue + --------- + Co-authored-by: brettpac +* Contributors: brettpac, pabloinigoblasco + +2.3.6 (2023-03-12) +------------------ 1.22.1 (2022-11-09) ------------------- diff --git a/smacc2_client_library/moveit2z_client/include/moveit2z_client/components/cp_tf_listener.hpp b/smacc2_client_library/moveit2z_client/include/moveit2z_client/components/cp_tf_listener.hpp index 224248a66..acc37488d 100644 --- a/smacc2_client_library/moveit2z_client/include/moveit2z_client/components/cp_tf_listener.hpp +++ b/smacc2_client_library/moveit2z_client/include/moveit2z_client/components/cp_tf_listener.hpp @@ -29,7 +29,7 @@ #include #include -namespace cl_move_base_z +namespace cl_moveit2z { struct TfPoseTrack { @@ -96,4 +96,4 @@ class CpTFListener : public smacc2::ISmaccComponent, public smacc2::ISmaccUpdata std::mutex m_mutex_; std::list> poseTracks_; }; -} // namespace cl_move_base_z +} // namespace cl_moveit2z diff --git a/smacc2_client_library/moveit2z_client/package.xml b/smacc2_client_library/moveit2z_client/package.xml index 1c567f956..3e6aac6fd 100644 --- a/smacc2_client_library/moveit2z_client/package.xml +++ b/smacc2_client_library/moveit2z_client/package.xml @@ -2,7 +2,7 @@ moveit2z_client - 2.3.1 + 2.3.18 The moveit2z_client package Pablo Iñigo Blasco diff --git a/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_1_moveit_config/CHANGELOG.rst b/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_1_moveit_config/CHANGELOG.rst new file mode 100644 index 000000000..c1f87820e --- /dev/null +++ b/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_1_moveit_config/CHANGELOG.rst @@ -0,0 +1,60 @@ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Changelog for package panda_arm_1_moveit_config +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +2.3.16 (2023-07-16) +------------------- +* Merge branch 'humble' of https://github.com/robosoft-ai/SMACC2 into humble +* Brettpac branch (`#518 `_) + * Attempt to fix weird issue with ros buildfarm + * More on this buildfarm issue + --------- + Co-authored-by: brettpac +* Contributors: brettpac, pabloinigoblasco + +2.3.6 (2023-03-12) +------------------ +* minor +* Contributors: pabloinigoblasco + +* fix +* removing mongo dependency (`#402 `_) + * removing mongo dependency + * fix + * fix +* Contributors: Pablo Iñigo Blasco, pabloinigoblasco + +2.3.3 (2023-03-02 22:58) +------------------------ + +2.3.2 (2023-03-02 22:22) +------------------------ +* Feature/format fix humble (`#383 `_) + * several changes for panda demo + * panda configs + * updating and refactoring code + * fixing format check + * fixing format + * missing + * fixing format + * format fix + * humble moveit environment + * fixes + * missing + * minor + * missing + * missing + * fix + * fixing + * fixing format fix + * fix +* Contributors: Pablo Iñigo Blasco + +2.3.1 (2022-11-28) +------------------ + +1.22.1 (2022-11-09 20:22) +------------------------- + +1.22.0 (2022-11-09 19:53) +------------------------- diff --git a/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_1_moveit_config/package.xml b/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_1_moveit_config/package.xml index 9bed09854..c26e0d540 100644 --- a/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_1_moveit_config/package.xml +++ b/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_1_moveit_config/package.xml @@ -1,7 +1,7 @@ panda_arm_1_moveit_config - 2.0.4 + 2.3.18

MoveIt Resources for testing: Franka Emika Panda diff --git a/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_2_moveit_config/CHANGELOG.rst b/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_2_moveit_config/CHANGELOG.rst new file mode 100644 index 000000000..b8d942c19 --- /dev/null +++ b/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_2_moveit_config/CHANGELOG.rst @@ -0,0 +1,60 @@ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Changelog for package panda_arm_2_moveit_config +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +2.3.16 (2023-07-16) +------------------- +* Merge branch 'humble' of https://github.com/robosoft-ai/SMACC2 into humble +* Brettpac branch (`#518 `_) + * Attempt to fix weird issue with ros buildfarm + * More on this buildfarm issue + --------- + Co-authored-by: brettpac +* Contributors: brettpac, pabloinigoblasco + +2.3.6 (2023-03-12) +------------------ +* minor +* Contributors: pabloinigoblasco + +* fix +* removing mongo dependency (`#402 `_) + * removing mongo dependency + * fix + * fix +* Contributors: Pablo Iñigo Blasco, pabloinigoblasco + +2.3.3 (2023-03-02 22:58) +------------------------ + +2.3.2 (2023-03-02 22:22) +------------------------ +* Feature/format fix humble (`#383 `_) + * several changes for panda demo + * panda configs + * updating and refactoring code + * fixing format check + * fixing format + * missing + * fixing format + * format fix + * humble moveit environment + * fixes + * missing + * minor + * missing + * missing + * fix + * fixing + * fixing format fix + * fix +* Contributors: Pablo Iñigo Blasco + +2.3.1 (2022-11-28) +------------------ + +1.22.1 (2022-11-09 20:22) +------------------------- + +1.22.0 (2022-11-09 19:53) +------------------------- diff --git a/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_2_moveit_config/package.xml b/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_2_moveit_config/package.xml index a33c2fe9d..b5ef969e5 100644 --- a/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_2_moveit_config/package.xml +++ b/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_2_moveit_config/package.xml @@ -1,7 +1,7 @@ panda_arm_2_moveit_config - 2.0.4 + 2.3.18

MoveIt Resources for testing: Franka Emika Panda diff --git a/smacc2_sm_reference_library/sm_multi_panda_sim/sm_multi_panda_sim/package.xml b/smacc2_sm_reference_library/sm_multi_panda_sim/sm_multi_panda_sim/package.xml index 18918a545..136d2d9cf 100644 --- a/smacc2_sm_reference_library/sm_multi_panda_sim/sm_multi_panda_sim/package.xml +++ b/smacc2_sm_reference_library/sm_multi_panda_sim/sm_multi_panda_sim/package.xml @@ -2,7 +2,7 @@ sm_multi_panda_sim - 0.0.0 + 2.3.18 The sm_multi_panda_sim package SMACC2 is cool Apache-2.0 @@ -16,7 +16,7 @@ smacc2 moveit2z_client controller_manager - warehouse_ros_mongo + moveit_configs_utils moveit_resources_panda_description From 7434155cac8967dd61bc5f197a2e9957edc22b90 Mon Sep 17 00:00:00 2001 From: brettpac Date: Thu, 1 Aug 2024 14:34:50 -0700 Subject: [PATCH 3/3] fixing cb_load_waypoints spelling error --- .../nav2z_client/client_behaviors/cb_load_waypoints_file.hpp | 2 +- .../nav2z_client/client_behaviors/cb_load_waypoints_file.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/smacc2_client_library/nav2z_client/nav2z_client/include/nav2z_client/client_behaviors/cb_load_waypoints_file.hpp b/smacc2_client_library/nav2z_client/nav2z_client/include/nav2z_client/client_behaviors/cb_load_waypoints_file.hpp index 4f85bc0f4..ddb17392d 100644 --- a/smacc2_client_library/nav2z_client/nav2z_client/include/nav2z_client/client_behaviors/cb_load_waypoints_file.hpp +++ b/smacc2_client_library/nav2z_client/nav2z_client/include/nav2z_client/client_behaviors/cb_load_waypoints_file.hpp @@ -30,7 +30,7 @@ struct CbLoadWaypointsFile : public smacc2::SmaccAsyncClientBehavior public: CbLoadWaypointsFile(std::string filepath); - CbLoadWaypointsFile(std::string parameter_name, std::string packagenamesapce); + CbLoadWaypointsFile(std::string parameter_name, std::string packagenamespace); void onEntry() override; diff --git a/smacc2_client_library/nav2z_client/nav2z_client/src/nav2z_client/client_behaviors/cb_load_waypoints_file.cpp b/smacc2_client_library/nav2z_client/nav2z_client/src/nav2z_client/client_behaviors/cb_load_waypoints_file.cpp index 13de11be8..ef96961d7 100644 --- a/smacc2_client_library/nav2z_client/nav2z_client/src/nav2z_client/client_behaviors/cb_load_waypoints_file.cpp +++ b/smacc2_client_library/nav2z_client/nav2z_client/src/nav2z_client/client_behaviors/cb_load_waypoints_file.cpp @@ -27,8 +27,8 @@ namespace cl_nav2z CbLoadWaypointsFile::CbLoadWaypointsFile(std::string filepath) : filepath_(filepath) {} -CbLoadWaypointsFile::CbLoadWaypointsFile(std::string parameter_name, std::string packagenamesapce) -: parameterName_(parameter_name), packageNamespace_(packagenamesapce) +CbLoadWaypointsFile::CbLoadWaypointsFile(std::string parameter_name, std::string packagenamespace) +: parameterName_(parameter_name), packageNamespace_(packagenamespace) { }