-
Notifications
You must be signed in to change notification settings - Fork 17
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
Multi-Robot Support #365
Open
JBVAkshaya
wants to merge
78
commits into
Robotic-Decision-Making-Lab:main
Choose a base branch
from
JBVAkshaya:iron-mp
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Multi-Robot Support #365
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…Decision-Making-Lab#105) (cherry picked from commit 1d25643) Co-authored-by: Evan Palmer <evanp922@gmail.com>
Robotic-Decision-Making-Lab#122) * Cleaned up Docker pipelines (Robotic-Decision-Making-Lab#121) * Cleaned up Dockerfile and added new user entrypoints * Fixed robot pipeline to support building for arm64 * Updated devcontainer configurations to use latest changes * Testing pipelines * Removed testing branch from pipelines * Precommit * Resolved pr comments (cherry picked from commit 11807c8) # Conflicts: # .devcontainer/nouveau/devcontainer.json # .devcontainer/nvidia/devcontainer.json # .github/ISSUE_TEMPLATE/config.yaml # .github/workflows/ci.yaml * Fixed backport * Fixed config merge conflict --------- Co-authored-by: Evan Palmer <evanp922@gmail.com>
…obotic-Decision-Making-Lab#124) Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 96d5854) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…Lab#128) (Robotic-Decision-Making-Lab#133) Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2 to 3. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](docker/setup-buildx-action@v2...v3) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 28862b2) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…aking-Lab#129) (Robotic-Decision-Making-Lab#135) Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 2.2.0 to 3.0.0. - [Release notes](https://github.com/docker/setup-qemu-action/releases) - [Commits](docker/setup-qemu-action@v2.2.0...v3.0.0) --- updated-dependencies: - dependency-name: docker/setup-qemu-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 8d2cc5b) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…aking-Lab#130) (Robotic-Decision-Making-Lab#137) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 4.1.1 to 5.0.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@v4.1.1...v5.0.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 714a253) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…-Lab#131) (Robotic-Decision-Making-Lab#139) Bumps [docker/login-action](https://github.com/docker/login-action) from 2.2.0 to 3.0.0. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](docker/login-action@v2.2.0...v3.0.0) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 8abca64) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ng-Lab#148) (Robotic-Decision-Making-Lab#149) * Allowing gazebo_world_file arg to be passed in * updating gazebo_world_file arg in launch file * updating gazebo_world_file arg in launch file * Pre-commit --------- Co-authored-by: Evan Palmer <evanp922@gmail.com> (cherry picked from commit 01b385d) Co-authored-by: Tim Huff <89954856+timmarkhuff@users.noreply.github.com>
…-Lab#172) (Robotic-Decision-Making-Lab#173) Bumps [docker/login-action](https://github.com/docker/login-action) from 3.1.0 to 3.2.0. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](docker/login-action@v3.1.0...v3.2.0) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit c8e46b7) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…aking-Lab#175) (Robotic-Decision-Making-Lab#177) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5.3.0 to 5.4.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@v5.3.0...v5.4.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 880a2d6) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…#182) (Robotic-Decision-Making-Lab#184) Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3. - [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md) - [Commits](micromatch/braces@3.0.2...3.0.3) --- updated-dependencies: - dependency-name: braces dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 107fe4c) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…aking-Lab#179) (Robotic-Decision-Making-Lab#186) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5.4.0 to 6.0.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@v5.4.0...v6.0.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 4efc645) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…obotic-Decision-Making-Lab#193) (Robotic-Decision-Making-Lab#194) * Fixed ardusub_gazebo install and mavros configurations * Remapped controller manager topic to robot state publisher topic * Added missing gstreamer dependency (cherry picked from commit 9ddb154) Co-authored-by: Evan Palmer <evanp922@gmail.com>
…ng-Lab#196) (Robotic-Decision-Making-Lab#198) (cherry picked from commit 531ed83) Co-authored-by: Evan Palmer <evanp922@gmail.com>
…on-Making-Lab#299) (Robotic-Decision-Making-Lab#306) * Consolidated worlds into a single file * Added water and sky textures to underwater world * what * Remove random change (cherry picked from commit 5b34879) Co-authored-by: Evan Palmer <evanp922@gmail.com>
…Lab#311) (Robotic-Decision-Making-Lab#313) Bumps [express](https://github.com/expressjs/express) from 4.19.2 to 4.21.0. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/4.21.0/History.md) - [Commits](expressjs/express@4.19.2...4.21.0) --- updated-dependencies: - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 49a0fa2) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
) (Robotic-Decision-Making-Lab#317) * Added message transforms * Fixed launch file * cleanup launch file (cherry picked from commit 608e987) Co-authored-by: Evan Palmer <evanp922@gmail.com>
…Decision-Making-Lab#320) (Robotic-Decision-Making-Lab#321) * Fixed instances where old m2m api was used * precommit (cherry picked from commit 2d17d70) Co-authored-by: Evan Palmer <evanp922@gmail.com>
…Lab#325) (Robotic-Decision-Making-Lab#326) Bumps [docker/bake-action](https://github.com/docker/bake-action) from 5.7.0 to 5.9.0. - [Release notes](https://github.com/docker/bake-action/releases) - [Commits](docker/bake-action@v5.7.0...v5.9.0) --- updated-dependencies: - dependency-name: docker/bake-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 52a55f5) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…-Lab#329) (Robotic-Decision-Making-Lab#330) Bumps [docker/bake-action](https://github.com/docker/bake-action) from 5.9.0 to 5.10.0. - [Release notes](https://github.com/docker/bake-action/releases) - [Commits](docker/bake-action@v5.9.0...v5.10.0) --- updated-dependencies: - dependency-name: docker/bake-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 52048dc) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…obotic-Decision-Making-Lab#334) Bumps [cookie](https://github.com/jshttp/cookie) and [express](https://github.com/expressjs/express). These dependencies needed to be updated together. Updates `cookie` from 0.6.0 to 0.7.1 - [Release notes](https://github.com/jshttp/cookie/releases) - [Commits](jshttp/cookie@v0.6.0...v0.7.1) Updates `express` from 4.21.0 to 4.21.1 - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/4.21.1/History.md) - [Commits](expressjs/express@4.21.0...4.21.1) --- updated-dependencies: - dependency-name: cookie dependency-type: indirect - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit af36d6f) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…Lab#337) (Robotic-Decision-Making-Lab#338) Bumps [mermaid](https://github.com/mermaid-js/mermaid) from 10.9.1 to 10.9.3. - [Release notes](https://github.com/mermaid-js/mermaid/releases) - [Changelog](https://github.com/mermaid-js/mermaid/blob/develop/CHANGELOG.md) - [Commits](mermaid-js/mermaid@v10.9.1...v10.9.3) --- updated-dependencies: - dependency-name: mermaid dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit c598d42) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…sion-Making-Lab#340) (Robotic-Decision-Making-Lab#343) Bumps [http-proxy-middleware](https://github.com/chimurai/http-proxy-middleware) from 2.0.6 to 2.0.7. - [Release notes](https://github.com/chimurai/http-proxy-middleware/releases) - [Changelog](https://github.com/chimurai/http-proxy-middleware/blob/v2.0.7/CHANGELOG.md) - [Commits](chimurai/http-proxy-middleware@v2.0.6...v2.0.7) --- updated-dependencies: - dependency-name: http-proxy-middleware dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 86f394e) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This pull request is in conflict. Could you fix it @JBVAkshaya? |
Could you do a rebase off of main @JBVAkshaya? It looks like there are a lot of duplicate commits. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes Made
Multi-Robot support for Gazebo with SITL in ROS 2
Simulation Overview:
We use Ardusub SITL to establish a simulation pipeline that is close to real world setup for hardware-software integration. Ardusub SITL enables running this firmware in simulation to test software modules for control and motion planning. SITL helps to establish a working pipeline which can be easily ported to actual hardware. We use Gazebo as the flight dynamic model (FDM) that simulates the robot and onboard sensor in different environment conditions and configurations.
Simulator Implementation Details:
Ardupilot plugin for Gazebo utilizes internal simulation APIs to retrieve robot’s current state and execute vehicle commands. It communicates to the ArduSub SITL over UDP using IP protocol.
Ardusub SITL can be thought of as a virtual FCU. It is a sandwich module that communicates with both the Ardupilot gazebo plugin and ROS topics using MAVROS. mavros_node is a container node that launches
mavros_router
anduas_node
. It is configured for individual robot using a configuration file.Multi-Robot Simulation Parameter setup:
Gazebo:
Setup
fdm_in
andfdm_out
while loadingArdupilot plugin
.fdm_in = 9002, fdm_out=9003
fdm_in = 9012, fdm_out=9013
Mavros:
fcu_url : "tcp://localhost:5760”, gcs_url: “”, tgt_system: 1
fcu_url : "tcp://localhost:5770”, gcs_url: “”, tgt_system: 2
SITL:
ardusub -S -w -M JSON --defaults $(var ardusub_params_file) -I$(var ardusub_instance) --sysid $(var sysid_thismav) --home 44.65870,-124.06556,0.0,270.0
ardusub_instance=0, sysid_thismav=1
. Here connection address for tcp will be set to5760 + 10*0=5760
ardusub_instance=1, sysid_thismav=2
. Here connection address for tcp will be set to5760 + 10*1=5770
References:
Testing
Tested on iron. Teleop for multi-robot working fine.