From 9725aff6ab615166dc544bc6674a3c831ae7107d Mon Sep 17 00:00:00 2001
From: wangWking <842749351@qq.com>
Date: Wed, 15 Nov 2023 11:21:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=20ros=E4=B8=ADcobotx=E7=9B=B8?=
=?UTF-8?q?=E5=85=B3=E7=9A=84=E5=90=8D=E7=A7=B0=E9=87=8D=E5=91=BD=E5=90=8D?=
=?UTF-8?q?=E4=B8=BAmercury?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mercury_a1}/CMakeLists.txt | 2 +-
.../mercury_a1}/LICENSE | 0
.../mercury_a1/config/mercury_a1.rviz | 0
.../mercury_a1}/launch/detect_marker.launch | 0
.../launch/detect_marker_with_topic.launch | 0
.../mercury_a1}/launch/mycobot_follow.launch | 4 +-
.../mercury_a1}/launch/simple_gui.launch | 10 +--
.../mercury_a1}/launch/slider_control.launch | 4 +-
.../mercury_a1}/launch/teleop_keyboard.launch | 8 +--
.../mercury_a1}/launch/test.launch | 4 +-
.../mercury_a1}/package.xml | 10 +--
.../mercury_a1}/scripts/detect_marker.py | 0
.../mercury_a1}/scripts/follow_and_pump.py | 0
.../mercury_a1}/scripts/follow_display.py | 10 +--
.../mercury_a1}/scripts/following_marker.py | 0
.../mercury_a1}/scripts/listen_real.py | 2 +-
.../scripts/listen_real_of_topic.py | 8 +--
.../mercury_a1}/scripts/simple_gui.py | 4 +-
.../mercury_a1}/scripts/slider_control.py | 8 ++-
.../mercury_a1}/scripts/teleop_keyboard.py | 6 +-
.../mercury_a1}/src/camera_display.cpp | 0
.../mercury_a1}/src/opencv_camera.cpp | 0
.../mercury_a1_communication}/CMakeLists.txt | 18 ++---
.../mercury_a1_communication}/LICENSE | 0
.../launch/communication_jsnn.launch | 0
.../launch/communication_seeed.launch | 0
.../launch/communication_service.launch | 2 +-
.../launch/communication_topic.launch | 2 +-
.../launch/communication_topic_pi.launch | 2 +-
.../msg/MercuryAngles.msg | 0
.../msg/MercuryCoords.msg | 0
.../msg/MercuryGripperStatus.msg | 0
.../msg/MercuryPumpStatus.msg | 0
.../msg/MercurySetAngles.msg | 0
.../msg/MercurySetCoords.msg | 0
.../mercury_a1_communication}/package.xml | 4 +-
.../scripts/mercury_services.py | 26 +++----
.../scripts/mercury_topics.py | 46 ++++++------
.../scripts/mercury_topics_jsnn.py | 0
.../scripts/mercury_topics_pi.py | 42 +++++------
.../scripts/mercury_topics_seeed.py | 0
.../srv/GetAngles.srv | 0
.../srv/GetCoords.srv | 0
.../srv/GripperStatus.srv | 0
.../srv/PumpStatus.srv | 0
.../srv/SetAngles.srv | 0
.../srv/SetCoords.srv | 0
.../mercury_a1_moveit}/.setup_assistant | 2 +-
.../mercury_a1_moveit}/CMakeLists.txt | 2 +-
.../mercury_a1_moveit}/LICENSE | 0
.../config/cartesian_limits.yaml | 0
.../config/chomp_planning.yaml | 0
.../config/fake_controllers.yaml | 0
.../config/firefighter.srdf | 0
.../config/gazebo_controllers.yaml | 0
.../config/joint_limits.yaml | 0
.../mercury_a1_moveit}/config/kinematics.yaml | 0
.../config/ompl_planning.yaml | 0
.../config/ros_controllers.yaml | 0
.../mercury_a1_moveit}/config/sensors_3d.yaml | 0
.../config/simple_moveit_controllers.yaml | 0
.../config/stomp_planning.yaml | 0
.../launch/chomp_planning_pipeline.launch.xml | 2 +-
.../launch/default_warehouse_db.launch | 2 +-
.../mercury_a1_moveit}/launch/demo.launch | 2 +-
.../launch/demo_gazebo.launch | 0
.../fake_moveit_controller_manager.launch.xml | 2 +-
...ghter_moveit_controller_manager.launch.xml | 2 +-
...refighter_moveit_sensor_manager.launch.xml | 0
.../mercury_a1_moveit}/launch/gazebo.launch | 4 +-
.../launch/joystick_control.launch | 0
.../launch/mercury_a1.launch | 67 +++++++++++++++++
.../launch/move_group.launch | 0
.../mercury_a1_moveit}/launch/moveit.rviz | 0
.../launch/moveit_rviz.launch | 0
.../launch/mycobot_moveit.launch | 10 +--
.../ompl-chomp_planning_pipeline.launch.xml | 4 +-
.../launch/ompl_planning_pipeline.launch.xml | 2 +-
...otion_planner_planning_pipeline.launch.xml | 0
.../launch/planning_context.launch | 10 +--
.../launch/planning_pipeline.launch.xml | 0
...ntrol_moveit_controller_manager.launch.xml | 0
.../launch/ros_controllers.launch | 2 +-
.../launch/run_benchmark_ompl.launch | 2 +-
.../launch/sensor_manager.launch.xml | 2 +-
.../launch/setup_assistant.launch | 2 +-
...imple_moveit_controller_manager.launch.xml | 4 +-
.../launch/stomp_planning_pipeline.launch.xml | 2 +-
.../launch/trajectory_execution.launch.xml | 0
.../launch/warehouse.launch | 0
.../launch/warehouse_settings.launch.xml | 0
.../mercury_a1_moveit}/package.xml | 2 +-
.../scripts/obstacle_avoidance_demo.py | 0
.../mercury_a1_moveit}/scripts/sync_plan.py | 10 +--
.../mercury_b1}/CMakeLists.txt | 2 +-
.../mercury_b1}/LICENSE | 0
.../mercury_b1/config/mercury_b1.rviz | 0
.../launch/mercury_b1_follow.launch | 4 +-
.../mercury_b1}/launch/simple_gui.launch | 10 +--
.../mercury_b1}/launch/slider_control.launch | 4 +-
.../mercury_b1}/launch/teleop_keyboard.launch | 8 +--
.../mercury_b1}/launch/test.launch | 4 +-
.../mercury_b1}/package.xml | 10 +--
.../mercury_b1}/scripts/follow_display.py | 12 ++--
.../mercury_b1}/scripts/listen_real.py | 2 +-
.../scripts/listen_real_of_topic.py | 4 +-
.../mercury_b1}/scripts/simple_gui.py | 2 +-
.../mercury_b1}/scripts/slider_control.py | 6 +-
.../mercury_b1}/scripts/teleop_keyboard.py | 2 +-
.../mercury_b1}/scripts/test.py | 4 +-
.../mercury_b1}/src/camera_display.cpp | 0
.../mercury_b1}/src/opencv_camera.cpp | 0
.../mercury_b1_moveit}/.setup_assistant | 2 +-
.../mercury_b1_moveit}/CMakeLists.txt | 2 +-
.../config/cartesian_limits.yaml | 0
.../config/chomp_planning.yaml | 0
.../config/fake_controllers.yaml | 0
.../config/firefighter.srdf | 0
.../config/gazebo_controllers.yaml | 0
.../config/gazebo_firefighter.urdf | 72 +++++++++----------
.../config/joint_limits.yaml | 0
.../mercury_b1_moveit}/config/kinematics.yaml | 0
.../config/ompl_planning.yaml | 0
.../config/ros_controllers.yaml | 0
.../mercury_b1_moveit}/config/sensors_3d.yaml | 0
.../config/simple_moveit_controllers.yaml | 0
.../config/stomp_planning.yaml | 0
.../launch/chomp_planning_pipeline.launch.xml | 2 +-
.../launch/default_warehouse_db.launch | 2 +-
.../mercury_b1_moveit}/launch/demo.launch | 2 +-
.../launch/demo_gazebo.launch | 0
.../fake_moveit_controller_manager.launch.xml | 2 +-
...refighter_moveit_sensor_manager.launch.xml | 0
.../mercury_b1_moveit}/launch/gazebo.launch | 4 +-
.../launch/joystick_control.launch | 0
.../launch/mercury_b1.launch | 68 ++++++++++++++++++
.../launch/move_group.launch | 0
.../mercury_b1_moveit}/launch/moveit.rviz | 0
.../launch/moveit_rviz.launch | 0
.../ompl-chomp_planning_pipeline.launch.xml | 4 +-
.../launch/ompl_planning_pipeline.launch.xml | 2 +-
...otion_planner_planning_pipeline.launch.xml | 0
.../launch/planning_context.launch | 10 +--
.../launch/planning_pipeline.launch.xml | 0
...ntrol_moveit_controller_manager.launch.xml | 0
.../launch/ros_controllers.launch | 2 +-
.../launch/run_benchmark_ompl.launch | 2 +-
.../launch/sensor_manager.launch.xml | 2 +-
.../launch/setup_assistant.launch | 2 +-
...imple_moveit_controller_manager.launch.xml | 4 +-
.../launch/stomp_planning_pipeline.launch.xml | 2 +-
.../launch/trajectory_execution.launch.xml | 0
.../launch/warehouse.launch | 0
.../launch/warehouse_settings.launch.xml | 0
.../mercury_b1_moveit}/package.xml | 2 +-
.../mercury_b1_moveit}/scripts/sync_plan.py | 6 +-
.../urdf/{cobotx_a450 => mercury_a1}/base.dae | 0
.../{cobotx_a450 => mercury_a1}/joint1.dae | 0
.../{cobotx_a450 => mercury_a1}/joint2.dae | 0
.../{cobotx_a450 => mercury_a1}/joint3.dae | 0
.../{cobotx_a450 => mercury_a1}/joint4.dae | 0
.../{cobotx_a450 => mercury_a1}/joint5.dae | 0
.../{cobotx_a450 => mercury_a1}/joint6.dae | 0
.../{cobotx_a450 => mercury_a1}/joint7.dae | 0
.../mercury_a1.urdf} | 32 ++++-----
.../urdf/{cobotx_b450 => mercury_b1}/base.dae | 0
.../urdf/{cobotx_b450 => mercury_b1}/body.dae | 0
.../urdf/{cobotx_b450 => mercury_b1}/head.dae | 0
.../{cobotx_b450 => mercury_b1}/head_eye.dae | 0
.../{cobotx_b450 => mercury_b1}/joint1_L.dae | 0
.../{cobotx_b450 => mercury_b1}/joint1_R.dae | 0
.../{cobotx_b450 => mercury_b1}/joint2_L.dae | 0
.../{cobotx_b450 => mercury_b1}/joint2_R.dae | 0
.../{cobotx_b450 => mercury_b1}/joint3_L.dae | 0
.../{cobotx_b450 => mercury_b1}/joint3_R.dae | 0
.../{cobotx_b450 => mercury_b1}/joint4_L.dae | 0
.../{cobotx_b450 => mercury_b1}/joint4_R.dae | 0
.../{cobotx_b450 => mercury_b1}/joint5_L.dae | 0
.../{cobotx_b450 => mercury_b1}/joint5_R.dae | 0
.../{cobotx_b450 => mercury_b1}/joint6_L.dae | 0
.../{cobotx_b450 => mercury_b1}/joint6_R.dae | 0
.../{cobotx_b450 => mercury_b1}/joint7_L.dae | 0
.../{cobotx_b450 => mercury_b1}/joint7_R.dae | 0
.../mercury_b1.urdf} | 72 +++++++++----------
184 files changed, 434 insertions(+), 297 deletions(-)
rename {CobotX/cobotx_a450 => Mercury/mercury_a1}/CMakeLists.txt (98%)
rename {CobotX/cobotx_a450 => Mercury/mercury_a1}/LICENSE (100%)
rename CobotX/cobotx_a450/config/cobotx_a450.rviz => Mercury/mercury_a1/config/mercury_a1.rviz (100%)
rename {CobotX/cobotx_a450 => Mercury/mercury_a1}/launch/detect_marker.launch (100%)
rename {CobotX/cobotx_a450 => Mercury/mercury_a1}/launch/detect_marker_with_topic.launch (100%)
rename {CobotX/cobotx_a450 => Mercury/mercury_a1}/launch/mycobot_follow.launch (74%)
rename {CobotX/cobotx_a450 => Mercury/mercury_a1}/launch/simple_gui.launch (63%)
rename {CobotX/cobotx_b450 => Mercury/mercury_a1}/launch/slider_control.launch (85%)
rename {CobotX/cobotx_a450 => Mercury/mercury_a1}/launch/teleop_keyboard.launch (69%)
rename {CobotX/cobotx_a450 => Mercury/mercury_a1}/launch/test.launch (80%)
rename {CobotX/cobotx_b450 => Mercury/mercury_a1}/package.xml (83%)
rename {CobotX/cobotx_a450 => Mercury/mercury_a1}/scripts/detect_marker.py (100%)
rename {CobotX/cobotx_a450 => Mercury/mercury_a1}/scripts/follow_and_pump.py (100%)
rename {CobotX/cobotx_a450 => Mercury/mercury_a1}/scripts/follow_display.py (92%)
rename {CobotX/cobotx_a450 => Mercury/mercury_a1}/scripts/following_marker.py (100%)
rename {CobotX/cobotx_a450 => Mercury/mercury_a1}/scripts/listen_real.py (97%)
rename {CobotX/cobotx_b450 => Mercury/mercury_a1}/scripts/listen_real_of_topic.py (87%)
rename {CobotX/cobotx_b450 => Mercury/mercury_a1}/scripts/simple_gui.py (99%)
rename {CobotX/cobotx_a450 => Mercury/mercury_a1}/scripts/slider_control.py (84%)
rename {CobotX/cobotx_b450 => Mercury/mercury_a1}/scripts/teleop_keyboard.py (97%)
rename {CobotX/cobotx_a450 => Mercury/mercury_a1}/src/camera_display.cpp (100%)
rename {CobotX/cobotx_a450 => Mercury/mercury_a1}/src/opencv_camera.cpp (100%)
rename {CobotX/cobotx_a450_communication => Mercury/mercury_a1_communication}/CMakeLists.txt (96%)
rename {CobotX/cobotx_a450_communication => Mercury/mercury_a1_communication}/LICENSE (100%)
rename {CobotX/cobotx_a450_communication => Mercury/mercury_a1_communication}/launch/communication_jsnn.launch (100%)
rename {CobotX/cobotx_a450_communication => Mercury/mercury_a1_communication}/launch/communication_seeed.launch (100%)
rename {CobotX/cobotx_a450_communication => Mercury/mercury_a1_communication}/launch/communication_service.launch (77%)
rename {CobotX/cobotx_a450_communication => Mercury/mercury_a1_communication}/launch/communication_topic.launch (77%)
rename {CobotX/cobotx_a450_communication => Mercury/mercury_a1_communication}/launch/communication_topic_pi.launch (77%)
rename CobotX/cobotx_a450_communication/msg/CobotXAngles.msg => Mercury/mercury_a1_communication/msg/MercuryAngles.msg (100%)
rename CobotX/cobotx_a450_communication/msg/CobotXCoords.msg => Mercury/mercury_a1_communication/msg/MercuryCoords.msg (100%)
rename CobotX/cobotx_a450_communication/msg/CobotXGripperStatus.msg => Mercury/mercury_a1_communication/msg/MercuryGripperStatus.msg (100%)
rename CobotX/cobotx_a450_communication/msg/CobotXPumpStatus.msg => Mercury/mercury_a1_communication/msg/MercuryPumpStatus.msg (100%)
rename CobotX/cobotx_a450_communication/msg/CobotXSetAngles.msg => Mercury/mercury_a1_communication/msg/MercurySetAngles.msg (100%)
rename CobotX/cobotx_a450_communication/msg/CobotXSetCoords.msg => Mercury/mercury_a1_communication/msg/MercurySetCoords.msg (100%)
rename {CobotX/cobotx_a450_communication => Mercury/mercury_a1_communication}/package.xml (96%)
rename CobotX/cobotx_a450_communication/scripts/cobotx_services.py => Mercury/mercury_a1_communication/scripts/mercury_services.py (89%)
rename CobotX/cobotx_a450_communication/scripts/cobotx_topics.py => Mercury/mercury_a1_communication/scripts/mercury_topics.py (85%)
rename CobotX/cobotx_a450_communication/scripts/cobotx_topics_jsnn.py => Mercury/mercury_a1_communication/scripts/mercury_topics_jsnn.py (100%)
rename CobotX/cobotx_a450_communication/scripts/cobotx_topics_pi.py => Mercury/mercury_a1_communication/scripts/mercury_topics_pi.py (85%)
rename CobotX/cobotx_a450_communication/scripts/cobotx_topics_seeed.py => Mercury/mercury_a1_communication/scripts/mercury_topics_seeed.py (100%)
rename {CobotX/cobotx_a450_communication => Mercury/mercury_a1_communication}/srv/GetAngles.srv (100%)
rename {CobotX/cobotx_a450_communication => Mercury/mercury_a1_communication}/srv/GetCoords.srv (100%)
rename {CobotX/cobotx_a450_communication => Mercury/mercury_a1_communication}/srv/GripperStatus.srv (100%)
rename {CobotX/cobotx_a450_communication => Mercury/mercury_a1_communication}/srv/PumpStatus.srv (100%)
rename {CobotX/cobotx_a450_communication => Mercury/mercury_a1_communication}/srv/SetAngles.srv (100%)
rename {CobotX/cobotx_a450_communication => Mercury/mercury_a1_communication}/srv/SetCoords.srv (100%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/.setup_assistant (83%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_a1_moveit}/CMakeLists.txt (90%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/LICENSE (100%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/config/cartesian_limits.yaml (100%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/config/chomp_planning.yaml (100%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/config/fake_controllers.yaml (100%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/config/firefighter.srdf (100%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/config/gazebo_controllers.yaml (100%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/config/joint_limits.yaml (100%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/config/kinematics.yaml (100%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/config/ompl_planning.yaml (100%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/config/ros_controllers.yaml (100%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/config/sensors_3d.yaml (100%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/config/simple_moveit_controllers.yaml (100%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/config/stomp_planning.yaml (100%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/launch/chomp_planning_pipeline.launch.xml (92%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/launch/default_warehouse_db.launch (83%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/launch/demo.launch (97%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/launch/demo_gazebo.launch (100%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/launch/fake_moveit_controller_manager.launch.xml (82%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/launch/firefighter_moveit_controller_manager.launch.xml (85%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/launch/firefighter_moveit_sensor_manager.launch.xml (100%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/launch/gazebo.launch (93%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/launch/joystick_control.launch (100%)
create mode 100644 Mercury/mercury_a1_moveit/launch/mercury_a1.launch
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/launch/move_group.launch (100%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/launch/moveit.rviz (100%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/launch/moveit_rviz.launch (100%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/launch/mycobot_moveit.launch (87%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_a1_moveit}/launch/ompl-chomp_planning_pipeline.launch.xml (82%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/launch/ompl_planning_pipeline.launch.xml (92%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/launch/pilz_industrial_motion_planner_planning_pipeline.launch.xml (100%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/launch/planning_context.launch (68%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/launch/planning_pipeline.launch.xml (100%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/launch/ros_control_moveit_controller_manager.launch.xml (100%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/launch/ros_controllers.launch (76%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/launch/run_benchmark_ompl.launch (88%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_a1_moveit}/launch/sensor_manager.launch.xml (88%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_a1_moveit}/launch/setup_assistant.launch (91%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_a1_moveit}/launch/simple_moveit_controller_manager.launch.xml (62%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_a1_moveit}/launch/stomp_planning_pipeline.launch.xml (92%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/launch/trajectory_execution.launch.xml (100%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/launch/warehouse.launch (100%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/launch/warehouse_settings.launch.xml (100%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/package.xml (98%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/scripts/obstacle_avoidance_demo.py (100%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_a1_moveit}/scripts/sync_plan.py (80%)
rename {CobotX/cobotx_b450 => Mercury/mercury_b1}/CMakeLists.txt (98%)
rename {CobotX/cobotx_b450 => Mercury/mercury_b1}/LICENSE (100%)
rename CobotX/cobotx_b450/config/cobotx_b450.rviz => Mercury/mercury_b1/config/mercury_b1.rviz (100%)
rename CobotX/cobotx_b450/launch/cobotx_b450_follow.launch => Mercury/mercury_b1/launch/mercury_b1_follow.launch (74%)
rename {CobotX/cobotx_b450 => Mercury/mercury_b1}/launch/simple_gui.launch (63%)
rename {CobotX/cobotx_a450 => Mercury/mercury_b1}/launch/slider_control.launch (85%)
rename {CobotX/cobotx_b450 => Mercury/mercury_b1}/launch/teleop_keyboard.launch (69%)
rename {CobotX/cobotx_b450 => Mercury/mercury_b1}/launch/test.launch (80%)
rename {CobotX/cobotx_a450 => Mercury/mercury_b1}/package.xml (83%)
rename {CobotX/cobotx_b450 => Mercury/mercury_b1}/scripts/follow_display.py (94%)
rename {CobotX/cobotx_b450 => Mercury/mercury_b1}/scripts/listen_real.py (97%)
rename {CobotX/cobotx_a450 => Mercury/mercury_b1}/scripts/listen_real_of_topic.py (92%)
rename {CobotX/cobotx_a450 => Mercury/mercury_b1}/scripts/simple_gui.py (99%)
rename {CobotX/cobotx_b450 => Mercury/mercury_b1}/scripts/slider_control.py (95%)
rename {CobotX/cobotx_a450 => Mercury/mercury_b1}/scripts/teleop_keyboard.py (98%)
rename {CobotX/cobotx_b450 => Mercury/mercury_b1}/scripts/test.py (84%)
rename {CobotX/cobotx_b450 => Mercury/mercury_b1}/src/camera_display.cpp (100%)
rename {CobotX/cobotx_b450 => Mercury/mercury_b1}/src/opencv_camera.cpp (100%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/.setup_assistant (83%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_b1_moveit}/CMakeLists.txt (90%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/config/cartesian_limits.yaml (100%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/config/chomp_planning.yaml (100%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/config/fake_controllers.yaml (100%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/config/firefighter.srdf (100%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/config/gazebo_controllers.yaml (100%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/config/gazebo_firefighter.urdf (95%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/config/joint_limits.yaml (100%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/config/kinematics.yaml (100%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/config/ompl_planning.yaml (100%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/config/ros_controllers.yaml (100%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/config/sensors_3d.yaml (100%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/config/simple_moveit_controllers.yaml (100%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/config/stomp_planning.yaml (100%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/launch/chomp_planning_pipeline.launch.xml (92%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/launch/default_warehouse_db.launch (83%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/launch/demo.launch (97%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/launch/demo_gazebo.launch (100%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/launch/fake_moveit_controller_manager.launch.xml (82%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/launch/firefighter_moveit_sensor_manager.launch.xml (100%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/launch/gazebo.launch (91%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/launch/joystick_control.launch (100%)
create mode 100644 Mercury/mercury_b1_moveit/launch/mercury_b1.launch
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/launch/move_group.launch (100%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/launch/moveit.rviz (100%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/launch/moveit_rviz.launch (100%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_b1_moveit}/launch/ompl-chomp_planning_pipeline.launch.xml (82%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/launch/ompl_planning_pipeline.launch.xml (92%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/launch/pilz_industrial_motion_planner_planning_pipeline.launch.xml (100%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/launch/planning_context.launch (68%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/launch/planning_pipeline.launch.xml (100%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/launch/ros_control_moveit_controller_manager.launch.xml (100%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/launch/ros_controllers.launch (78%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/launch/run_benchmark_ompl.launch (88%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_b1_moveit}/launch/sensor_manager.launch.xml (88%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_b1_moveit}/launch/setup_assistant.launch (91%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_b1_moveit}/launch/simple_moveit_controller_manager.launch.xml (62%)
rename {CobotX/cobotx_a450_moveit => Mercury/mercury_b1_moveit}/launch/stomp_planning_pipeline.launch.xml (92%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/launch/trajectory_execution.launch.xml (100%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/launch/warehouse.launch (100%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/launch/warehouse_settings.launch.xml (100%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/package.xml (98%)
rename {CobotX/cobotx_b450_moveit => Mercury/mercury_b1_moveit}/scripts/sync_plan.py (95%)
rename mycobot_description/urdf/{cobotx_a450 => mercury_a1}/base.dae (100%)
rename mycobot_description/urdf/{cobotx_a450 => mercury_a1}/joint1.dae (100%)
rename mycobot_description/urdf/{cobotx_a450 => mercury_a1}/joint2.dae (100%)
rename mycobot_description/urdf/{cobotx_a450 => mercury_a1}/joint3.dae (100%)
rename mycobot_description/urdf/{cobotx_a450 => mercury_a1}/joint4.dae (100%)
rename mycobot_description/urdf/{cobotx_a450 => mercury_a1}/joint5.dae (100%)
rename mycobot_description/urdf/{cobotx_a450 => mercury_a1}/joint6.dae (100%)
rename mycobot_description/urdf/{cobotx_a450 => mercury_a1}/joint7.dae (100%)
rename mycobot_description/urdf/{cobotx_a450/cobotx_a450.urdf => mercury_a1/mercury_a1.urdf} (76%)
rename mycobot_description/urdf/{cobotx_b450 => mercury_b1}/base.dae (100%)
rename mycobot_description/urdf/{cobotx_b450 => mercury_b1}/body.dae (100%)
rename mycobot_description/urdf/{cobotx_b450 => mercury_b1}/head.dae (100%)
rename mycobot_description/urdf/{cobotx_b450 => mercury_b1}/head_eye.dae (100%)
rename mycobot_description/urdf/{cobotx_b450 => mercury_b1}/joint1_L.dae (100%)
rename mycobot_description/urdf/{cobotx_b450 => mercury_b1}/joint1_R.dae (100%)
rename mycobot_description/urdf/{cobotx_b450 => mercury_b1}/joint2_L.dae (100%)
rename mycobot_description/urdf/{cobotx_b450 => mercury_b1}/joint2_R.dae (100%)
rename mycobot_description/urdf/{cobotx_b450 => mercury_b1}/joint3_L.dae (100%)
rename mycobot_description/urdf/{cobotx_b450 => mercury_b1}/joint3_R.dae (100%)
rename mycobot_description/urdf/{cobotx_b450 => mercury_b1}/joint4_L.dae (100%)
rename mycobot_description/urdf/{cobotx_b450 => mercury_b1}/joint4_R.dae (100%)
rename mycobot_description/urdf/{cobotx_b450 => mercury_b1}/joint5_L.dae (100%)
rename mycobot_description/urdf/{cobotx_b450 => mercury_b1}/joint5_R.dae (100%)
rename mycobot_description/urdf/{cobotx_b450 => mercury_b1}/joint6_L.dae (100%)
rename mycobot_description/urdf/{cobotx_b450 => mercury_b1}/joint6_R.dae (100%)
rename mycobot_description/urdf/{cobotx_b450 => mercury_b1}/joint7_L.dae (100%)
rename mycobot_description/urdf/{cobotx_b450 => mercury_b1}/joint7_R.dae (100%)
rename mycobot_description/urdf/{cobotx_b450/cobotx_b450.urdf => mercury_b1/mercury_b1.urdf} (76%)
diff --git a/CobotX/cobotx_a450/CMakeLists.txt b/Mercury/mercury_a1/CMakeLists.txt
similarity index 98%
rename from CobotX/cobotx_a450/CMakeLists.txt
rename to Mercury/mercury_a1/CMakeLists.txt
index 3a89843..d1887d3 100644
--- a/CobotX/cobotx_a450/CMakeLists.txt
+++ b/Mercury/mercury_a1/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.8.3)
-project(cobotx_a450)
+project(mercury_a1)
add_compile_options(-std=c++11)
## Find catkin and any catkin packages
diff --git a/CobotX/cobotx_a450/LICENSE b/Mercury/mercury_a1/LICENSE
similarity index 100%
rename from CobotX/cobotx_a450/LICENSE
rename to Mercury/mercury_a1/LICENSE
diff --git a/CobotX/cobotx_a450/config/cobotx_a450.rviz b/Mercury/mercury_a1/config/mercury_a1.rviz
similarity index 100%
rename from CobotX/cobotx_a450/config/cobotx_a450.rviz
rename to Mercury/mercury_a1/config/mercury_a1.rviz
diff --git a/CobotX/cobotx_a450/launch/detect_marker.launch b/Mercury/mercury_a1/launch/detect_marker.launch
similarity index 100%
rename from CobotX/cobotx_a450/launch/detect_marker.launch
rename to Mercury/mercury_a1/launch/detect_marker.launch
diff --git a/CobotX/cobotx_a450/launch/detect_marker_with_topic.launch b/Mercury/mercury_a1/launch/detect_marker_with_topic.launch
similarity index 100%
rename from CobotX/cobotx_a450/launch/detect_marker_with_topic.launch
rename to Mercury/mercury_a1/launch/detect_marker_with_topic.launch
diff --git a/CobotX/cobotx_a450/launch/mycobot_follow.launch b/Mercury/mercury_a1/launch/mycobot_follow.launch
similarity index 74%
rename from CobotX/cobotx_a450/launch/mycobot_follow.launch
rename to Mercury/mercury_a1/launch/mycobot_follow.launch
index e89b8cc..c592837 100755
--- a/CobotX/cobotx_a450/launch/mycobot_follow.launch
+++ b/Mercury/mercury_a1/launch/mycobot_follow.launch
@@ -1,7 +1,7 @@
-
-
+
+
diff --git a/CobotX/cobotx_a450/launch/simple_gui.launch b/Mercury/mercury_a1/launch/simple_gui.launch
similarity index 63%
rename from CobotX/cobotx_a450/launch/simple_gui.launch
rename to Mercury/mercury_a1/launch/simple_gui.launch
index 612a126..080f2f6 100755
--- a/CobotX/cobotx_a450/launch/simple_gui.launch
+++ b/Mercury/mercury_a1/launch/simple_gui.launch
@@ -3,8 +3,8 @@
-
-
+
+
@@ -14,10 +14,10 @@
-
+
-
-
+
+
diff --git a/CobotX/cobotx_b450/launch/slider_control.launch b/Mercury/mercury_a1/launch/slider_control.launch
similarity index 85%
rename from CobotX/cobotx_b450/launch/slider_control.launch
rename to Mercury/mercury_a1/launch/slider_control.launch
index 63f9e22..ecff424 100755
--- a/CobotX/cobotx_b450/launch/slider_control.launch
+++ b/Mercury/mercury_a1/launch/slider_control.launch
@@ -2,8 +2,8 @@
-
-
+
+
diff --git a/CobotX/cobotx_a450/launch/teleop_keyboard.launch b/Mercury/mercury_a1/launch/teleop_keyboard.launch
similarity index 69%
rename from CobotX/cobotx_a450/launch/teleop_keyboard.launch
rename to Mercury/mercury_a1/launch/teleop_keyboard.launch
index e9149df..ba91066 100755
--- a/CobotX/cobotx_a450/launch/teleop_keyboard.launch
+++ b/Mercury/mercury_a1/launch/teleop_keyboard.launch
@@ -3,8 +3,8 @@
-
-
+
+
@@ -14,10 +14,10 @@
-
+
-
+
diff --git a/CobotX/cobotx_a450/launch/test.launch b/Mercury/mercury_a1/launch/test.launch
similarity index 80%
rename from CobotX/cobotx_a450/launch/test.launch
rename to Mercury/mercury_a1/launch/test.launch
index 791050f..6d14f7f 100755
--- a/CobotX/cobotx_a450/launch/test.launch
+++ b/Mercury/mercury_a1/launch/test.launch
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/CobotX/cobotx_b450/package.xml b/Mercury/mercury_a1/package.xml
similarity index 83%
rename from CobotX/cobotx_b450/package.xml
rename to Mercury/mercury_a1/package.xml
index 481449a..f31bd61 100644
--- a/CobotX/cobotx_b450/package.xml
+++ b/Mercury/mercury_a1/package.xml
@@ -1,8 +1,8 @@
- cobotx_b450
+ mercury_a1
0.3.0
- The cobotx_b450 package
+ The mercury_a1 package
Wangweijian
Wangweijian
@@ -18,9 +18,9 @@
std_msgs
actionlib
mycobot_description
- cobotx_a450_communication
+ mercury_a1_communication
- cobotx_a450_communication
+ mercury_a1_communication
mycobot_description
roscpp
@@ -36,7 +36,7 @@
controller_manager
python-tk
mycobot_description
- cobotx_a450_communication
+ mercury_a1_communication
diff --git a/CobotX/cobotx_a450/scripts/detect_marker.py b/Mercury/mercury_a1/scripts/detect_marker.py
similarity index 100%
rename from CobotX/cobotx_a450/scripts/detect_marker.py
rename to Mercury/mercury_a1/scripts/detect_marker.py
diff --git a/CobotX/cobotx_a450/scripts/follow_and_pump.py b/Mercury/mercury_a1/scripts/follow_and_pump.py
similarity index 100%
rename from CobotX/cobotx_a450/scripts/follow_and_pump.py
rename to Mercury/mercury_a1/scripts/follow_and_pump.py
diff --git a/CobotX/cobotx_a450/scripts/follow_display.py b/Mercury/mercury_a1/scripts/follow_display.py
similarity index 92%
rename from CobotX/cobotx_a450/scripts/follow_display.py
rename to Mercury/mercury_a1/scripts/follow_display.py
index 9bf4f14..353330b 100755
--- a/CobotX/cobotx_a450/scripts/follow_display.py
+++ b/Mercury/mercury_a1/scripts/follow_display.py
@@ -6,24 +6,24 @@ from sensor_msgs.msg import JointState
from std_msgs.msg import Header
from visualization_msgs.msg import Marker
-from pymycobot.cobotx import CobotX
+from pymycobot.mercury import Mercury
def talker():
rospy.init_node("display", anonymous=True)
- print("Try connect real CobotX...")
+ print("Try connect real Mercury...")
port = rospy.get_param("~port", "/dev/ttyAMA1")
baud = rospy.get_param("~baud", 115200)
print("port: {}, baud: {}\n".format(port, baud))
try:
- mc = CobotX(port, baud)
+ mc = Mercury(port, baud)
except Exception as e:
print(e)
print(
"""\
- \rTry connect CobotX failed!
- \rPlease check wether connected with CobotX.
+ \rTry connect Mercury failed!
+ \rPlease check wether connected with Mercury.
\rPlease chckt wether the port or baud is right.
"""
)
diff --git a/CobotX/cobotx_a450/scripts/following_marker.py b/Mercury/mercury_a1/scripts/following_marker.py
similarity index 100%
rename from CobotX/cobotx_a450/scripts/following_marker.py
rename to Mercury/mercury_a1/scripts/following_marker.py
diff --git a/CobotX/cobotx_a450/scripts/listen_real.py b/Mercury/mercury_a1/scripts/listen_real.py
similarity index 97%
rename from CobotX/cobotx_a450/scripts/listen_real.py
rename to Mercury/mercury_a1/scripts/listen_real.py
index abe9f38..056e67e 100755
--- a/CobotX/cobotx_a450/scripts/listen_real.py
+++ b/Mercury/mercury_a1/scripts/listen_real.py
@@ -7,7 +7,7 @@ import math
import rospy
from sensor_msgs.msg import JointState
from std_msgs.msg import Header
-from cobotx_a450_communication.srv import GetAngles
+from mercury_a1_communication.srv import GetAngles
def talker():
diff --git a/CobotX/cobotx_b450/scripts/listen_real_of_topic.py b/Mercury/mercury_a1/scripts/listen_real_of_topic.py
similarity index 87%
rename from CobotX/cobotx_b450/scripts/listen_real_of_topic.py
rename to Mercury/mercury_a1/scripts/listen_real_of_topic.py
index 07272f3..65b042c 100755
--- a/CobotX/cobotx_b450/scripts/listen_real_of_topic.py
+++ b/Mercury/mercury_a1/scripts/listen_real_of_topic.py
@@ -5,7 +5,7 @@ import math
import rospy
from sensor_msgs.msg import JointState
from std_msgs.msg import Header
-from cobotx_a450_communication.msg import CobotXAngles
+from mercury_a1_communication.msg import MercuryAngles
class Listener(object):
@@ -17,14 +17,14 @@ class Listener(object):
# init publisher.初始化发布者
self.pub = rospy.Publisher("joint_states", JointState, queue_size=10)
# init subscriber.初始化订阅者
- self.sub = rospy.Subscriber("myarm/angles_real", CobotXAngles, self.callback)
+ self.sub = rospy.Subscriber("myarm/angles_real", MercuryAngles, self.callback)
rospy.spin()
def callback(self, data):
- """`cobotx/angles_real` subscriber callback method.
+ """`mercury/angles_real` subscriber callback method.
Args:
- data (CobotXAngles): callback argument.
+ data (MercuryAngles): callback argument.
"""
# ini publisher object. 初始化发布者对象
joint_state_send = JointState()
diff --git a/CobotX/cobotx_b450/scripts/simple_gui.py b/Mercury/mercury_a1/scripts/simple_gui.py
similarity index 99%
rename from CobotX/cobotx_b450/scripts/simple_gui.py
rename to Mercury/mercury_a1/scripts/simple_gui.py
index ac79b51..536d2f8 100755
--- a/CobotX/cobotx_b450/scripts/simple_gui.py
+++ b/Mercury/mercury_a1/scripts/simple_gui.py
@@ -4,7 +4,7 @@ try:
import tkinter as tk
except ImportError:
import Tkinter as tk
-from cobotx_a450_communication.srv import GetCoords, SetCoords, GetAngles, SetAngles, GripperStatus
+from mercury_a1_communication.srv import GetCoords, SetCoords, GetAngles, SetAngles, GripperStatus
import rospy
import time
from rospy import ServiceException
@@ -493,7 +493,7 @@ class Window:
def main():
window = tk.Tk()
- window.title("CobotX ros GUI")
+ window.title("Mercury ros GUI")
Window(window).run()
diff --git a/CobotX/cobotx_a450/scripts/slider_control.py b/Mercury/mercury_a1/scripts/slider_control.py
similarity index 84%
rename from CobotX/cobotx_a450/scripts/slider_control.py
rename to Mercury/mercury_a1/scripts/slider_control.py
index 3e328dc..6955ab2 100755
--- a/CobotX/cobotx_a450/scripts/slider_control.py
+++ b/Mercury/mercury_a1/scripts/slider_control.py
@@ -12,7 +12,7 @@ import math
import rospy
from sensor_msgs.msg import JointState
-from pymycobot.cobotx import CobotX
+from pymycobot.mercury import Mercury
mc = None
@@ -20,7 +20,9 @@ mc = None
def callback(data):
# rospy.loginfo(rospy.get_caller_id() + "%s", data.position)
- print(data.position)
+ # print(data.position)
+ rounded_data_tuple = tuple(round(value, 2) for value in data.position)
+ rospy.loginfo(rospy.get_caller_id() + "%s", rounded_data_tuple)
data_list = []
for index, value in enumerate(data.position):
radians_to_angles = math.degrees(value)
@@ -39,7 +41,7 @@ def listener():
port = rospy.get_param("~port", "/dev/ttyAMA1")
baud = rospy.get_param("~baud", 115200)
print(port, baud)
- mc = CobotX(port, baud)
+ mc = Mercury(port, baud)
# spin() simply keeps python from exiting until this node is stopped
# spin()只是阻止python退出,直到该节点停止
diff --git a/CobotX/cobotx_b450/scripts/teleop_keyboard.py b/Mercury/mercury_a1/scripts/teleop_keyboard.py
similarity index 97%
rename from CobotX/cobotx_b450/scripts/teleop_keyboard.py
rename to Mercury/mercury_a1/scripts/teleop_keyboard.py
index c61fd36..36c7167 100755
--- a/CobotX/cobotx_b450/scripts/teleop_keyboard.py
+++ b/Mercury/mercury_a1/scripts/teleop_keyboard.py
@@ -1,18 +1,16 @@
#!/usr/bin/env python3
from __future__ import print_function
-from cobotx_a450_communication.srv import GetCoords, SetCoords, GetAngles, SetAngles, GripperStatus
+from mercury_a1_communication.srv import GetCoords, SetCoords, GetAngles, SetAngles, GripperStatus
import rospy
import sys
-import select
import termios
import tty
import time
-import roslib
# Terminal output prompt information. 终端输出提示信息
msg = """\
-CobotX Teleop Keyboard Controller
+Mercury Teleop Keyboard Controller
---------------------------
Movimg options(control coordinations [x,y,z,rx,ry,rz]):
w(x+)
diff --git a/CobotX/cobotx_a450/src/camera_display.cpp b/Mercury/mercury_a1/src/camera_display.cpp
similarity index 100%
rename from CobotX/cobotx_a450/src/camera_display.cpp
rename to Mercury/mercury_a1/src/camera_display.cpp
diff --git a/CobotX/cobotx_a450/src/opencv_camera.cpp b/Mercury/mercury_a1/src/opencv_camera.cpp
similarity index 100%
rename from CobotX/cobotx_a450/src/opencv_camera.cpp
rename to Mercury/mercury_a1/src/opencv_camera.cpp
diff --git a/CobotX/cobotx_a450_communication/CMakeLists.txt b/Mercury/mercury_a1_communication/CMakeLists.txt
similarity index 96%
rename from CobotX/cobotx_a450_communication/CMakeLists.txt
rename to Mercury/mercury_a1_communication/CMakeLists.txt
index 0662b54..e828bbe 100755
--- a/CobotX/cobotx_a450_communication/CMakeLists.txt
+++ b/Mercury/mercury_a1_communication/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.8.3)
-project(cobotx_a450_communication)
+project(mercury_a1_communication)
add_compile_options(-std=c++11)
## Compile as C++11, supported in ROS Kinetic and newer
@@ -50,12 +50,12 @@ find_package(catkin REQUIRED COMPONENTS
## Generate messages in the 'msg' folder
add_message_files(FILES
- CobotXAngles.msg
- CobotXCoords.msg
- CobotXSetAngles.msg
- CobotXSetCoords.msg
- CobotXGripperStatus.msg
- CobotXPumpStatus.msg
+ MercuryAngles.msg
+ MercuryCoords.msg
+ MercurySetAngles.msg
+ MercurySetCoords.msg
+ MercuryGripperStatus.msg
+ MercuryPumpStatus.msg
)
## Generate services in the 'srv' folder
@@ -169,8 +169,8 @@ include_directories(
## Mark executable scripts (Python etc.) for installation
## in contrast to setup.py, you can choose the destination
catkin_install_python(PROGRAMS
- scripts/cobotx_services.py
- scripts/cobotx_topics.py
+ scripts/mercury_services.py
+ scripts/mercury_topics.py
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
)
diff --git a/CobotX/cobotx_a450_communication/LICENSE b/Mercury/mercury_a1_communication/LICENSE
similarity index 100%
rename from CobotX/cobotx_a450_communication/LICENSE
rename to Mercury/mercury_a1_communication/LICENSE
diff --git a/CobotX/cobotx_a450_communication/launch/communication_jsnn.launch b/Mercury/mercury_a1_communication/launch/communication_jsnn.launch
similarity index 100%
rename from CobotX/cobotx_a450_communication/launch/communication_jsnn.launch
rename to Mercury/mercury_a1_communication/launch/communication_jsnn.launch
diff --git a/CobotX/cobotx_a450_communication/launch/communication_seeed.launch b/Mercury/mercury_a1_communication/launch/communication_seeed.launch
similarity index 100%
rename from CobotX/cobotx_a450_communication/launch/communication_seeed.launch
rename to Mercury/mercury_a1_communication/launch/communication_seeed.launch
diff --git a/CobotX/cobotx_a450_communication/launch/communication_service.launch b/Mercury/mercury_a1_communication/launch/communication_service.launch
similarity index 77%
rename from CobotX/cobotx_a450_communication/launch/communication_service.launch
rename to Mercury/mercury_a1_communication/launch/communication_service.launch
index bec629d..f27f3ca 100755
--- a/CobotX/cobotx_a450_communication/launch/communication_service.launch
+++ b/Mercury/mercury_a1_communication/launch/communication_service.launch
@@ -6,7 +6,7 @@
-
+
diff --git a/CobotX/cobotx_a450_communication/launch/communication_topic.launch b/Mercury/mercury_a1_communication/launch/communication_topic.launch
similarity index 77%
rename from CobotX/cobotx_a450_communication/launch/communication_topic.launch
rename to Mercury/mercury_a1_communication/launch/communication_topic.launch
index 5889f17..9dde269 100755
--- a/CobotX/cobotx_a450_communication/launch/communication_topic.launch
+++ b/Mercury/mercury_a1_communication/launch/communication_topic.launch
@@ -4,7 +4,7 @@
-
+
diff --git a/CobotX/cobotx_a450_communication/launch/communication_topic_pi.launch b/Mercury/mercury_a1_communication/launch/communication_topic_pi.launch
similarity index 77%
rename from CobotX/cobotx_a450_communication/launch/communication_topic_pi.launch
rename to Mercury/mercury_a1_communication/launch/communication_topic_pi.launch
index a7c5a6d..cc88762 100755
--- a/CobotX/cobotx_a450_communication/launch/communication_topic_pi.launch
+++ b/Mercury/mercury_a1_communication/launch/communication_topic_pi.launch
@@ -4,7 +4,7 @@
-
+
diff --git a/CobotX/cobotx_a450_communication/msg/CobotXAngles.msg b/Mercury/mercury_a1_communication/msg/MercuryAngles.msg
similarity index 100%
rename from CobotX/cobotx_a450_communication/msg/CobotXAngles.msg
rename to Mercury/mercury_a1_communication/msg/MercuryAngles.msg
diff --git a/CobotX/cobotx_a450_communication/msg/CobotXCoords.msg b/Mercury/mercury_a1_communication/msg/MercuryCoords.msg
similarity index 100%
rename from CobotX/cobotx_a450_communication/msg/CobotXCoords.msg
rename to Mercury/mercury_a1_communication/msg/MercuryCoords.msg
diff --git a/CobotX/cobotx_a450_communication/msg/CobotXGripperStatus.msg b/Mercury/mercury_a1_communication/msg/MercuryGripperStatus.msg
similarity index 100%
rename from CobotX/cobotx_a450_communication/msg/CobotXGripperStatus.msg
rename to Mercury/mercury_a1_communication/msg/MercuryGripperStatus.msg
diff --git a/CobotX/cobotx_a450_communication/msg/CobotXPumpStatus.msg b/Mercury/mercury_a1_communication/msg/MercuryPumpStatus.msg
similarity index 100%
rename from CobotX/cobotx_a450_communication/msg/CobotXPumpStatus.msg
rename to Mercury/mercury_a1_communication/msg/MercuryPumpStatus.msg
diff --git a/CobotX/cobotx_a450_communication/msg/CobotXSetAngles.msg b/Mercury/mercury_a1_communication/msg/MercurySetAngles.msg
similarity index 100%
rename from CobotX/cobotx_a450_communication/msg/CobotXSetAngles.msg
rename to Mercury/mercury_a1_communication/msg/MercurySetAngles.msg
diff --git a/CobotX/cobotx_a450_communication/msg/CobotXSetCoords.msg b/Mercury/mercury_a1_communication/msg/MercurySetCoords.msg
similarity index 100%
rename from CobotX/cobotx_a450_communication/msg/CobotXSetCoords.msg
rename to Mercury/mercury_a1_communication/msg/MercurySetCoords.msg
diff --git a/CobotX/cobotx_a450_communication/package.xml b/Mercury/mercury_a1_communication/package.xml
similarity index 96%
rename from CobotX/cobotx_a450_communication/package.xml
rename to Mercury/mercury_a1_communication/package.xml
index 6f88f5a..c6f37da 100755
--- a/CobotX/cobotx_a450_communication/package.xml
+++ b/Mercury/mercury_a1_communication/package.xml
@@ -1,8 +1,8 @@
- cobotx_a450_communication
+ mercury_a1_communication
0.1.0
- The cobotx_a450_communication package
+ The mercury_a1_communication package
diff --git a/CobotX/cobotx_a450_communication/scripts/cobotx_services.py b/Mercury/mercury_a1_communication/scripts/mercury_services.py
similarity index 89%
rename from CobotX/cobotx_a450_communication/scripts/cobotx_services.py
rename to Mercury/mercury_a1_communication/scripts/mercury_services.py
index ac43149..d9aac9e 100755
--- a/CobotX/cobotx_a450_communication/scripts/cobotx_services.py
+++ b/Mercury/mercury_a1_communication/scripts/mercury_services.py
@@ -4,9 +4,9 @@ import time
import rospy
import os
import fcntl
-from cobotx_a450_communication.srv import *
+from mercury_a1_communication.srv import *
-from pymycobot.cobotx import CobotX
+from pymycobot.mercury import Mercury
mc = None
@@ -51,12 +51,12 @@ def release(lock_file_fd):
def create_handle():
global mc
- rospy.init_node("cobotx")
+ rospy.init_node("mercury")
rospy.loginfo("start ...")
port = rospy.get_param("~port")
baud = rospy.get_param("~baud")
rospy.loginfo("%s,%s" % (port, baud))
- mc = CobotX(port, baud)
+ mc = Mercury(port, baud)
def create_services():
@@ -84,7 +84,7 @@ def set_angles(req):
sp = req.speed
if mc:
- lock = acquire("/tmp/cobotx_lock")
+ lock = acquire("/tmp/mercury_lock")
mc.send_angles(angles, sp)
release(lock)
@@ -94,7 +94,7 @@ def set_angles(req):
def get_angles(req):
"""get angles,获取角度"""
if mc:
- lock = acquire("/tmp/cobotx_lock")
+ lock = acquire("/tmp/mercury_lock")
angles = mc.get_angles()
release(lock)
return GetAnglesResponse(*angles)
@@ -113,7 +113,7 @@ def set_coords(req):
mod = req.model
if mc:
- lock = acquire("/tmp/cobotx_lock")
+ lock = acquire("/tmp/mercury_lock")
mc.send_coords(coords, sp, mod)
release(lock)
@@ -122,7 +122,7 @@ def set_coords(req):
def get_coords(req):
if mc:
- lock = acquire("/tmp/cobotx_lock")
+ lock = acquire("/tmp/mercury_lock")
coords = mc.get_coords()
release(lock)
return GetCoordsResponse(*coords)
@@ -132,7 +132,7 @@ def switch_status(req):
"""Gripper switch status"""
"""夹爪开关状态"""
if mc:
- lock = acquire("/tmp/cobotx_lock")
+ lock = acquire("/tmp/mercury_lock")
if req.Status:
mc.set_gripper_state(0, 80)
else:
@@ -144,7 +144,7 @@ def switch_status(req):
def toggle_pump(req):
if mc:
- lock = acquire("/tmp/cobotx_lock")
+ lock = acquire("/tmp/mercury_lock")
if req.Status:
mc.set_basic_output(req.Pin1, 0)
mc.set_basic_output(req.Pin2, 0)
@@ -158,7 +158,7 @@ def toggle_pump(req):
robot_msg = """
-Cobotx Status
+Mercury Status
--------------------------------
Joint Limit:
joint 1: -165 ~ +165
@@ -186,13 +186,13 @@ def output_robot_message():
atom_version = "unknown"
if mc:
- lock = acquire("/tmp/cobotx_lock")
+ lock = acquire("/tmp/mercury_lock")
cn = mc.is_controller_connected()
release(lock)
if cn == 1:
connect_status = True
time.sleep(0.1)
- lock = acquire("/tmp/cobotx_lock")
+ lock = acquire("/tmp/mercury_lock")
si = mc.is_all_servo_enable()
release(lock)
if si == 1:
diff --git a/CobotX/cobotx_a450_communication/scripts/cobotx_topics.py b/Mercury/mercury_a1_communication/scripts/mercury_topics.py
similarity index 85%
rename from CobotX/cobotx_a450_communication/scripts/cobotx_topics.py
rename to Mercury/mercury_a1_communication/scripts/mercury_topics.py
index 79a1d62..10689a0 100755
--- a/CobotX/cobotx_a450_communication/scripts/cobotx_topics.py
+++ b/Mercury/mercury_a1_communication/scripts/mercury_topics.py
@@ -8,16 +8,16 @@ import threading
import rospy
-from cobotx_a450_communication.msg import (
- CobotXAngles,
- CobotXCoords,
- CobotXSetAngles,
- CobotXSetCoords,
- CobotXGripperStatus,
- CobotXPumpStatus,
+from mercury_a1_communication.msg import (
+ MercuryAngles,
+ MercuryCoords,
+ MercurySetAngles,
+ MercurySetCoords,
+ MercuryGripperStatus,
+ MercuryPumpStatus,
)
-from pymycobot.cobotx import CobotX
+from pymycobot.mercury import Mercury
class Watcher:
@@ -64,11 +64,11 @@ class Watcher:
pass
-class CobotXTopics(object):
+class MercuryTopics(object):
def __init__(self):
- super(CobotXTopics, self).__init__()
+ super(MercuryTopics, self).__init__()
- rospy.init_node("cobotx_topics")
+ rospy.init_node("mercury_topics")
rospy.loginfo("start ...")
# port = rospy.get_param("~port", os.popen("ls /dev/ttyAMA*").readline()[:-1])
port = rospy.get_param("~port", "/dev/ttyAMA1")
@@ -76,7 +76,7 @@ class CobotXTopics(object):
port = rospy.get_param("~port", os.popen("ls /dev/ttyACM*").readline()[:-1])
baud = rospy.get_param("~baud", 115200)
rospy.loginfo("%s,%s" % (port, baud))
- self.mc = CobotX(port, baud)
+ self.mc = Mercury(port, baud)
self.lock = threading.Lock()
def start(self):
@@ -110,9 +110,9 @@ class CobotXTopics(object):
def pub_real_angles(self):
"""Publish real angle"""
"""发布真实角度"""
- pub = rospy.Publisher("cobotx/angles_real",
- CobotXAngles, queue_size=5)
- ma = CobotXAngles()
+ pub = rospy.Publisher("mercury/angles_real",
+ MercuryAngles, queue_size=5)
+ ma = MercuryAngles()
while not rospy.is_shutdown():
self.lock.acquire()
angles = self.mc.get_angles()
@@ -131,9 +131,9 @@ class CobotXTopics(object):
def pub_real_coords(self):
"""publish real coordinates"""
"""发布真实坐标"""
- pub = rospy.Publisher("cobotx/coords_real",
- CobotXCoords, queue_size=5)
- ma = CobotXCoords()
+ pub = rospy.Publisher("mercury/coords_real",
+ MercuryCoords, queue_size=5)
+ ma = MercuryCoords()
while not rospy.is_shutdown():
self.lock.acquire()
@@ -166,7 +166,7 @@ class CobotXTopics(object):
self.mc.send_angles(angles, sp)
sub = rospy.Subscriber(
- "cobotx/angles_goal", CobotXSetAngles, callback=callback
+ "mercury/angles_goal", MercurySetAngles, callback=callback
)
rospy.spin()
@@ -178,7 +178,7 @@ class CobotXTopics(object):
self.mc.send_coords(angles, sp, model)
sub = rospy.Subscriber(
- "cobotx/coords_goal", CobotXSetCoords, callback=callback
+ "mercury/coords_goal", MercurySetCoords, callback=callback
)
rospy.spin()
@@ -192,7 +192,7 @@ class CobotXTopics(object):
self.mc.set_gripper_state(1, 80)
sub = rospy.Subscriber(
- "cobotx/gripper_status", CobotXGripperStatus, callback=callback
+ "mercury/gripper_status", MercuryGripperStatus, callback=callback
)
rospy.spin()
@@ -206,14 +206,14 @@ class CobotXTopics(object):
self.mc.set_basic_output(data.Pin2, 1)
sub = rospy.Subscriber(
- "cobotx/pump_status", CobotXPumpStatus, callback=callback
+ "mercury/pump_status", MercuryPumpStatus, callback=callback
)
rospy.spin()
if __name__ == "__main__":
Watcher()
- mc_topics = CobotXTopics()
+ mc_topics = MercuryTopics()
mc_topics.start()
# while True:
# mc_topics.pub_real_coords()
diff --git a/CobotX/cobotx_a450_communication/scripts/cobotx_topics_jsnn.py b/Mercury/mercury_a1_communication/scripts/mercury_topics_jsnn.py
similarity index 100%
rename from CobotX/cobotx_a450_communication/scripts/cobotx_topics_jsnn.py
rename to Mercury/mercury_a1_communication/scripts/mercury_topics_jsnn.py
diff --git a/CobotX/cobotx_a450_communication/scripts/cobotx_topics_pi.py b/Mercury/mercury_a1_communication/scripts/mercury_topics_pi.py
similarity index 85%
rename from CobotX/cobotx_a450_communication/scripts/cobotx_topics_pi.py
rename to Mercury/mercury_a1_communication/scripts/mercury_topics_pi.py
index eb245c6..bb09637 100755
--- a/CobotX/cobotx_a450_communication/scripts/cobotx_topics_pi.py
+++ b/Mercury/mercury_a1_communication/scripts/mercury_topics_pi.py
@@ -8,17 +8,17 @@ import threading
import rospy
-from cobotx_a450_communication.msg import (
- CobotXAngles,
- CobotXCoords,
- CobotXSetAngles,
- CobotXSetCoords,
- CobotXGripperStatus,
- CobotXPumpStatus,
+from mercury_a1_communication.msg import (
+ MercuryAngles,
+ MercuryCoords,
+ MercurySetAngles,
+ MercurySetCoords,
+ MercuryGripperStatus,
+ MercuryPumpStatus,
)
-from pymycobot import CobotX
+from pymycobot.mercury import Mercury
class Watcher:
@@ -66,18 +66,18 @@ class Watcher:
pass
-class CobotXTopics(object):
+class MercuryTopics(object):
def __init__(self):
- super(CobotXTopics, self).__init__()
+ super(MercuryTopics, self).__init__()
- rospy.init_node("cobotx_topics_pi")
+ rospy.init_node("mercury_topics_pi")
rospy.loginfo("start ...")
# problem
# port = rospy.get_param("~port", os.popen("ls /dev/ttyAMA*").readline()[:-1])
port = rospy.get_param("~port", "/dev/ttyAMA1")
baud = rospy.get_param("~baud", 115200)
rospy.loginfo("%s,%s" % (port, baud))
- self.mc = CobotX(port, baud)
+ self.mc = Mercury(port, baud)
self.lock = threading.Lock()
def start(self):
@@ -111,8 +111,8 @@ class CobotXTopics(object):
def pub_real_angles(self):
"""Publish real angle"""
"""发布真实角度"""
- pub = rospy.Publisher("cobotx/angles_real", CobotXAngles, queue_size=5)
- ma = CobotXAngles()
+ pub = rospy.Publisher("mercury/angles_real", MercuryAngles, queue_size=5)
+ ma = MercuryAngles()
while not rospy.is_shutdown():
self.lock.acquire()
angles = self.mc.get_angles()
@@ -131,8 +131,8 @@ class CobotXTopics(object):
def pub_real_coords(self):
"""publish real coordinates"""
"""发布真实坐标"""
- pub = rospy.Publisher("cobotx/coords_real", CobotXCoords, queue_size=5)
- ma = CobotXCoords()
+ pub = rospy.Publisher("mercury/coords_real", MercuryCoords, queue_size=5)
+ ma = MercuryCoords()
while not rospy.is_shutdown():
self.lock.acquire()
@@ -165,7 +165,7 @@ class CobotXTopics(object):
self.mc.send_angles(angles, sp)
sub = rospy.Subscriber(
- "cobotx/angles_goal", CobotXSetAngles, callback=callback
+ "mercury/angles_goal", MercurySetAngles, callback=callback
)
rospy.spin()
@@ -177,7 +177,7 @@ class CobotXTopics(object):
self.mc.send_coords(angles, sp, model)
sub = rospy.Subscriber(
- "cobotx/coords_goal", CobotXSetCoords, callback=callback
+ "mercury/coords_goal", MercurySetCoords, callback=callback
)
rospy.spin()
@@ -191,7 +191,7 @@ class CobotXTopics(object):
self.mc.set_gripper_state(1, 80)
sub = rospy.Subscriber(
- "cobotx/gripper_status", CobotXGripperStatus, callback=callback
+ "mercury/gripper_status", MercuryGripperStatus, callback=callback
)
rospy.spin()
@@ -205,13 +205,13 @@ class CobotXTopics(object):
self.mc.set_basic_output(data.Pin2, 1)
sub = rospy.Subscriber(
- "cobotx/pump_status", CobotXPumpStatus, callback=callback
+ "mercury/pump_status", MercuryPumpStatus, callback=callback
)
rospy.spin()
if __name__ == "__main__":
Watcher()
- mc_topics = CobotXTopics()
+ mc_topics = MercuryTopics()
mc_topics.start()
# while True:
# mc_topics.pub_real_coords()
diff --git a/CobotX/cobotx_a450_communication/scripts/cobotx_topics_seeed.py b/Mercury/mercury_a1_communication/scripts/mercury_topics_seeed.py
similarity index 100%
rename from CobotX/cobotx_a450_communication/scripts/cobotx_topics_seeed.py
rename to Mercury/mercury_a1_communication/scripts/mercury_topics_seeed.py
diff --git a/CobotX/cobotx_a450_communication/srv/GetAngles.srv b/Mercury/mercury_a1_communication/srv/GetAngles.srv
similarity index 100%
rename from CobotX/cobotx_a450_communication/srv/GetAngles.srv
rename to Mercury/mercury_a1_communication/srv/GetAngles.srv
diff --git a/CobotX/cobotx_a450_communication/srv/GetCoords.srv b/Mercury/mercury_a1_communication/srv/GetCoords.srv
similarity index 100%
rename from CobotX/cobotx_a450_communication/srv/GetCoords.srv
rename to Mercury/mercury_a1_communication/srv/GetCoords.srv
diff --git a/CobotX/cobotx_a450_communication/srv/GripperStatus.srv b/Mercury/mercury_a1_communication/srv/GripperStatus.srv
similarity index 100%
rename from CobotX/cobotx_a450_communication/srv/GripperStatus.srv
rename to Mercury/mercury_a1_communication/srv/GripperStatus.srv
diff --git a/CobotX/cobotx_a450_communication/srv/PumpStatus.srv b/Mercury/mercury_a1_communication/srv/PumpStatus.srv
similarity index 100%
rename from CobotX/cobotx_a450_communication/srv/PumpStatus.srv
rename to Mercury/mercury_a1_communication/srv/PumpStatus.srv
diff --git a/CobotX/cobotx_a450_communication/srv/SetAngles.srv b/Mercury/mercury_a1_communication/srv/SetAngles.srv
similarity index 100%
rename from CobotX/cobotx_a450_communication/srv/SetAngles.srv
rename to Mercury/mercury_a1_communication/srv/SetAngles.srv
diff --git a/CobotX/cobotx_a450_communication/srv/SetCoords.srv b/Mercury/mercury_a1_communication/srv/SetCoords.srv
similarity index 100%
rename from CobotX/cobotx_a450_communication/srv/SetCoords.srv
rename to Mercury/mercury_a1_communication/srv/SetCoords.srv
diff --git a/CobotX/cobotx_a450_moveit/.setup_assistant b/Mercury/mercury_a1_moveit/.setup_assistant
similarity index 83%
rename from CobotX/cobotx_a450_moveit/.setup_assistant
rename to Mercury/mercury_a1_moveit/.setup_assistant
index fcbc1d7..643cb76 100644
--- a/CobotX/cobotx_a450_moveit/.setup_assistant
+++ b/Mercury/mercury_a1_moveit/.setup_assistant
@@ -1,7 +1,7 @@
moveit_setup_assistant_config:
URDF:
package: mycobot_description
- relative_path: urdf/cobotx_a450/cobotx_a450.urdf
+ relative_path: urdf/mercury_a1/mercury_a1.urdf
xacro_args: "--inorder "
SRDF:
relative_path: config/firefighter.srdf
diff --git a/CobotX/cobotx_b450_moveit/CMakeLists.txt b/Mercury/mercury_a1_moveit/CMakeLists.txt
similarity index 90%
rename from CobotX/cobotx_b450_moveit/CMakeLists.txt
rename to Mercury/mercury_a1_moveit/CMakeLists.txt
index a6336e3..db62871 100644
--- a/CobotX/cobotx_b450_moveit/CMakeLists.txt
+++ b/Mercury/mercury_a1_moveit/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.1.3)
-project(cobotx_b450_moveit)
+project(mercury_a1_moveit)
find_package(catkin REQUIRED)
diff --git a/CobotX/cobotx_a450_moveit/LICENSE b/Mercury/mercury_a1_moveit/LICENSE
similarity index 100%
rename from CobotX/cobotx_a450_moveit/LICENSE
rename to Mercury/mercury_a1_moveit/LICENSE
diff --git a/CobotX/cobotx_a450_moveit/config/cartesian_limits.yaml b/Mercury/mercury_a1_moveit/config/cartesian_limits.yaml
similarity index 100%
rename from CobotX/cobotx_a450_moveit/config/cartesian_limits.yaml
rename to Mercury/mercury_a1_moveit/config/cartesian_limits.yaml
diff --git a/CobotX/cobotx_a450_moveit/config/chomp_planning.yaml b/Mercury/mercury_a1_moveit/config/chomp_planning.yaml
similarity index 100%
rename from CobotX/cobotx_a450_moveit/config/chomp_planning.yaml
rename to Mercury/mercury_a1_moveit/config/chomp_planning.yaml
diff --git a/CobotX/cobotx_a450_moveit/config/fake_controllers.yaml b/Mercury/mercury_a1_moveit/config/fake_controllers.yaml
similarity index 100%
rename from CobotX/cobotx_a450_moveit/config/fake_controllers.yaml
rename to Mercury/mercury_a1_moveit/config/fake_controllers.yaml
diff --git a/CobotX/cobotx_a450_moveit/config/firefighter.srdf b/Mercury/mercury_a1_moveit/config/firefighter.srdf
similarity index 100%
rename from CobotX/cobotx_a450_moveit/config/firefighter.srdf
rename to Mercury/mercury_a1_moveit/config/firefighter.srdf
diff --git a/CobotX/cobotx_a450_moveit/config/gazebo_controllers.yaml b/Mercury/mercury_a1_moveit/config/gazebo_controllers.yaml
similarity index 100%
rename from CobotX/cobotx_a450_moveit/config/gazebo_controllers.yaml
rename to Mercury/mercury_a1_moveit/config/gazebo_controllers.yaml
diff --git a/CobotX/cobotx_a450_moveit/config/joint_limits.yaml b/Mercury/mercury_a1_moveit/config/joint_limits.yaml
similarity index 100%
rename from CobotX/cobotx_a450_moveit/config/joint_limits.yaml
rename to Mercury/mercury_a1_moveit/config/joint_limits.yaml
diff --git a/CobotX/cobotx_a450_moveit/config/kinematics.yaml b/Mercury/mercury_a1_moveit/config/kinematics.yaml
similarity index 100%
rename from CobotX/cobotx_a450_moveit/config/kinematics.yaml
rename to Mercury/mercury_a1_moveit/config/kinematics.yaml
diff --git a/CobotX/cobotx_a450_moveit/config/ompl_planning.yaml b/Mercury/mercury_a1_moveit/config/ompl_planning.yaml
similarity index 100%
rename from CobotX/cobotx_a450_moveit/config/ompl_planning.yaml
rename to Mercury/mercury_a1_moveit/config/ompl_planning.yaml
diff --git a/CobotX/cobotx_a450_moveit/config/ros_controllers.yaml b/Mercury/mercury_a1_moveit/config/ros_controllers.yaml
similarity index 100%
rename from CobotX/cobotx_a450_moveit/config/ros_controllers.yaml
rename to Mercury/mercury_a1_moveit/config/ros_controllers.yaml
diff --git a/CobotX/cobotx_a450_moveit/config/sensors_3d.yaml b/Mercury/mercury_a1_moveit/config/sensors_3d.yaml
similarity index 100%
rename from CobotX/cobotx_a450_moveit/config/sensors_3d.yaml
rename to Mercury/mercury_a1_moveit/config/sensors_3d.yaml
diff --git a/CobotX/cobotx_a450_moveit/config/simple_moveit_controllers.yaml b/Mercury/mercury_a1_moveit/config/simple_moveit_controllers.yaml
similarity index 100%
rename from CobotX/cobotx_a450_moveit/config/simple_moveit_controllers.yaml
rename to Mercury/mercury_a1_moveit/config/simple_moveit_controllers.yaml
diff --git a/CobotX/cobotx_a450_moveit/config/stomp_planning.yaml b/Mercury/mercury_a1_moveit/config/stomp_planning.yaml
similarity index 100%
rename from CobotX/cobotx_a450_moveit/config/stomp_planning.yaml
rename to Mercury/mercury_a1_moveit/config/stomp_planning.yaml
diff --git a/CobotX/cobotx_a450_moveit/launch/chomp_planning_pipeline.launch.xml b/Mercury/mercury_a1_moveit/launch/chomp_planning_pipeline.launch.xml
similarity index 92%
rename from CobotX/cobotx_a450_moveit/launch/chomp_planning_pipeline.launch.xml
rename to Mercury/mercury_a1_moveit/launch/chomp_planning_pipeline.launch.xml
index b08127a..557eb19 100644
--- a/CobotX/cobotx_a450_moveit/launch/chomp_planning_pipeline.launch.xml
+++ b/Mercury/mercury_a1_moveit/launch/chomp_planning_pipeline.launch.xml
@@ -17,5 +17,5 @@
-
+
diff --git a/CobotX/cobotx_a450_moveit/launch/default_warehouse_db.launch b/Mercury/mercury_a1_moveit/launch/default_warehouse_db.launch
similarity index 83%
rename from CobotX/cobotx_a450_moveit/launch/default_warehouse_db.launch
rename to Mercury/mercury_a1_moveit/launch/default_warehouse_db.launch
index 1af47f2..0f8641b 100644
--- a/CobotX/cobotx_a450_moveit/launch/default_warehouse_db.launch
+++ b/Mercury/mercury_a1_moveit/launch/default_warehouse_db.launch
@@ -2,7 +2,7 @@
-
+
diff --git a/CobotX/cobotx_a450_moveit/launch/demo.launch b/Mercury/mercury_a1_moveit/launch/demo.launch
similarity index 97%
rename from CobotX/cobotx_a450_moveit/launch/demo.launch
rename to Mercury/mercury_a1_moveit/launch/demo.launch
index cd9b345..81d32e6 100644
--- a/CobotX/cobotx_a450_moveit/launch/demo.launch
+++ b/Mercury/mercury_a1_moveit/launch/demo.launch
@@ -6,7 +6,7 @@
-
+
diff --git a/CobotX/cobotx_a450_moveit/launch/demo_gazebo.launch b/Mercury/mercury_a1_moveit/launch/demo_gazebo.launch
similarity index 100%
rename from CobotX/cobotx_a450_moveit/launch/demo_gazebo.launch
rename to Mercury/mercury_a1_moveit/launch/demo_gazebo.launch
diff --git a/CobotX/cobotx_a450_moveit/launch/fake_moveit_controller_manager.launch.xml b/Mercury/mercury_a1_moveit/launch/fake_moveit_controller_manager.launch.xml
similarity index 82%
rename from CobotX/cobotx_a450_moveit/launch/fake_moveit_controller_manager.launch.xml
rename to Mercury/mercury_a1_moveit/launch/fake_moveit_controller_manager.launch.xml
index f087433..4e54fd2 100644
--- a/CobotX/cobotx_a450_moveit/launch/fake_moveit_controller_manager.launch.xml
+++ b/Mercury/mercury_a1_moveit/launch/fake_moveit_controller_manager.launch.xml
@@ -7,6 +7,6 @@
-
+
diff --git a/CobotX/cobotx_a450_moveit/launch/firefighter_moveit_controller_manager.launch.xml b/Mercury/mercury_a1_moveit/launch/firefighter_moveit_controller_manager.launch.xml
similarity index 85%
rename from CobotX/cobotx_a450_moveit/launch/firefighter_moveit_controller_manager.launch.xml
rename to Mercury/mercury_a1_moveit/launch/firefighter_moveit_controller_manager.launch.xml
index 1f1adb0..bd22e5a 100644
--- a/CobotX/cobotx_a450_moveit/launch/firefighter_moveit_controller_manager.launch.xml
+++ b/Mercury/mercury_a1_moveit/launch/firefighter_moveit_controller_manager.launch.xml
@@ -6,5 +6,5 @@
-
+
diff --git a/CobotX/cobotx_a450_moveit/launch/firefighter_moveit_sensor_manager.launch.xml b/Mercury/mercury_a1_moveit/launch/firefighter_moveit_sensor_manager.launch.xml
similarity index 100%
rename from CobotX/cobotx_a450_moveit/launch/firefighter_moveit_sensor_manager.launch.xml
rename to Mercury/mercury_a1_moveit/launch/firefighter_moveit_sensor_manager.launch.xml
diff --git a/CobotX/cobotx_a450_moveit/launch/gazebo.launch b/Mercury/mercury_a1_moveit/launch/gazebo.launch
similarity index 93%
rename from CobotX/cobotx_a450_moveit/launch/gazebo.launch
rename to Mercury/mercury_a1_moveit/launch/gazebo.launch
index 4ea4ac1..13a158d 100644
--- a/CobotX/cobotx_a450_moveit/launch/gazebo.launch
+++ b/Mercury/mercury_a1_moveit/launch/gazebo.launch
@@ -13,7 +13,7 @@
-
+
@@ -23,7 +23,7 @@
respawn="false" output="screen" />
-
+
diff --git a/CobotX/cobotx_a450_moveit/launch/joystick_control.launch b/Mercury/mercury_a1_moveit/launch/joystick_control.launch
similarity index 100%
rename from CobotX/cobotx_a450_moveit/launch/joystick_control.launch
rename to Mercury/mercury_a1_moveit/launch/joystick_control.launch
diff --git a/Mercury/mercury_a1_moveit/launch/mercury_a1.launch b/Mercury/mercury_a1_moveit/launch/mercury_a1.launch
new file mode 100644
index 0000000..81d32e6
--- /dev/null
+++ b/Mercury/mercury_a1_moveit/launch/mercury_a1.launch
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ [move_group/fake_controller_joint_states]
+
+
+
+ [move_group/fake_controller_joint_states]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/CobotX/cobotx_a450_moveit/launch/move_group.launch b/Mercury/mercury_a1_moveit/launch/move_group.launch
similarity index 100%
rename from CobotX/cobotx_a450_moveit/launch/move_group.launch
rename to Mercury/mercury_a1_moveit/launch/move_group.launch
diff --git a/CobotX/cobotx_a450_moveit/launch/moveit.rviz b/Mercury/mercury_a1_moveit/launch/moveit.rviz
similarity index 100%
rename from CobotX/cobotx_a450_moveit/launch/moveit.rviz
rename to Mercury/mercury_a1_moveit/launch/moveit.rviz
diff --git a/CobotX/cobotx_a450_moveit/launch/moveit_rviz.launch b/Mercury/mercury_a1_moveit/launch/moveit_rviz.launch
similarity index 100%
rename from CobotX/cobotx_a450_moveit/launch/moveit_rviz.launch
rename to Mercury/mercury_a1_moveit/launch/moveit_rviz.launch
diff --git a/CobotX/cobotx_a450_moveit/launch/mycobot_moveit.launch b/Mercury/mercury_a1_moveit/launch/mycobot_moveit.launch
similarity index 87%
rename from CobotX/cobotx_a450_moveit/launch/mycobot_moveit.launch
rename to Mercury/mercury_a1_moveit/launch/mycobot_moveit.launch
index 6e02d30..305a7fb 100644
--- a/CobotX/cobotx_a450_moveit/launch/mycobot_moveit.launch
+++ b/Mercury/mercury_a1_moveit/launch/mycobot_moveit.launch
@@ -5,7 +5,7 @@
-
+
@@ -22,7 +22,7 @@
-
+
@@ -42,7 +42,7 @@
-
+
@@ -51,14 +51,14 @@
-
+
-
+
diff --git a/CobotX/cobotx_b450_moveit/launch/ompl-chomp_planning_pipeline.launch.xml b/Mercury/mercury_a1_moveit/launch/ompl-chomp_planning_pipeline.launch.xml
similarity index 82%
rename from CobotX/cobotx_b450_moveit/launch/ompl-chomp_planning_pipeline.launch.xml
rename to Mercury/mercury_a1_moveit/launch/ompl-chomp_planning_pipeline.launch.xml
index 2866480..57ce7c6 100644
--- a/CobotX/cobotx_b450_moveit/launch/ompl-chomp_planning_pipeline.launch.xml
+++ b/Mercury/mercury_a1_moveit/launch/ompl-chomp_planning_pipeline.launch.xml
@@ -1,6 +1,6 @@
-
+
+
diff --git a/CobotX/cobotx_a450_moveit/launch/ompl_planning_pipeline.launch.xml b/Mercury/mercury_a1_moveit/launch/ompl_planning_pipeline.launch.xml
similarity index 92%
rename from CobotX/cobotx_a450_moveit/launch/ompl_planning_pipeline.launch.xml
rename to Mercury/mercury_a1_moveit/launch/ompl_planning_pipeline.launch.xml
index 8c7b011..d2a8220 100644
--- a/CobotX/cobotx_a450_moveit/launch/ompl_planning_pipeline.launch.xml
+++ b/Mercury/mercury_a1_moveit/launch/ompl_planning_pipeline.launch.xml
@@ -19,6 +19,6 @@
-
+
diff --git a/CobotX/cobotx_a450_moveit/launch/pilz_industrial_motion_planner_planning_pipeline.launch.xml b/Mercury/mercury_a1_moveit/launch/pilz_industrial_motion_planner_planning_pipeline.launch.xml
similarity index 100%
rename from CobotX/cobotx_a450_moveit/launch/pilz_industrial_motion_planner_planning_pipeline.launch.xml
rename to Mercury/mercury_a1_moveit/launch/pilz_industrial_motion_planner_planning_pipeline.launch.xml
diff --git a/CobotX/cobotx_a450_moveit/launch/planning_context.launch b/Mercury/mercury_a1_moveit/launch/planning_context.launch
similarity index 68%
rename from CobotX/cobotx_a450_moveit/launch/planning_context.launch
rename to Mercury/mercury_a1_moveit/launch/planning_context.launch
index 28c831f..b27bf60 100644
--- a/CobotX/cobotx_a450_moveit/launch/planning_context.launch
+++ b/Mercury/mercury_a1_moveit/launch/planning_context.launch
@@ -6,20 +6,20 @@
-
+
-
+
-
-
+
+
-
+
diff --git a/CobotX/cobotx_a450_moveit/launch/planning_pipeline.launch.xml b/Mercury/mercury_a1_moveit/launch/planning_pipeline.launch.xml
similarity index 100%
rename from CobotX/cobotx_a450_moveit/launch/planning_pipeline.launch.xml
rename to Mercury/mercury_a1_moveit/launch/planning_pipeline.launch.xml
diff --git a/CobotX/cobotx_a450_moveit/launch/ros_control_moveit_controller_manager.launch.xml b/Mercury/mercury_a1_moveit/launch/ros_control_moveit_controller_manager.launch.xml
similarity index 100%
rename from CobotX/cobotx_a450_moveit/launch/ros_control_moveit_controller_manager.launch.xml
rename to Mercury/mercury_a1_moveit/launch/ros_control_moveit_controller_manager.launch.xml
diff --git a/CobotX/cobotx_a450_moveit/launch/ros_controllers.launch b/Mercury/mercury_a1_moveit/launch/ros_controllers.launch
similarity index 76%
rename from CobotX/cobotx_a450_moveit/launch/ros_controllers.launch
rename to Mercury/mercury_a1_moveit/launch/ros_controllers.launch
index 4fc6ece..a4ace15 100644
--- a/CobotX/cobotx_a450_moveit/launch/ros_controllers.launch
+++ b/Mercury/mercury_a1_moveit/launch/ros_controllers.launch
@@ -2,7 +2,7 @@
-
+
-
+
diff --git a/CobotX/cobotx_b450_moveit/launch/sensor_manager.launch.xml b/Mercury/mercury_a1_moveit/launch/sensor_manager.launch.xml
similarity index 88%
rename from CobotX/cobotx_b450_moveit/launch/sensor_manager.launch.xml
rename to Mercury/mercury_a1_moveit/launch/sensor_manager.launch.xml
index 9ac3116..ec407ec 100644
--- a/CobotX/cobotx_b450_moveit/launch/sensor_manager.launch.xml
+++ b/Mercury/mercury_a1_moveit/launch/sensor_manager.launch.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/CobotX/cobotx_b450_moveit/launch/setup_assistant.launch b/Mercury/mercury_a1_moveit/launch/setup_assistant.launch
similarity index 91%
rename from CobotX/cobotx_b450_moveit/launch/setup_assistant.launch
rename to Mercury/mercury_a1_moveit/launch/setup_assistant.launch
index c00a0f2..4ca3cdc 100644
--- a/CobotX/cobotx_b450_moveit/launch/setup_assistant.launch
+++ b/Mercury/mercury_a1_moveit/launch/setup_assistant.launch
@@ -8,7 +8,7 @@
diff --git a/CobotX/cobotx_b450_moveit/launch/simple_moveit_controller_manager.launch.xml b/Mercury/mercury_a1_moveit/launch/simple_moveit_controller_manager.launch.xml
similarity index 62%
rename from CobotX/cobotx_b450_moveit/launch/simple_moveit_controller_manager.launch.xml
rename to Mercury/mercury_a1_moveit/launch/simple_moveit_controller_manager.launch.xml
index 32d612f..182a49b 100644
--- a/CobotX/cobotx_b450_moveit/launch/simple_moveit_controller_manager.launch.xml
+++ b/Mercury/mercury_a1_moveit/launch/simple_moveit_controller_manager.launch.xml
@@ -3,6 +3,6 @@
-
-
+
+
diff --git a/CobotX/cobotx_b450_moveit/launch/stomp_planning_pipeline.launch.xml b/Mercury/mercury_a1_moveit/launch/stomp_planning_pipeline.launch.xml
similarity index 92%
rename from CobotX/cobotx_b450_moveit/launch/stomp_planning_pipeline.launch.xml
rename to Mercury/mercury_a1_moveit/launch/stomp_planning_pipeline.launch.xml
index 0db0b65..0524145 100644
--- a/CobotX/cobotx_b450_moveit/launch/stomp_planning_pipeline.launch.xml
+++ b/Mercury/mercury_a1_moveit/launch/stomp_planning_pipeline.launch.xml
@@ -19,5 +19,5 @@
-
+
diff --git a/CobotX/cobotx_a450_moveit/launch/trajectory_execution.launch.xml b/Mercury/mercury_a1_moveit/launch/trajectory_execution.launch.xml
similarity index 100%
rename from CobotX/cobotx_a450_moveit/launch/trajectory_execution.launch.xml
rename to Mercury/mercury_a1_moveit/launch/trajectory_execution.launch.xml
diff --git a/CobotX/cobotx_a450_moveit/launch/warehouse.launch b/Mercury/mercury_a1_moveit/launch/warehouse.launch
similarity index 100%
rename from CobotX/cobotx_a450_moveit/launch/warehouse.launch
rename to Mercury/mercury_a1_moveit/launch/warehouse.launch
diff --git a/CobotX/cobotx_a450_moveit/launch/warehouse_settings.launch.xml b/Mercury/mercury_a1_moveit/launch/warehouse_settings.launch.xml
similarity index 100%
rename from CobotX/cobotx_a450_moveit/launch/warehouse_settings.launch.xml
rename to Mercury/mercury_a1_moveit/launch/warehouse_settings.launch.xml
diff --git a/CobotX/cobotx_a450_moveit/package.xml b/Mercury/mercury_a1_moveit/package.xml
similarity index 98%
rename from CobotX/cobotx_a450_moveit/package.xml
rename to Mercury/mercury_a1_moveit/package.xml
index 5683424..6eb09c5 100644
--- a/CobotX/cobotx_a450_moveit/package.xml
+++ b/Mercury/mercury_a1_moveit/package.xml
@@ -1,6 +1,6 @@
- cobotx_a450_moveit
+ mercury_a1_moveit
0.3.0
An automatically generated package with all the configuration and launch files for using the firefighter with the MoveIt Motion Planning Framework
diff --git a/CobotX/cobotx_a450_moveit/scripts/obstacle_avoidance_demo.py b/Mercury/mercury_a1_moveit/scripts/obstacle_avoidance_demo.py
similarity index 100%
rename from CobotX/cobotx_a450_moveit/scripts/obstacle_avoidance_demo.py
rename to Mercury/mercury_a1_moveit/scripts/obstacle_avoidance_demo.py
diff --git a/CobotX/cobotx_a450_moveit/scripts/sync_plan.py b/Mercury/mercury_a1_moveit/scripts/sync_plan.py
similarity index 80%
rename from CobotX/cobotx_a450_moveit/scripts/sync_plan.py
rename to Mercury/mercury_a1_moveit/scripts/sync_plan.py
index 70e880d..5dc6af2 100755
--- a/CobotX/cobotx_a450_moveit/scripts/sync_plan.py
+++ b/Mercury/mercury_a1_moveit/scripts/sync_plan.py
@@ -13,7 +13,7 @@ import math
import rospy
from sensor_msgs.msg import JointState
-from pymycobot.cobotx import CobotX
+from pymycobot.mercury import Mercury
mc = None
@@ -21,10 +21,12 @@ mc = None
def callback(data):
# rospy.loginfo(rospy.get_caller_id() + "%s", data.position)
- print(data.position)
+ # print(data.position)
+ rounded_data_tuple = tuple(round(value, 2) for value in data.position)
+ rospy.loginfo(rospy.get_caller_id() + "%s", rounded_data_tuple)
data_list = []
for index, value in enumerate(data.position):
- radians_to_angles = math.degrees(value)
+ radians_to_angles = round(math.degrees(value), 2)
data_list.append(radians_to_angles)
# mc.send_radians(data_list, 80)
@@ -40,7 +42,7 @@ def listener():
port = rospy.get_param("~port", "/dev/ttyAMA1")
baud = rospy.get_param("~baud", 115200)
print(port, baud)
- mc = CobotX(port, baud)
+ mc = Mercury(port, baud)
# spin() simply keeps python from exiting until this node is stopped
# spin()只是阻止python退出,直到该节点停止
diff --git a/CobotX/cobotx_b450/CMakeLists.txt b/Mercury/mercury_b1/CMakeLists.txt
similarity index 98%
rename from CobotX/cobotx_b450/CMakeLists.txt
rename to Mercury/mercury_b1/CMakeLists.txt
index 1fc650b..6db1aae 100644
--- a/CobotX/cobotx_b450/CMakeLists.txt
+++ b/Mercury/mercury_b1/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.8.3)
-project(cobotx_b450)
+project(mercury_b1)
add_compile_options(-std=c++11)
## Find catkin and any catkin packages
diff --git a/CobotX/cobotx_b450/LICENSE b/Mercury/mercury_b1/LICENSE
similarity index 100%
rename from CobotX/cobotx_b450/LICENSE
rename to Mercury/mercury_b1/LICENSE
diff --git a/CobotX/cobotx_b450/config/cobotx_b450.rviz b/Mercury/mercury_b1/config/mercury_b1.rviz
similarity index 100%
rename from CobotX/cobotx_b450/config/cobotx_b450.rviz
rename to Mercury/mercury_b1/config/mercury_b1.rviz
diff --git a/CobotX/cobotx_b450/launch/cobotx_b450_follow.launch b/Mercury/mercury_b1/launch/mercury_b1_follow.launch
similarity index 74%
rename from CobotX/cobotx_b450/launch/cobotx_b450_follow.launch
rename to Mercury/mercury_b1/launch/mercury_b1_follow.launch
index caed994..a8bd561 100755
--- a/CobotX/cobotx_b450/launch/cobotx_b450_follow.launch
+++ b/Mercury/mercury_b1/launch/mercury_b1_follow.launch
@@ -1,7 +1,7 @@
-
-
+
+
diff --git a/CobotX/cobotx_b450/launch/simple_gui.launch b/Mercury/mercury_b1/launch/simple_gui.launch
similarity index 63%
rename from CobotX/cobotx_b450/launch/simple_gui.launch
rename to Mercury/mercury_b1/launch/simple_gui.launch
index 612a126..080f2f6 100755
--- a/CobotX/cobotx_b450/launch/simple_gui.launch
+++ b/Mercury/mercury_b1/launch/simple_gui.launch
@@ -3,8 +3,8 @@
-
-
+
+
@@ -14,10 +14,10 @@
-
+
-
-
+
+
diff --git a/CobotX/cobotx_a450/launch/slider_control.launch b/Mercury/mercury_b1/launch/slider_control.launch
similarity index 85%
rename from CobotX/cobotx_a450/launch/slider_control.launch
rename to Mercury/mercury_b1/launch/slider_control.launch
index 8bf7196..4b3a3e1 100755
--- a/CobotX/cobotx_a450/launch/slider_control.launch
+++ b/Mercury/mercury_b1/launch/slider_control.launch
@@ -2,8 +2,8 @@
-
-
+
+
diff --git a/CobotX/cobotx_b450/launch/teleop_keyboard.launch b/Mercury/mercury_b1/launch/teleop_keyboard.launch
similarity index 69%
rename from CobotX/cobotx_b450/launch/teleop_keyboard.launch
rename to Mercury/mercury_b1/launch/teleop_keyboard.launch
index e9149df..ba91066 100755
--- a/CobotX/cobotx_b450/launch/teleop_keyboard.launch
+++ b/Mercury/mercury_b1/launch/teleop_keyboard.launch
@@ -3,8 +3,8 @@
-
-
+
+
@@ -14,10 +14,10 @@
-
+
-
+
diff --git a/CobotX/cobotx_b450/launch/test.launch b/Mercury/mercury_b1/launch/test.launch
similarity index 80%
rename from CobotX/cobotx_b450/launch/test.launch
rename to Mercury/mercury_b1/launch/test.launch
index 9191e0a..e7a842e 100755
--- a/CobotX/cobotx_b450/launch/test.launch
+++ b/Mercury/mercury_b1/launch/test.launch
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/CobotX/cobotx_a450/package.xml b/Mercury/mercury_b1/package.xml
similarity index 83%
rename from CobotX/cobotx_a450/package.xml
rename to Mercury/mercury_b1/package.xml
index d2a34ab..1944a56 100644
--- a/CobotX/cobotx_a450/package.xml
+++ b/Mercury/mercury_b1/package.xml
@@ -1,8 +1,8 @@
- cobotx_a450
+ mercury_b1
0.3.0
- The cobotx_a450 package
+ The mercury_b1 package
Wangweijian
Wangweijian
@@ -18,9 +18,9 @@
std_msgs
actionlib
mycobot_description
- cobotx_a450_communication
+ mercury_a1_communication
- cobotx_a450_communication
+ mercury_a1_communication
mycobot_description
roscpp
@@ -36,7 +36,7 @@
controller_manager
python-tk
mycobot_description
- cobotx_a450_communication
+ mercury_a1_communication
diff --git a/CobotX/cobotx_b450/scripts/follow_display.py b/Mercury/mercury_b1/scripts/follow_display.py
similarity index 94%
rename from CobotX/cobotx_b450/scripts/follow_display.py
rename to Mercury/mercury_b1/scripts/follow_display.py
index 1dcb618..3ef67df 100755
--- a/CobotX/cobotx_b450/scripts/follow_display.py
+++ b/Mercury/mercury_b1/scripts/follow_display.py
@@ -6,13 +6,13 @@ from sensor_msgs.msg import JointState
from std_msgs.msg import Header
from visualization_msgs.msg import Marker
-from pymycobot.cobotx import CobotX
+from pymycobot.mercury import Mercury
def talker():
rospy.init_node("display", anonymous=True)
- print("Try connect real CobotX...")
+ print("Try connect real Mercury...")
port1 = rospy.get_param("~port1", "/dev/ttyS0")
port2 = rospy.get_param("~port2", "/dev/ttyTHS1")
baud = rospy.get_param("~baud", 115200)
@@ -20,16 +20,16 @@ def talker():
print("port2: {}, baud: {}\n".format(port2, baud))
try:
# left arm
- cx1 = CobotX(port1, baud)
+ cx1 = Mercury(port1, baud)
time.sleep(0.02)
# right arm
- cx2 = CobotX(port2, baud)
+ cx2 = Mercury(port2, baud)
except Exception as e:
print(e)
print(
"""\
- \rTry connect CobotX failed!
- \rPlease check wether connected with CobotX.
+ \rTry connect Mercury failed!
+ \rPlease check wether connected with Mercury.
\rPlease chckt wether the port or baud is right.
"""
)
diff --git a/CobotX/cobotx_b450/scripts/listen_real.py b/Mercury/mercury_b1/scripts/listen_real.py
similarity index 97%
rename from CobotX/cobotx_b450/scripts/listen_real.py
rename to Mercury/mercury_b1/scripts/listen_real.py
index abe9f38..056e67e 100755
--- a/CobotX/cobotx_b450/scripts/listen_real.py
+++ b/Mercury/mercury_b1/scripts/listen_real.py
@@ -7,7 +7,7 @@ import math
import rospy
from sensor_msgs.msg import JointState
from std_msgs.msg import Header
-from cobotx_a450_communication.srv import GetAngles
+from mercury_a1_communication.srv import GetAngles
def talker():
diff --git a/CobotX/cobotx_a450/scripts/listen_real_of_topic.py b/Mercury/mercury_b1/scripts/listen_real_of_topic.py
similarity index 92%
rename from CobotX/cobotx_a450/scripts/listen_real_of_topic.py
rename to Mercury/mercury_b1/scripts/listen_real_of_topic.py
index 07272f3..0e31997 100755
--- a/CobotX/cobotx_a450/scripts/listen_real_of_topic.py
+++ b/Mercury/mercury_b1/scripts/listen_real_of_topic.py
@@ -5,7 +5,7 @@ import math
import rospy
from sensor_msgs.msg import JointState
from std_msgs.msg import Header
-from cobotx_a450_communication.msg import CobotXAngles
+from mercury_a1_communication.msg import CobotXAngles
class Listener(object):
@@ -17,7 +17,7 @@ class Listener(object):
# init publisher.初始化发布者
self.pub = rospy.Publisher("joint_states", JointState, queue_size=10)
# init subscriber.初始化订阅者
- self.sub = rospy.Subscriber("myarm/angles_real", CobotXAngles, self.callback)
+ self.sub = rospy.Subscriber("mercury/angles_real", CobotXAngles, self.callback)
rospy.spin()
def callback(self, data):
diff --git a/CobotX/cobotx_a450/scripts/simple_gui.py b/Mercury/mercury_b1/scripts/simple_gui.py
similarity index 99%
rename from CobotX/cobotx_a450/scripts/simple_gui.py
rename to Mercury/mercury_b1/scripts/simple_gui.py
index ac79b51..b5fd09c 100755
--- a/CobotX/cobotx_a450/scripts/simple_gui.py
+++ b/Mercury/mercury_b1/scripts/simple_gui.py
@@ -4,7 +4,7 @@ try:
import tkinter as tk
except ImportError:
import Tkinter as tk
-from cobotx_a450_communication.srv import GetCoords, SetCoords, GetAngles, SetAngles, GripperStatus
+from mercury_a1_communication.srv import GetCoords, SetCoords, GetAngles, SetAngles, GripperStatus
import rospy
import time
from rospy import ServiceException
diff --git a/CobotX/cobotx_b450/scripts/slider_control.py b/Mercury/mercury_b1/scripts/slider_control.py
similarity index 95%
rename from CobotX/cobotx_b450/scripts/slider_control.py
rename to Mercury/mercury_b1/scripts/slider_control.py
index fca48f8..33d3f01 100755
--- a/CobotX/cobotx_b450/scripts/slider_control.py
+++ b/Mercury/mercury_b1/scripts/slider_control.py
@@ -13,7 +13,7 @@ import time
import rospy
from sensor_msgs.msg import JointState
-from pymycobot.cobotx import CobotX
+from pymycobot.mercury import Mercury
# left arm port
cx1 = None
@@ -64,8 +64,8 @@ def listener():
baud = rospy.get_param("~baud", 115200)
print(port1, baud)
print(port2, baud)
- cx1 = CobotX(port1, baud)
- cx2 = CobotX(port2, baud)
+ cx1 = Mercury(port1, baud)
+ cx2 = Mercury(port2, baud)
# spin() simply keeps python from exiting until this node is stopped
# spin()只是阻止python退出,直到该节点停止
diff --git a/CobotX/cobotx_a450/scripts/teleop_keyboard.py b/Mercury/mercury_b1/scripts/teleop_keyboard.py
similarity index 98%
rename from CobotX/cobotx_a450/scripts/teleop_keyboard.py
rename to Mercury/mercury_b1/scripts/teleop_keyboard.py
index c61fd36..48a9586 100755
--- a/CobotX/cobotx_a450/scripts/teleop_keyboard.py
+++ b/Mercury/mercury_b1/scripts/teleop_keyboard.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
from __future__ import print_function
-from cobotx_a450_communication.srv import GetCoords, SetCoords, GetAngles, SetAngles, GripperStatus
+from mercury_a1_communication.srv import GetCoords, SetCoords, GetAngles, SetAngles, GripperStatus
import rospy
import sys
import select
diff --git a/CobotX/cobotx_b450/scripts/test.py b/Mercury/mercury_b1/scripts/test.py
similarity index 84%
rename from CobotX/cobotx_b450/scripts/test.py
rename to Mercury/mercury_b1/scripts/test.py
index e02bac4..ea3edaf 100644
--- a/CobotX/cobotx_b450/scripts/test.py
+++ b/Mercury/mercury_b1/scripts/test.py
@@ -1,9 +1,9 @@
import time
-from pymycobot.cobotx import CobotX
+from pymycobot.mercury import Mercury
-# cx = CobotX('/dev/ttyAMA1', 115200)
+# cx = Mercury('/dev/ttyAMA1', 115200)
data_list = [90.78, -34.22, -138.46, -76.63, 65.83, 112.31, 59.23,
-128.83, -49.48, 138.13, -103.05, -79.33, 120.49, -120.74,
diff --git a/CobotX/cobotx_b450/src/camera_display.cpp b/Mercury/mercury_b1/src/camera_display.cpp
similarity index 100%
rename from CobotX/cobotx_b450/src/camera_display.cpp
rename to Mercury/mercury_b1/src/camera_display.cpp
diff --git a/CobotX/cobotx_b450/src/opencv_camera.cpp b/Mercury/mercury_b1/src/opencv_camera.cpp
similarity index 100%
rename from CobotX/cobotx_b450/src/opencv_camera.cpp
rename to Mercury/mercury_b1/src/opencv_camera.cpp
diff --git a/CobotX/cobotx_b450_moveit/.setup_assistant b/Mercury/mercury_b1_moveit/.setup_assistant
similarity index 83%
rename from CobotX/cobotx_b450_moveit/.setup_assistant
rename to Mercury/mercury_b1_moveit/.setup_assistant
index 5fd40b4..bf6e825 100644
--- a/CobotX/cobotx_b450_moveit/.setup_assistant
+++ b/Mercury/mercury_b1_moveit/.setup_assistant
@@ -1,7 +1,7 @@
moveit_setup_assistant_config:
URDF:
package: mycobot_description
- relative_path: urdf/cobotx_b450/cobotx_b450.urdf
+ relative_path: urdf/mercury_b1/mercury_b1.urdf
xacro_args: ""
SRDF:
relative_path: config/firefighter.srdf
diff --git a/CobotX/cobotx_a450_moveit/CMakeLists.txt b/Mercury/mercury_b1_moveit/CMakeLists.txt
similarity index 90%
rename from CobotX/cobotx_a450_moveit/CMakeLists.txt
rename to Mercury/mercury_b1_moveit/CMakeLists.txt
index b446544..11e5c5f 100644
--- a/CobotX/cobotx_a450_moveit/CMakeLists.txt
+++ b/Mercury/mercury_b1_moveit/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.1.3)
-project(cobotx_a450_moveit)
+project(mercury_b1_moveit)
find_package(catkin REQUIRED)
diff --git a/CobotX/cobotx_b450_moveit/config/cartesian_limits.yaml b/Mercury/mercury_b1_moveit/config/cartesian_limits.yaml
similarity index 100%
rename from CobotX/cobotx_b450_moveit/config/cartesian_limits.yaml
rename to Mercury/mercury_b1_moveit/config/cartesian_limits.yaml
diff --git a/CobotX/cobotx_b450_moveit/config/chomp_planning.yaml b/Mercury/mercury_b1_moveit/config/chomp_planning.yaml
similarity index 100%
rename from CobotX/cobotx_b450_moveit/config/chomp_planning.yaml
rename to Mercury/mercury_b1_moveit/config/chomp_planning.yaml
diff --git a/CobotX/cobotx_b450_moveit/config/fake_controllers.yaml b/Mercury/mercury_b1_moveit/config/fake_controllers.yaml
similarity index 100%
rename from CobotX/cobotx_b450_moveit/config/fake_controllers.yaml
rename to Mercury/mercury_b1_moveit/config/fake_controllers.yaml
diff --git a/CobotX/cobotx_b450_moveit/config/firefighter.srdf b/Mercury/mercury_b1_moveit/config/firefighter.srdf
similarity index 100%
rename from CobotX/cobotx_b450_moveit/config/firefighter.srdf
rename to Mercury/mercury_b1_moveit/config/firefighter.srdf
diff --git a/CobotX/cobotx_b450_moveit/config/gazebo_controllers.yaml b/Mercury/mercury_b1_moveit/config/gazebo_controllers.yaml
similarity index 100%
rename from CobotX/cobotx_b450_moveit/config/gazebo_controllers.yaml
rename to Mercury/mercury_b1_moveit/config/gazebo_controllers.yaml
diff --git a/CobotX/cobotx_b450_moveit/config/gazebo_firefighter.urdf b/Mercury/mercury_b1_moveit/config/gazebo_firefighter.urdf
similarity index 95%
rename from CobotX/cobotx_b450_moveit/config/gazebo_firefighter.urdf
rename to Mercury/mercury_b1_moveit/config/gazebo_firefighter.urdf
index d354106..80dd754 100644
--- a/CobotX/cobotx_b450_moveit/config/gazebo_firefighter.urdf
+++ b/Mercury/mercury_b1_moveit/config/gazebo_firefighter.urdf
@@ -5,13 +5,13 @@
-
+
-
+
@@ -25,13 +25,13 @@
-
+
-
+
@@ -45,13 +45,13 @@
-
+
-
+
@@ -65,13 +65,13 @@
-
+
-
+
@@ -84,13 +84,13 @@
-
+
-
+
@@ -103,13 +103,13 @@
-
+
-
+
@@ -122,13 +122,13 @@
-
+
-
+
@@ -141,13 +141,13 @@
-
+
-
+
@@ -160,13 +160,13 @@
-
+
-
+
@@ -179,13 +179,13 @@
-
+
-
+
@@ -198,13 +198,13 @@
-
+
-
+
@@ -217,13 +217,13 @@
-
+
-
+
@@ -236,13 +236,13 @@
-
+
-
+
@@ -255,13 +255,13 @@
-
+
-
+
@@ -274,13 +274,13 @@
-
+
-
+
@@ -293,13 +293,13 @@
-
+
-
+
@@ -312,13 +312,13 @@
-
+
-
+
@@ -331,13 +331,13 @@
-
+
-
+
diff --git a/CobotX/cobotx_b450_moveit/config/joint_limits.yaml b/Mercury/mercury_b1_moveit/config/joint_limits.yaml
similarity index 100%
rename from CobotX/cobotx_b450_moveit/config/joint_limits.yaml
rename to Mercury/mercury_b1_moveit/config/joint_limits.yaml
diff --git a/CobotX/cobotx_b450_moveit/config/kinematics.yaml b/Mercury/mercury_b1_moveit/config/kinematics.yaml
similarity index 100%
rename from CobotX/cobotx_b450_moveit/config/kinematics.yaml
rename to Mercury/mercury_b1_moveit/config/kinematics.yaml
diff --git a/CobotX/cobotx_b450_moveit/config/ompl_planning.yaml b/Mercury/mercury_b1_moveit/config/ompl_planning.yaml
similarity index 100%
rename from CobotX/cobotx_b450_moveit/config/ompl_planning.yaml
rename to Mercury/mercury_b1_moveit/config/ompl_planning.yaml
diff --git a/CobotX/cobotx_b450_moveit/config/ros_controllers.yaml b/Mercury/mercury_b1_moveit/config/ros_controllers.yaml
similarity index 100%
rename from CobotX/cobotx_b450_moveit/config/ros_controllers.yaml
rename to Mercury/mercury_b1_moveit/config/ros_controllers.yaml
diff --git a/CobotX/cobotx_b450_moveit/config/sensors_3d.yaml b/Mercury/mercury_b1_moveit/config/sensors_3d.yaml
similarity index 100%
rename from CobotX/cobotx_b450_moveit/config/sensors_3d.yaml
rename to Mercury/mercury_b1_moveit/config/sensors_3d.yaml
diff --git a/CobotX/cobotx_b450_moveit/config/simple_moveit_controllers.yaml b/Mercury/mercury_b1_moveit/config/simple_moveit_controllers.yaml
similarity index 100%
rename from CobotX/cobotx_b450_moveit/config/simple_moveit_controllers.yaml
rename to Mercury/mercury_b1_moveit/config/simple_moveit_controllers.yaml
diff --git a/CobotX/cobotx_b450_moveit/config/stomp_planning.yaml b/Mercury/mercury_b1_moveit/config/stomp_planning.yaml
similarity index 100%
rename from CobotX/cobotx_b450_moveit/config/stomp_planning.yaml
rename to Mercury/mercury_b1_moveit/config/stomp_planning.yaml
diff --git a/CobotX/cobotx_b450_moveit/launch/chomp_planning_pipeline.launch.xml b/Mercury/mercury_b1_moveit/launch/chomp_planning_pipeline.launch.xml
similarity index 92%
rename from CobotX/cobotx_b450_moveit/launch/chomp_planning_pipeline.launch.xml
rename to Mercury/mercury_b1_moveit/launch/chomp_planning_pipeline.launch.xml
index 3db9444..fbf09be 100644
--- a/CobotX/cobotx_b450_moveit/launch/chomp_planning_pipeline.launch.xml
+++ b/Mercury/mercury_b1_moveit/launch/chomp_planning_pipeline.launch.xml
@@ -17,5 +17,5 @@
-
+
diff --git a/CobotX/cobotx_b450_moveit/launch/default_warehouse_db.launch b/Mercury/mercury_b1_moveit/launch/default_warehouse_db.launch
similarity index 83%
rename from CobotX/cobotx_b450_moveit/launch/default_warehouse_db.launch
rename to Mercury/mercury_b1_moveit/launch/default_warehouse_db.launch
index fe580b6..9a297f5 100644
--- a/CobotX/cobotx_b450_moveit/launch/default_warehouse_db.launch
+++ b/Mercury/mercury_b1_moveit/launch/default_warehouse_db.launch
@@ -2,7 +2,7 @@
-
+
diff --git a/CobotX/cobotx_b450_moveit/launch/demo.launch b/Mercury/mercury_b1_moveit/launch/demo.launch
similarity index 97%
rename from CobotX/cobotx_b450_moveit/launch/demo.launch
rename to Mercury/mercury_b1_moveit/launch/demo.launch
index 1274d1c..e749c5d 100644
--- a/CobotX/cobotx_b450_moveit/launch/demo.launch
+++ b/Mercury/mercury_b1_moveit/launch/demo.launch
@@ -6,7 +6,7 @@
-
+
diff --git a/CobotX/cobotx_b450_moveit/launch/demo_gazebo.launch b/Mercury/mercury_b1_moveit/launch/demo_gazebo.launch
similarity index 100%
rename from CobotX/cobotx_b450_moveit/launch/demo_gazebo.launch
rename to Mercury/mercury_b1_moveit/launch/demo_gazebo.launch
diff --git a/CobotX/cobotx_b450_moveit/launch/fake_moveit_controller_manager.launch.xml b/Mercury/mercury_b1_moveit/launch/fake_moveit_controller_manager.launch.xml
similarity index 82%
rename from CobotX/cobotx_b450_moveit/launch/fake_moveit_controller_manager.launch.xml
rename to Mercury/mercury_b1_moveit/launch/fake_moveit_controller_manager.launch.xml
index 17a57d3..35f958e 100644
--- a/CobotX/cobotx_b450_moveit/launch/fake_moveit_controller_manager.launch.xml
+++ b/Mercury/mercury_b1_moveit/launch/fake_moveit_controller_manager.launch.xml
@@ -7,6 +7,6 @@
-
+
diff --git a/CobotX/cobotx_b450_moveit/launch/firefighter_moveit_sensor_manager.launch.xml b/Mercury/mercury_b1_moveit/launch/firefighter_moveit_sensor_manager.launch.xml
similarity index 100%
rename from CobotX/cobotx_b450_moveit/launch/firefighter_moveit_sensor_manager.launch.xml
rename to Mercury/mercury_b1_moveit/launch/firefighter_moveit_sensor_manager.launch.xml
diff --git a/CobotX/cobotx_b450_moveit/launch/gazebo.launch b/Mercury/mercury_b1_moveit/launch/gazebo.launch
similarity index 91%
rename from CobotX/cobotx_b450_moveit/launch/gazebo.launch
rename to Mercury/mercury_b1_moveit/launch/gazebo.launch
index 82c5410..5d2af44 100644
--- a/CobotX/cobotx_b450_moveit/launch/gazebo.launch
+++ b/Mercury/mercury_b1_moveit/launch/gazebo.launch
@@ -13,7 +13,7 @@
-
+
@@ -23,7 +23,7 @@
respawn="false" output="screen" />
-
+
diff --git a/CobotX/cobotx_b450_moveit/launch/joystick_control.launch b/Mercury/mercury_b1_moveit/launch/joystick_control.launch
similarity index 100%
rename from CobotX/cobotx_b450_moveit/launch/joystick_control.launch
rename to Mercury/mercury_b1_moveit/launch/joystick_control.launch
diff --git a/Mercury/mercury_b1_moveit/launch/mercury_b1.launch b/Mercury/mercury_b1_moveit/launch/mercury_b1.launch
new file mode 100644
index 0000000..e749c5d
--- /dev/null
+++ b/Mercury/mercury_b1_moveit/launch/mercury_b1.launch
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ [move_group/fake_controller_joint_states]
+
+
+
+ [move_group/fake_controller_joint_states]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/CobotX/cobotx_b450_moveit/launch/move_group.launch b/Mercury/mercury_b1_moveit/launch/move_group.launch
similarity index 100%
rename from CobotX/cobotx_b450_moveit/launch/move_group.launch
rename to Mercury/mercury_b1_moveit/launch/move_group.launch
diff --git a/CobotX/cobotx_b450_moveit/launch/moveit.rviz b/Mercury/mercury_b1_moveit/launch/moveit.rviz
similarity index 100%
rename from CobotX/cobotx_b450_moveit/launch/moveit.rviz
rename to Mercury/mercury_b1_moveit/launch/moveit.rviz
diff --git a/CobotX/cobotx_b450_moveit/launch/moveit_rviz.launch b/Mercury/mercury_b1_moveit/launch/moveit_rviz.launch
similarity index 100%
rename from CobotX/cobotx_b450_moveit/launch/moveit_rviz.launch
rename to Mercury/mercury_b1_moveit/launch/moveit_rviz.launch
diff --git a/CobotX/cobotx_a450_moveit/launch/ompl-chomp_planning_pipeline.launch.xml b/Mercury/mercury_b1_moveit/launch/ompl-chomp_planning_pipeline.launch.xml
similarity index 82%
rename from CobotX/cobotx_a450_moveit/launch/ompl-chomp_planning_pipeline.launch.xml
rename to Mercury/mercury_b1_moveit/launch/ompl-chomp_planning_pipeline.launch.xml
index 600db76..71423c1 100644
--- a/CobotX/cobotx_a450_moveit/launch/ompl-chomp_planning_pipeline.launch.xml
+++ b/Mercury/mercury_b1_moveit/launch/ompl-chomp_planning_pipeline.launch.xml
@@ -1,6 +1,6 @@
-
+
+
diff --git a/CobotX/cobotx_b450_moveit/launch/ompl_planning_pipeline.launch.xml b/Mercury/mercury_b1_moveit/launch/ompl_planning_pipeline.launch.xml
similarity index 92%
rename from CobotX/cobotx_b450_moveit/launch/ompl_planning_pipeline.launch.xml
rename to Mercury/mercury_b1_moveit/launch/ompl_planning_pipeline.launch.xml
index 6a83625..6bb8931 100644
--- a/CobotX/cobotx_b450_moveit/launch/ompl_planning_pipeline.launch.xml
+++ b/Mercury/mercury_b1_moveit/launch/ompl_planning_pipeline.launch.xml
@@ -19,6 +19,6 @@
-
+
diff --git a/CobotX/cobotx_b450_moveit/launch/pilz_industrial_motion_planner_planning_pipeline.launch.xml b/Mercury/mercury_b1_moveit/launch/pilz_industrial_motion_planner_planning_pipeline.launch.xml
similarity index 100%
rename from CobotX/cobotx_b450_moveit/launch/pilz_industrial_motion_planner_planning_pipeline.launch.xml
rename to Mercury/mercury_b1_moveit/launch/pilz_industrial_motion_planner_planning_pipeline.launch.xml
diff --git a/CobotX/cobotx_b450_moveit/launch/planning_context.launch b/Mercury/mercury_b1_moveit/launch/planning_context.launch
similarity index 68%
rename from CobotX/cobotx_b450_moveit/launch/planning_context.launch
rename to Mercury/mercury_b1_moveit/launch/planning_context.launch
index 4b8001c..b9a5af3 100644
--- a/CobotX/cobotx_b450_moveit/launch/planning_context.launch
+++ b/Mercury/mercury_b1_moveit/launch/planning_context.launch
@@ -6,20 +6,20 @@
-
+
-
+
-
-
+
+
-
+
diff --git a/CobotX/cobotx_b450_moveit/launch/planning_pipeline.launch.xml b/Mercury/mercury_b1_moveit/launch/planning_pipeline.launch.xml
similarity index 100%
rename from CobotX/cobotx_b450_moveit/launch/planning_pipeline.launch.xml
rename to Mercury/mercury_b1_moveit/launch/planning_pipeline.launch.xml
diff --git a/CobotX/cobotx_b450_moveit/launch/ros_control_moveit_controller_manager.launch.xml b/Mercury/mercury_b1_moveit/launch/ros_control_moveit_controller_manager.launch.xml
similarity index 100%
rename from CobotX/cobotx_b450_moveit/launch/ros_control_moveit_controller_manager.launch.xml
rename to Mercury/mercury_b1_moveit/launch/ros_control_moveit_controller_manager.launch.xml
diff --git a/CobotX/cobotx_b450_moveit/launch/ros_controllers.launch b/Mercury/mercury_b1_moveit/launch/ros_controllers.launch
similarity index 78%
rename from CobotX/cobotx_b450_moveit/launch/ros_controllers.launch
rename to Mercury/mercury_b1_moveit/launch/ros_controllers.launch
index 193b694..21f22ef 100644
--- a/CobotX/cobotx_b450_moveit/launch/ros_controllers.launch
+++ b/Mercury/mercury_b1_moveit/launch/ros_controllers.launch
@@ -2,7 +2,7 @@
-
+
-
+
diff --git a/CobotX/cobotx_a450_moveit/launch/sensor_manager.launch.xml b/Mercury/mercury_b1_moveit/launch/sensor_manager.launch.xml
similarity index 88%
rename from CobotX/cobotx_a450_moveit/launch/sensor_manager.launch.xml
rename to Mercury/mercury_b1_moveit/launch/sensor_manager.launch.xml
index abdf6fd..84875a7 100644
--- a/CobotX/cobotx_a450_moveit/launch/sensor_manager.launch.xml
+++ b/Mercury/mercury_b1_moveit/launch/sensor_manager.launch.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/CobotX/cobotx_a450_moveit/launch/setup_assistant.launch b/Mercury/mercury_b1_moveit/launch/setup_assistant.launch
similarity index 91%
rename from CobotX/cobotx_a450_moveit/launch/setup_assistant.launch
rename to Mercury/mercury_b1_moveit/launch/setup_assistant.launch
index 22c6423..942e046 100644
--- a/CobotX/cobotx_a450_moveit/launch/setup_assistant.launch
+++ b/Mercury/mercury_b1_moveit/launch/setup_assistant.launch
@@ -8,7 +8,7 @@
diff --git a/CobotX/cobotx_a450_moveit/launch/simple_moveit_controller_manager.launch.xml b/Mercury/mercury_b1_moveit/launch/simple_moveit_controller_manager.launch.xml
similarity index 62%
rename from CobotX/cobotx_a450_moveit/launch/simple_moveit_controller_manager.launch.xml
rename to Mercury/mercury_b1_moveit/launch/simple_moveit_controller_manager.launch.xml
index 0ca82d8..5bea455 100644
--- a/CobotX/cobotx_a450_moveit/launch/simple_moveit_controller_manager.launch.xml
+++ b/Mercury/mercury_b1_moveit/launch/simple_moveit_controller_manager.launch.xml
@@ -3,6 +3,6 @@
-
-
+
+
diff --git a/CobotX/cobotx_a450_moveit/launch/stomp_planning_pipeline.launch.xml b/Mercury/mercury_b1_moveit/launch/stomp_planning_pipeline.launch.xml
similarity index 92%
rename from CobotX/cobotx_a450_moveit/launch/stomp_planning_pipeline.launch.xml
rename to Mercury/mercury_b1_moveit/launch/stomp_planning_pipeline.launch.xml
index ec56050..8eee119 100644
--- a/CobotX/cobotx_a450_moveit/launch/stomp_planning_pipeline.launch.xml
+++ b/Mercury/mercury_b1_moveit/launch/stomp_planning_pipeline.launch.xml
@@ -19,5 +19,5 @@
-
+
diff --git a/CobotX/cobotx_b450_moveit/launch/trajectory_execution.launch.xml b/Mercury/mercury_b1_moveit/launch/trajectory_execution.launch.xml
similarity index 100%
rename from CobotX/cobotx_b450_moveit/launch/trajectory_execution.launch.xml
rename to Mercury/mercury_b1_moveit/launch/trajectory_execution.launch.xml
diff --git a/CobotX/cobotx_b450_moveit/launch/warehouse.launch b/Mercury/mercury_b1_moveit/launch/warehouse.launch
similarity index 100%
rename from CobotX/cobotx_b450_moveit/launch/warehouse.launch
rename to Mercury/mercury_b1_moveit/launch/warehouse.launch
diff --git a/CobotX/cobotx_b450_moveit/launch/warehouse_settings.launch.xml b/Mercury/mercury_b1_moveit/launch/warehouse_settings.launch.xml
similarity index 100%
rename from CobotX/cobotx_b450_moveit/launch/warehouse_settings.launch.xml
rename to Mercury/mercury_b1_moveit/launch/warehouse_settings.launch.xml
diff --git a/CobotX/cobotx_b450_moveit/package.xml b/Mercury/mercury_b1_moveit/package.xml
similarity index 98%
rename from CobotX/cobotx_b450_moveit/package.xml
rename to Mercury/mercury_b1_moveit/package.xml
index cf42fe1..318f7b4 100644
--- a/CobotX/cobotx_b450_moveit/package.xml
+++ b/Mercury/mercury_b1_moveit/package.xml
@@ -1,6 +1,6 @@
- cobotx_b450_moveit
+ mercury_b1_moveit
0.3.0
An automatically generated package with all the configuration and launch files for using the firefighter with the MoveIt Motion Planning Framework
diff --git a/CobotX/cobotx_b450_moveit/scripts/sync_plan.py b/Mercury/mercury_b1_moveit/scripts/sync_plan.py
similarity index 95%
rename from CobotX/cobotx_b450_moveit/scripts/sync_plan.py
rename to Mercury/mercury_b1_moveit/scripts/sync_plan.py
index 33e6c1d..30f526d 100755
--- a/CobotX/cobotx_b450_moveit/scripts/sync_plan.py
+++ b/Mercury/mercury_b1_moveit/scripts/sync_plan.py
@@ -14,7 +14,7 @@ import time
import rospy
from sensor_msgs.msg import JointState
-from pymycobot.cobotx import CobotX
+from pymycobot.mercury import Mercury
# left arm port
cx1 = None
@@ -65,8 +65,8 @@ def listener():
baud = rospy.get_param("~baud", 115200)
print(port1, baud)
print(port2, baud)
- cx1 = CobotX(port1, baud)
- cx2 = CobotX(port2, baud)
+ cx1 = Mercury(port1, baud)
+ cx2 = Mercury(port2, baud)
# spin() simply keeps python from exiting until this node is stopped
# spin()只是阻止python退出,直到该节点停止
diff --git a/mycobot_description/urdf/cobotx_a450/base.dae b/mycobot_description/urdf/mercury_a1/base.dae
similarity index 100%
rename from mycobot_description/urdf/cobotx_a450/base.dae
rename to mycobot_description/urdf/mercury_a1/base.dae
diff --git a/mycobot_description/urdf/cobotx_a450/joint1.dae b/mycobot_description/urdf/mercury_a1/joint1.dae
similarity index 100%
rename from mycobot_description/urdf/cobotx_a450/joint1.dae
rename to mycobot_description/urdf/mercury_a1/joint1.dae
diff --git a/mycobot_description/urdf/cobotx_a450/joint2.dae b/mycobot_description/urdf/mercury_a1/joint2.dae
similarity index 100%
rename from mycobot_description/urdf/cobotx_a450/joint2.dae
rename to mycobot_description/urdf/mercury_a1/joint2.dae
diff --git a/mycobot_description/urdf/cobotx_a450/joint3.dae b/mycobot_description/urdf/mercury_a1/joint3.dae
similarity index 100%
rename from mycobot_description/urdf/cobotx_a450/joint3.dae
rename to mycobot_description/urdf/mercury_a1/joint3.dae
diff --git a/mycobot_description/urdf/cobotx_a450/joint4.dae b/mycobot_description/urdf/mercury_a1/joint4.dae
similarity index 100%
rename from mycobot_description/urdf/cobotx_a450/joint4.dae
rename to mycobot_description/urdf/mercury_a1/joint4.dae
diff --git a/mycobot_description/urdf/cobotx_a450/joint5.dae b/mycobot_description/urdf/mercury_a1/joint5.dae
similarity index 100%
rename from mycobot_description/urdf/cobotx_a450/joint5.dae
rename to mycobot_description/urdf/mercury_a1/joint5.dae
diff --git a/mycobot_description/urdf/cobotx_a450/joint6.dae b/mycobot_description/urdf/mercury_a1/joint6.dae
similarity index 100%
rename from mycobot_description/urdf/cobotx_a450/joint6.dae
rename to mycobot_description/urdf/mercury_a1/joint6.dae
diff --git a/mycobot_description/urdf/cobotx_a450/joint7.dae b/mycobot_description/urdf/mercury_a1/joint7.dae
similarity index 100%
rename from mycobot_description/urdf/cobotx_a450/joint7.dae
rename to mycobot_description/urdf/mercury_a1/joint7.dae
diff --git a/mycobot_description/urdf/cobotx_a450/cobotx_a450.urdf b/mycobot_description/urdf/mercury_a1/mercury_a1.urdf
similarity index 76%
rename from mycobot_description/urdf/cobotx_a450/cobotx_a450.urdf
rename to mycobot_description/urdf/mercury_a1/mercury_a1.urdf
index c201421..00bfb13 100644
--- a/mycobot_description/urdf/cobotx_a450/cobotx_a450.urdf
+++ b/mycobot_description/urdf/mercury_a1/mercury_a1.urdf
@@ -7,13 +7,13 @@
-
+
-
+
@@ -22,13 +22,13 @@
-
+
-
+
@@ -37,13 +37,13 @@
-
+
-
+
@@ -53,13 +53,13 @@
-
+
-
+
@@ -69,13 +69,13 @@
-
+
-
+
@@ -86,14 +86,14 @@
-
+
-
+
@@ -104,14 +104,14 @@
-
+
-
+
@@ -121,14 +121,14 @@
-
+
-
+
diff --git a/mycobot_description/urdf/cobotx_b450/base.dae b/mycobot_description/urdf/mercury_b1/base.dae
similarity index 100%
rename from mycobot_description/urdf/cobotx_b450/base.dae
rename to mycobot_description/urdf/mercury_b1/base.dae
diff --git a/mycobot_description/urdf/cobotx_b450/body.dae b/mycobot_description/urdf/mercury_b1/body.dae
similarity index 100%
rename from mycobot_description/urdf/cobotx_b450/body.dae
rename to mycobot_description/urdf/mercury_b1/body.dae
diff --git a/mycobot_description/urdf/cobotx_b450/head.dae b/mycobot_description/urdf/mercury_b1/head.dae
similarity index 100%
rename from mycobot_description/urdf/cobotx_b450/head.dae
rename to mycobot_description/urdf/mercury_b1/head.dae
diff --git a/mycobot_description/urdf/cobotx_b450/head_eye.dae b/mycobot_description/urdf/mercury_b1/head_eye.dae
similarity index 100%
rename from mycobot_description/urdf/cobotx_b450/head_eye.dae
rename to mycobot_description/urdf/mercury_b1/head_eye.dae
diff --git a/mycobot_description/urdf/cobotx_b450/joint1_L.dae b/mycobot_description/urdf/mercury_b1/joint1_L.dae
similarity index 100%
rename from mycobot_description/urdf/cobotx_b450/joint1_L.dae
rename to mycobot_description/urdf/mercury_b1/joint1_L.dae
diff --git a/mycobot_description/urdf/cobotx_b450/joint1_R.dae b/mycobot_description/urdf/mercury_b1/joint1_R.dae
similarity index 100%
rename from mycobot_description/urdf/cobotx_b450/joint1_R.dae
rename to mycobot_description/urdf/mercury_b1/joint1_R.dae
diff --git a/mycobot_description/urdf/cobotx_b450/joint2_L.dae b/mycobot_description/urdf/mercury_b1/joint2_L.dae
similarity index 100%
rename from mycobot_description/urdf/cobotx_b450/joint2_L.dae
rename to mycobot_description/urdf/mercury_b1/joint2_L.dae
diff --git a/mycobot_description/urdf/cobotx_b450/joint2_R.dae b/mycobot_description/urdf/mercury_b1/joint2_R.dae
similarity index 100%
rename from mycobot_description/urdf/cobotx_b450/joint2_R.dae
rename to mycobot_description/urdf/mercury_b1/joint2_R.dae
diff --git a/mycobot_description/urdf/cobotx_b450/joint3_L.dae b/mycobot_description/urdf/mercury_b1/joint3_L.dae
similarity index 100%
rename from mycobot_description/urdf/cobotx_b450/joint3_L.dae
rename to mycobot_description/urdf/mercury_b1/joint3_L.dae
diff --git a/mycobot_description/urdf/cobotx_b450/joint3_R.dae b/mycobot_description/urdf/mercury_b1/joint3_R.dae
similarity index 100%
rename from mycobot_description/urdf/cobotx_b450/joint3_R.dae
rename to mycobot_description/urdf/mercury_b1/joint3_R.dae
diff --git a/mycobot_description/urdf/cobotx_b450/joint4_L.dae b/mycobot_description/urdf/mercury_b1/joint4_L.dae
similarity index 100%
rename from mycobot_description/urdf/cobotx_b450/joint4_L.dae
rename to mycobot_description/urdf/mercury_b1/joint4_L.dae
diff --git a/mycobot_description/urdf/cobotx_b450/joint4_R.dae b/mycobot_description/urdf/mercury_b1/joint4_R.dae
similarity index 100%
rename from mycobot_description/urdf/cobotx_b450/joint4_R.dae
rename to mycobot_description/urdf/mercury_b1/joint4_R.dae
diff --git a/mycobot_description/urdf/cobotx_b450/joint5_L.dae b/mycobot_description/urdf/mercury_b1/joint5_L.dae
similarity index 100%
rename from mycobot_description/urdf/cobotx_b450/joint5_L.dae
rename to mycobot_description/urdf/mercury_b1/joint5_L.dae
diff --git a/mycobot_description/urdf/cobotx_b450/joint5_R.dae b/mycobot_description/urdf/mercury_b1/joint5_R.dae
similarity index 100%
rename from mycobot_description/urdf/cobotx_b450/joint5_R.dae
rename to mycobot_description/urdf/mercury_b1/joint5_R.dae
diff --git a/mycobot_description/urdf/cobotx_b450/joint6_L.dae b/mycobot_description/urdf/mercury_b1/joint6_L.dae
similarity index 100%
rename from mycobot_description/urdf/cobotx_b450/joint6_L.dae
rename to mycobot_description/urdf/mercury_b1/joint6_L.dae
diff --git a/mycobot_description/urdf/cobotx_b450/joint6_R.dae b/mycobot_description/urdf/mercury_b1/joint6_R.dae
similarity index 100%
rename from mycobot_description/urdf/cobotx_b450/joint6_R.dae
rename to mycobot_description/urdf/mercury_b1/joint6_R.dae
diff --git a/mycobot_description/urdf/cobotx_b450/joint7_L.dae b/mycobot_description/urdf/mercury_b1/joint7_L.dae
similarity index 100%
rename from mycobot_description/urdf/cobotx_b450/joint7_L.dae
rename to mycobot_description/urdf/mercury_b1/joint7_L.dae
diff --git a/mycobot_description/urdf/cobotx_b450/joint7_R.dae b/mycobot_description/urdf/mercury_b1/joint7_R.dae
similarity index 100%
rename from mycobot_description/urdf/cobotx_b450/joint7_R.dae
rename to mycobot_description/urdf/mercury_b1/joint7_R.dae
diff --git a/mycobot_description/urdf/cobotx_b450/cobotx_b450.urdf b/mycobot_description/urdf/mercury_b1/mercury_b1.urdf
similarity index 76%
rename from mycobot_description/urdf/cobotx_b450/cobotx_b450.urdf
rename to mycobot_description/urdf/mercury_b1/mercury_b1.urdf
index 3b27692..e607965 100644
--- a/mycobot_description/urdf/cobotx_b450/cobotx_b450.urdf
+++ b/mycobot_description/urdf/mercury_b1/mercury_b1.urdf
@@ -7,13 +7,13 @@
-
+
-
+
@@ -23,13 +23,13 @@
-
+
-
+
@@ -39,13 +39,13 @@
-
+
-
+
@@ -55,13 +55,13 @@
-
+
-
+
@@ -70,13 +70,13 @@
-
+
-
+
@@ -85,13 +85,13 @@
-
+
-
+
@@ -100,13 +100,13 @@
-
+
-
+
@@ -115,13 +115,13 @@
-
+
-
+
@@ -130,13 +130,13 @@
-
+
-
+
@@ -145,13 +145,13 @@
-
+
-
+
@@ -160,13 +160,13 @@
-
+
-
+
@@ -175,13 +175,13 @@
-
+
-
+
@@ -190,13 +190,13 @@
-
+
-
+
@@ -205,13 +205,13 @@
-
+
-
+
@@ -220,13 +220,13 @@
-
+
-
+
@@ -235,13 +235,13 @@
-
+
-
+
@@ -250,13 +250,13 @@
-
+
-
+
@@ -265,13 +265,13 @@
-
+
-
+