From 9a04655a823309fadd6b521db1329e603c342a1d Mon Sep 17 00:00:00 2001 From: brettpac Date: Fri, 27 Sep 2024 15:32:38 -0700 Subject: [PATCH] sm_multi_panda round 2 --- .../panda_arm_1_moveit_config/CHANGELOG.rst | 60 ------------------- .../launch/demo.launch.py | 3 + .../panda_arm_2_moveit_config/CHANGELOG.rst | 60 ------------------- .../launch/demo.launch.py | 3 + 4 files changed, 6 insertions(+), 120 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 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/launch/demo.launch.py b/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_1_moveit_config/launch/demo.launch.py index b8e18bfad..f987b79fd 100644 --- a/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_1_moveit_config/launch/demo.launch.py +++ b/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_1_moveit_config/launch/demo.launch.py @@ -40,6 +40,7 @@ def generate_launch_description(): output="screen", parameters=[moveit_config.to_dict() | {"ros_control_namespace": "/panda_arm_1"}], arguments=["--ros-args", "--log-level", "move_group:=DEBUG"], + prefix="xterm -hold -e", ) # RViz @@ -68,6 +69,7 @@ def generate_launch_description(): name="robot_state_publisher", output="both", parameters=[moveit_config.robot_description], + prefix="xterm -hold -e", ) # ros2_control using FakeSystem as hardware @@ -82,6 +84,7 @@ def generate_launch_description(): parameters=[moveit_config.robot_description, ros2_controllers_path], output="both", arguments=["--ros-args", "--log-level", "debug"], + prefix="xterm -hold -e", ) # Load controllers 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/launch/demo.launch.py b/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_2_moveit_config/launch/demo.launch.py index f6a29ebb3..b66d31899 100644 --- a/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_2_moveit_config/launch/demo.launch.py +++ b/smacc2_sm_reference_library/sm_multi_panda_sim/panda_arm_2_moveit_config/launch/demo.launch.py @@ -67,6 +67,7 @@ def generate_launch_description(): parameters=[ panda_arm_2_moveit_config.to_dict() | {"ros_control_namespace": "/panda_arm_2"} ], + prefix="xterm -hold -e", ) # RViz @@ -95,6 +96,7 @@ def generate_launch_description(): name="robot_state_publisher", output="both", parameters=[panda_arm_2_moveit_config.robot_description], + prefix="xterm -hold -e", ) # ros2_control using FakeSystem as hardware @@ -109,6 +111,7 @@ def generate_launch_description(): parameters=[panda_arm_2_moveit_config.robot_description, ros2_controllers_path], output="both", # arguments = ["--ros-args", "--log-level", "debug"] + prefix="xterm -hold -e", ) # Load controllers