diff --git a/CHANGELOG.md b/CHANGELOG.md index 3dfe6ab..7974628 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,36 @@ # 2021 +## 07.05 + +- Added gripper model for Pro320 and modified urdf. +- Fixed initial pose of Pro600. + +## 06.28 + +- simple_gui: Allow Ctrl+C to kill program (for roslaunch) [#28](https://github.com/elephantrobotics/mycobot_ros/pull/28) + +## 06.22 + +- Added Pro600 model. +- Fixed Pro320 model that adding volume collision. + +## 06.09 + +- Added Pro320 model. +- Added slider controlling script fro Pro320. +- Docker support both nvidia/without nvidia. + +## 05.28 + +- Fixed docker file for ros melodic. [#22](https://github.com/elephantrobotics/mycobot_ros/pull/22) [#23](https://github.com/elephantrobotics/mycobot_ros/pull/23) +- Added industrial_ci and update package.xml [#24](https://github.com/elephantrobotics/mycobot_ros/pull/24) +- Added more compile time dependency detection. +- Added vision code for Mycobot. + +## 05.21 + +- Feature: simple gui. + ## 05.13 - Specification package name. @@ -8,6 +39,3 @@ - Intergrated MoveIt. - Update sync moveit plan script. -## 05.21 - -- Feature: simple gui. \ No newline at end of file diff --git a/README.md b/README.md index 4bd0014..243c04d 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ There are two ways to run this project. The first is by running the project in a container, and this requires [installing docker](https://docs.docker.com/engine/install/ubuntu/) and [installing docker-compose](https://docs.docker.com/compose/install/). The benefit of running in the container is that you can run the project in any version of linux, as long as your kernel -is new enough. +is new enough. Once docker is installed, run the following command, and the project should show up. @@ -42,11 +42,11 @@ docker-compose build nvidia-ros && xhost +local:root && docker-compose up nvidia This command does three things: 1) `docker-compose build ros` - + This builds the project in a container. That means nothing is installed on your host machine! - The first time this runs, this command will take a long while. After running it once, caching + The first time this runs, this command will take a long while. After running it once, caching will allow this command to run quickly. - + 2) `xhost +local:root` This command gives X the ability to display GUI's from within the docker container @@ -55,7 +55,7 @@ This command does three things: This runs the image specified in the `docker-compose.yml`, which by default runs the command `roslaunch mycobot_ros mycobot_slider.launch` within the container. - + ### Option 2: Local #### 1.1 Pre-Requriements @@ -72,7 +72,7 @@ Install ros package in your src folder of your Catkin workspace. ```bash $ cd ~/catkin_ws/src -$ git clone https://github.com/elephantrobotics/mycobot_ros.git +$ git clone --depth 1 https://github.com/elephantrobotics/mycobot_ros.git $ cd ~/catkin_ws $ catkin_make $ source ~/catkin_ws/devel/setup.bash @@ -103,9 +103,3 @@ python scripts/test.py --- ~*END*~ - - diff --git a/install ros.pdf b/install ros.pdf deleted file mode 100644 index 7f02f9e..0000000 Binary files a/install ros.pdf and /dev/null differ