diff --git a/CMakeLists.txt b/CMakeLists.txt index ea877b8..28c77d8 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 2.8.3) -project(myCobotROS) +project(mycobot_ros) add_compile_options(-std=c++11) ## Find catkin and any catkin packages diff --git a/README.md b/README.md index 113bcf6..cdbc2c9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# myCobotROS +# mycobot_ros [![jaywcjlove/sb](https://jaywcjlove.github.io/sb/lang/chinese.svg)](READMEcn.md) @@ -46,7 +46,7 @@ This command does three things: 3) `docker-compose up ros` This runs the image specified in the `docker-compose.yml`, which by default runs - the command `roslaunch myCobotROS control_slider.launch` within the container. + the command `roslaunch mycobot_ros control_slider.launch` within the container. ### Option 2: Local @@ -64,7 +64,7 @@ Install ros package in your src folder of your Catkin workspace. ```bash $ cd ~/catkin_ws/src -$ git clone https://github.com/elephantrobotics/myCobotROS.git +$ git clone https://github.com/elephantrobotics/mycobot_ros.git $ cd ~/catkin_ws $ catkin_make $ source ~/catkin_ws/devel/setup.bash @@ -73,7 +73,7 @@ $ source ~/catkin_ws/devel/setup.bash #### 1.3 Test Python API ```bash -cd ~/catkin_ws/src/myCobotROS +cd ~/catkin_ws/src/mycobot_ros python scripts/test.py ``` @@ -109,13 +109,13 @@ python scripts/test.py - launch ros and rviz ``` - roslaunch myCobotROS control_slider.launch + roslaunch mycobot_ros control_slider.launch ``` - run python script ``` - rosrun myCobotROS control_slider.py + rosrun mycobot_ros control_slider.py ``` - **The model moves with the real manipulator** @@ -123,13 +123,13 @@ python scripts/test.py - launch ros and rviz ``` - roslanuch myCobotROS mycobot.launch + roslanuch mycobot_ros mycobot.launch ``` - run python script ``` - rosrun myCobotROS display.py + rosrun mycobot_ros display.py ``` - **Open the keyboard controller** @@ -137,13 +137,13 @@ python scripts/test.py - launch ``` - roslaunch myCobotROS mycobot_teleop_keyboard.launch PORT:=/dev/ttyUSB0 + roslaunch mycobot_ros mycobot_teleop_keyboard.launch PORT:=/dev/ttyUSB0 ``` - open another terminal run script ``` - rosrun myCobotROS teleop_keyboard.py _speed:=60 _change_size:=10 + rosrun mycobot_ros teleop_keyboard.py _speed:=60 _change_size:=10 ``` Then you will see this: @@ -175,7 +175,7 @@ python scripts/test.py ## Q & A diff --git a/READMEcn.md b/READMEcn.md index 3bc9497..62d5f65 100644 --- a/READMEcn.md +++ b/READMEcn.md @@ -1,4 +1,4 @@ -# myCobotROS +# mycobot_ros [![jaywcjlove/sb](https://jaywcjlove.github.io/sb/lang/english.svg)](README.md) @@ -33,7 +33,7 @@ pip install pymycobot --user ```bash $ cd ~/catkin_ws/src -$ git clone https://github.com/elephantrobotics/myCobotROS.git +$ git clone https://github.com/elephantrobotics/mycobot_ros.git $ cd ~/catkin_ws $ catkin_make ``` @@ -41,7 +41,7 @@ $ catkin_make ### 1.3 你可以选择测试 Python API ```bash -cd ~/catkin_ws/src/myCobotROS +cd ~/catkin_ws/src/mycobot_ros python scripts/test.py ``` @@ -77,13 +77,13 @@ python scripts/test.py - 启动 ros 和 rviz ``` - roslaunch myCobotROS control_slider.launch + roslaunch mycobot_ros control_slider.launch ``` - 运行 python 脚本 ``` - rosrun myCobotROS control_slider.py + rosrun mycobot_ros control_slider.py ``` - 仿真模型同步机械臂 @@ -91,13 +91,13 @@ python scripts/test.py - 启动 ros 和 rviz ``` - roslanuch myCobotROS mycobot.launch + roslanuch mycobot_ros mycobot.launch ``` - 运行 python 脚本 ``` - rosrun myCobotROS display.py + rosrun mycobot_ros display.py ``` ## Q & A diff --git a/docker-compose.yml b/docker-compose.yml index e11f3fb..28da39c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' x-app: &common - command: [ "roslaunch myCobotROS control_slider.launch" ] + command: [ "roslaunch mycobot_ros control_slider.launch" ] privileged: true environment: PYTHONUNBUFFERED: 1 diff --git a/launch/communication_service.launch b/launch/communication_service.launch index 7cfdf62..a9dd474 100644 --- a/launch/communication_service.launch +++ b/launch/communication_service.launch @@ -3,7 +3,7 @@ - + diff --git a/launch/control_slider.launch b/launch/control_slider.launch index 82d03c3..c0cee8a 100644 --- a/launch/control_slider.launch +++ b/launch/control_slider.launch @@ -1,6 +1,6 @@ - - + + @@ -12,7 +12,7 @@ - + diff --git a/launch/mycobot.launch b/launch/mycobot.launch index 75df517..ed7af6f 100644 --- a/launch/mycobot.launch +++ b/launch/mycobot.launch @@ -1,6 +1,6 @@ - - + + diff --git a/launch/mycobot_teleop_keyboard.launch b/launch/mycobot_teleop_keyboard.launch index 66d55ed..6762ad6 100644 --- a/launch/mycobot_teleop_keyboard.launch +++ b/launch/mycobot_teleop_keyboard.launch @@ -2,8 +2,8 @@ - - + + @@ -13,9 +13,9 @@ - + - + diff --git a/package.xml b/package.xml index 90171d2..6c72855 100644 --- a/package.xml +++ b/package.xml @@ -1,8 +1,8 @@ - myCobotROS + mycobot_ros 0.1.0 - The myCobotROS package + The mycobot_ros package ZhangLijun BSD diff --git a/scripts/client.py b/scripts/client.py index da0cc6b..ec11c81 100755 --- a/scripts/client.py +++ b/scripts/client.py @@ -1,7 +1,7 @@ #!/usr/bin/env python2 import sys import rospy -from myCobotROS.srv import * +from mycobot_ros.srv import * def test(): diff --git a/scripts/teleop_keyboard.py b/scripts/teleop_keyboard.py index 7e520ff..9f82552 100755 --- a/scripts/teleop_keyboard.py +++ b/scripts/teleop_keyboard.py @@ -11,7 +11,7 @@ import copy import time import roslib -roslib.load_manifest('myCobotROS') +roslib.load_manifest('mycobot_ros') msg = """ diff --git a/urdf/mycobot_urdf.urdf b/urdf/mycobot_urdf.urdf index fc403c9..60e05cd 100755 --- a/urdf/mycobot_urdf.urdf +++ b/urdf/mycobot_urdf.urdf @@ -8,7 +8,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -74,7 +74,7 @@ - +