Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pick & Place Exercise (Gazebo + Console + Rviz) with web-templates #1153

Open
wants to merge 47 commits into
base: melodic
Choose a base branch
from

Conversation

predator4hack
Copy link
Contributor

No description provided.

@predator4hack
Copy link
Contributor Author

solves issue #1133


# RoboticsAcademy
RUN git clone https://github.com/JdeRobot/RoboticsAcademy.git -b master
RUN rsync -a --exclude 'ace-builds' /RoboticsAcademy/exercises/static/exercises/* /RoboticsAcademy/exercises
RUN git clone https://github.com/predator4hack/RoboticsAcademy.git -b pick_place
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line should not be changed

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, will have to change this

ENV LD_LIBRARY_PATH "$LD_LIBRARY_PATH:/usr/lib/x86_64-linux-gnu/gazebo-9/plugins:/Firmware/build/px4_sitl_default/build_gazebo"

# RoboticsAcademy
RUN git clone https://github.com/JdeRobot/RoboticsAcademy.git -b master
RUN git clone https://github.com/predator4hack/RoboticsAcademy.git -b pick_place
Copy link
Contributor

@sixer51 sixer51 Jul 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line should not be changed

RUN git clone https://github.com/JdeRobot/RoboticsAcademy.git -b master
RUN rsync -a --exclude 'ace-builds' /RoboticsAcademy/exercises/static/exercises/* /RoboticsAcademy/exercises
RUN git clone https://github.com/predator4hack/RoboticsAcademy.git -b pick_place
# RUN rsync -a --exclude 'ace-builds' /RoboticsAcademy/exercises/static/exercises/* /RoboticsAcademy/exercises
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this line commented in Dockerfile, but kept in Dockerfile-2.4?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ohh, I forgot to uncomment this, basically, we are using RADI 2.4, so the changes in the dockerfile didn't affect the testing.

Copy link
Contributor Author

@predator4hack predator4hack left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah,, ig any changes inside the dockerfile is irrelevant because there is no catkin workspace in it. I'll remove all the changes inside dockerfile.q11

RUN git clone https://github.com/JdeRobot/RoboticsAcademy.git -b master
RUN rsync -a --exclude 'ace-builds' /RoboticsAcademy/exercises/static/exercises/* /RoboticsAcademy/exercises
RUN git clone https://github.com/predator4hack/RoboticsAcademy.git -b pick_place
# RUN rsync -a --exclude 'ace-builds' /RoboticsAcademy/exercises/static/exercises/* /RoboticsAcademy/exercises
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ohh, I forgot to uncomment this, basically, we are using RADI 2.4, so the changes in the dockerfile didn't affect the testing.


# RoboticsAcademy
RUN git clone https://github.com/JdeRobot/RoboticsAcademy.git -b master
RUN rsync -a --exclude 'ace-builds' /RoboticsAcademy/exercises/static/exercises/* /RoboticsAcademy/exercises
RUN git clone https://github.com/predator4hack/RoboticsAcademy.git -b pick_place
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, will have to change this

@@ -8,7 +8,7 @@
import time
import json
import stat

import manager_utils as m_utils
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All specific changes to scripts/manager.py would be a feature accessible to all exercises in JdeRobot Academy.
In this case, it is the addition of the Rviz plugin. I guess other projects would also be making similar changes.

Maybe this should go as a separate feature-issue-pr into JdeRobotAcademy and not part of the pick_place exercise addition PR.

@sixer51 @jmplaza what are your thoughts on the same?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, Siddharth has already created a pull request related to this: https://github.com/trunc8/RoboticsAcademy/commits/issue-801

@pushkalkatara
Copy link
Member

I reproduced the branch on my system and the exercise works perfectly. Thanks Chandan (@predator4hack) for your contribution.

The number of changes in the current PR (1931) is daunting to review. Probably most of the changes are due to the static files of ace-builds for the website. Keeping those files for new exercise is a necessity I guess.

Maybe we can break the PR and get the raw template merged in JdeRobot:master first, in another PR, we can update changes specific to pick_place exercise. This way no. of changes in files would be less and code-review would be easier.

@pushkalkatara
Copy link
Member

Also, the current docker build is from scratch, It took around 2 hours on my system for the build to complete.

Can we somehow use RoboticsAcademy current images as our Dockerfile's base image, and have a Dockerfile specifically to build the exercise? this way build time would be shorter I guess.

@predator4hack
Copy link
Contributor Author

I reproduced the branch on my system and the exercise works perfectly. Thanks Chandan (@predator4hack) for your contribution.

The number of changes in the current PR (1931) is daunting to review. Probably most of the changes are due to the static files of ace-builds for the website. Keeping those files for new exercise is a necessity I guess.

Maybe we can break the PR and get the raw template merged in JdeRobot:master first, in another PR, we can update changes specific to pick_place exercise. This way no. of changes in files would be less and code-review would be easier.

Yeah, I guess we can do that

@predator4hack
Copy link
Contributor Author

Also, the current docker build is from scratch, It took around 2 hours on my system for the build to complete.

Can we somehow use RoboticsAcademy current images as our Dockerfile's base image, and have a Dockerfile specifically to build the exercise? this way build time would be shorter I guess.

Yeah, we have multi-stage build for this. Once you create the base image for any version, you can build again on top of it. And you don't need to build the base image again and again, which takes most of the time.

Industrial Robot exercise doesn't work with RADI2.3 because of the unavailability of the catkin_ws. So the changes for the Dockerfile(RADI2.3) are unnecessary.
@predator4hack predator4hack changed the title Pick & Place Exercise with web-templates Pick & Place Exercise (Gazebo + Console + Rviz) with web-templates Aug 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants