[drones] Rotors integration #1772
Conversation
There was a problem hiding this comment.
Hi @RUFFY-369, PR seems good overall. Most of the comments are duplicated and not really relevant. The important ones are in the Dockerfile and in the new launchers. Go ahead with the changes! 👍
exercises/static/exercises/drone_cat_mouse/web-template/drone_cat_mouse.world
Show resolved
Hide resolved
exercises/static/exercises/drone_cat_mouse/web-template/drone_cat_mouse.world
Show resolved
Hide resolved
exercises/static/exercises/drone_cat_mouse/web-template/drone_cat_mouse.world
Outdated
Show resolved
Hide resolved
exercises/static/exercises/drone_cat_mouse/web-template/exercise.py
Outdated
Show resolved
Hide resolved
exercises/static/exercises/drone_cat_mouse/web-template/exercise_guest.py
Outdated
Show resolved
Hide resolved
|
Hi @pariaspe , please review the updates |
exercises/static/exercises/drone_cat_mouse/web-template/drone_cat_mouse.world
Outdated
Show resolved
Hide resolved
exercises/static/exercises/follow_turtlebot/web-template/launch/follow_turtlebot.launch
Outdated
Show resolved
Hide resolved
scripts/Dockerfile
Outdated
|
|
||
| # RoboticsAcademy | ||
| RUN git clone https://github.com/JdeRobot/RoboticsAcademy.git -b master | ||
| RUN rm -rf /RoboticsAcademy && \ | ||
| git clone https://github.com/RUFFY-369/RoboticsAcademy.git -b rotors |
There was a problem hiding this comment.
Reverted to master branch? If so, I did it for testing purpose for the current branch on which the prototype is on i.e., 'rotors' which can be changed after the changes are merged in the future
If you're mentioning the 'rm' cmd then I've removed it in the recent changes
|
Hi @arka, done the minor changes with cleaning of world and docker files that you requested. If the PR needs any more changes,please suggest. |
…rs driver, getting back HAL & GUI
|
Hi @pariaspe & @iamarkaj , those commented out parts in HAL & GUI have been taken back in the main code in the new updates after developing and pushing the rotors_driver on drones repo. |
scripts/.rosinstall
Outdated
| @@ -12,8 +12,8 @@ repositories: | |||
|
|
|||
| drones: | |||
| type: git | |||
| url: https://github.com/JdeRobot/drones.git | |||
| version: noetic-devel | |||
| url: https://github.com/RUFFY-369/drones.git | |||
There was a problem hiding this comment.
waiting until JdeRobot/drones#176 merge
exercises/static/exercises/follow_turtlebot/web-template/launch/follow_turtlebot.launch
Outdated
Show resolved
Hide resolved
exercises/static/exercises/drone_cat_mouse/web-template/launch/drone_cat_mouse.launch
Outdated
Show resolved
Hide resolved
This reverts commit fa11ebc.
|
Hi @dvalladaresv , this merge will be a major update in the RADI. We have tested it and everything should work fine. I just want to inform you before merging it, since this PR may break something (I hope it doesn't...) |
For testing the drone based exercises prototypes where PX4 backend is replaced with rotors simulation package
For more details, refer the blog
Issue #1773