Update main with SAR code#81
Merged
a-cires merged 18 commits intoumdloop:mainfrom Mar 9, 2026
Merged
Conversation
… into cyclonedds-nav2-2425
… into cyclonedds-nav2-2425
… into cyclonedds-nav2-2425
… into cyclonedds-nav2-2425
… into cyclonedds-nav2-2425
… into cyclonedds-nav2-2425
- Remove .txt log files - Revert .rviz file to main state - Remove equipment_servicing launch files - Revert nav2 launch file changes to main state
a-cires
requested changes
Mar 9, 2026
a-cires
approved these changes
Mar 9, 2026
mdurrani808
added a commit
that referenced
this pull request
Apr 7, 2026
* added cyclone dds config * updates for gps server * testing updates from 3am today * added base config * update nav2 local costmap * maybe update config * saving some leftover progress * fixes from the jetson * single launch file * Clean up upstream cyclonedds-nav2-2425 branch - Remove .txt log files - Revert .rviz file to main state - Remove equipment_servicing launch files - Revert nav2 launch file changes to main state * Revert nav2_params.yaml to main state * Respond to adrian comments, update file name, swap CAN IDs --------- Co-authored-by: UMDLoop Jetson Orin NX <umdloop@gmail.com> Co-authored-by: Adrian Cires <ciresadrian@hotmail.com>
a-cires
added a commit
to a-cires/athena-code
that referenced
this pull request
Apr 13, 2026
* added cyclone dds config * updates for gps server * testing updates from 3am today * added base config * update nav2 local costmap * maybe update config * saving some leftover progress * fixes from the jetson * single launch file * Clean up upstream cyclonedds-nav2-2425 branch - Remove .txt log files - Revert .rviz file to main state - Remove equipment_servicing launch files - Revert nav2 launch file changes to main state * Revert nav2_params.yaml to main state * Respond to adrian comments, update file name, swap CAN IDs --------- Co-authored-by: UMDLoop Jetson Orin NX <umdloop@gmail.com> Co-authored-by: Adrian Cires <ciresadrian@hotmail.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Identical to the cyclone-dds branch, except for:
removed the .txt files
ignored the .rviz file changes
Removed the equipment_servicing launch files. There shouldn't really exist, and were overwritten. Just Make a launch file that calls the drive {base/jetson} and arm {base/jetson} don't repeat them
ignored the nav2 launch file changes