Skip to content

Commit

Permalink
Merge and fix conflicts.
Browse files Browse the repository at this point in the history
Signed-off-by: Carlos Agüero <[email protected]>
  • Loading branch information
caguero committed Dec 17, 2023
2 parents 5f4bedc + 9a94947 commit 915cbee
Show file tree
Hide file tree
Showing 122 changed files with 10,196 additions and 4,199 deletions.
34 changes: 34 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

**Describe the bug**
Please say what is broken. Include whether you think this is a problem with the code or the documentation / tutorials.

**Expected behavior**
What you expected to happen.

**To Reproduce**
List the steps to reproduce the problem:
1. Run '...'
2. Next, run '....'
3. See error

**System Configuration:**
Tell us about your system.
- OS: [e.g. Ubuntu 22.04]
- ROS Version: [e.g. ROS 2, Humble]
- Gazebo Version: [e.g. Gazebo Sim 7.0.0]
- Graphics Card: [e.g. Nvidia GTX 650]
- Are you using VRX or VRX Classic? (The default is VRX).

**Screenshots**
If applicable, add screenshots to help explain your problem. (If the problem is terminal output, it is better to cut and paste the text than to take a screenshot.)

**Additional notes**
Add any other context about the problem here.
31 changes: 13 additions & 18 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,31 @@ name: Ubuntu CI
on: [pull_request]

jobs:
test-fortress-galactic:
test-humble-garden:

runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
container:
image: npslearninglab/watery_robots:humble_current
steps:
- run: sudo chown -R `whoami`:`whoami` .
- name: Checkout vrx
uses: actions/checkout@v2.4.0
uses: actions/checkout@v3
with:
ref: main
path: vrx

- name: Checkout Gazebosim
uses: actions/[email protected]
with:
repository: gazebosim/ros_gz
ref: humble
path: ros_gz

- name: Create developer user
run: |
useradd -m -u 1001 developer;
- name: Set up workspace
run: |
mkdir -p /tmp/vrx_ws/src;
ln -s `pwd` /tmp/vrx_ws/src;
mkdir -p /home/developer/vrx_ws/src;
mv vrx /home/developer/vrx_ws/src;
chown -R developer:developer /home/developer;
- name: Build and run tests
shell: bash
run: |
cd /tmp/vrx_ws;
source /opt/ros/humble/setup.bash;
GZ_VERSION=garden colcon build --merge-install --executor sequential;
GZ_VERSION=garden colcon test --merge-install --executor sequential --packages-skip-regex ros_gz* --return-code-on-test-failure --event-handlers console_direct+;
cd /home/developer/vrx_ws;
su -s /bin/bash -c "source /opt/ros/humble/setup.bash && colcon build --merge-install --executor sequential" developer;
su -s /bin/bash -c "source /opt/ros/humble/setup.bash && colcon test --merge-install --executor sequential --packages-skip-regex ros_gz* --return-code-on-test-failure --event-handlers console_direct+" developer;
109 changes: 109 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,114 @@
## VRX 2

### VRX 2.3.3

1. Initialize acoustic perception score
* [Pull Request 747](https://github.com/osrf/vrx/pull/747)
1. Fix score in follow-the-path
* [Pull Request 748](https://github.com/osrf/vrx/pull/748)
1. Add extra models and extra bridge worlds
* [Pull Request 745](https://github.com/osrf/vrx/pull/745)

### VRX 2.3.2

1. Update camera clip
* [Pull Request 728](https://github.com/osrf/vrx/pull/728)
1. Buoy update
* [Pull Request 727](https://github.com/osrf/vrx/pull/727)
1. Fix GPS/IMU update rates
* [Pull Request 723](https://github.com/osrf/vrx/pull/723)
1. Add license
* [Pull Request 720](https://github.com/osrf/vrx/pull/720)

### VRX 2.3.1

1. Fix simulation crash
* [Pull Request 706](https://github.com/osrf/vrx/pull/706)

1. Set IMU to reflect sensor position in global coordinates
* [Pull Request 708](https://github.com/osrf/vrx/pull/708)

1. Updated code to use angle as input for wavefield parameter direction
* [Pull Request 708](https://github.com/osrf/vrx/pull/709)

1. Create competition_mode argument
* [Pull Request 710](https://github.com/osrf/vrx/pull/710)

1. Resolve TF issues and enable RViz
* [Pull Request 698](https://github.com/osrf/vrx/pull/698)

1. Multi-vehicle fix
* [Pull Request 644](https://github.com/osrf/vrx/pull/644)

### VRX 2.3.0

1. Enhancements to Perception Task
* [Pull Request 699](https://github.com/osrf/vrx/pull/699)

1. Infrastructure updates
* [Pull Request 694](https://github.com/osrf/vrx/pull/694)
* [Pull Request 688](https://github.com/osrf/vrx/pull/688)
* [Pull Request 682](https://github.com/osrf/vrx/pull/682)
* [Pull Request 671](https://github.com/osrf/vrx/pull/671)
* [Pull Request 663](https://github.com/osrf/vrx/pull/663)
* [Pull Request 661](https://github.com/osrf/vrx/pull/661)
* [Pull Request 658](https://github.com/osrf/vrx/pull/658)

1. Acoustic pinger updates
* [Pull Request 692](https://github.com/osrf/vrx/pull/692)
* [Pull Request 669](https://github.com/osrf/vrx/pull/669)

1. Environmental updates
* [Pull Request 686](https://github.com/osrf/vrx/pull/686)
* [Pull Request 678](https://github.com/osrf/vrx/pull/678)
* [Pull Request 668](https://github.com/osrf/vrx/pull/668)

### VRX 2.2.0

1. Restore USVWind model
* [Pull Request 637](https://github.com/osrf/vrx/pull/637)
* [Pull Request 642](https://github.com/osrf/vrx/pull/642)
* [Pull Request 649](https://github.com/osrf/vrx/pull/649)

1. Finalized scoring for Follow-the-path
* [Pull Request 635](https://github.com/osrf/vrx/pull/635)

1. Enhancements to Wildlife Encounter Task
* [Pull Request 630](https://github.com/osrf/vrx/pull/630)
* [Pull Request 634](https://github.com/osrf/vrx/pull/634)

1. Infrastructure updates
* [Pull Request 628](https://github.com/osrf/vrx/pull/628)
* [Pull Request 656](https://github.com/osrf/vrx/pull/656)

### VRX 2.1.0
1. Acoustic Perception Task
* [Pull Request 609](https://github.com/osrf/vrx/pull/609)

1. Follow the Path Task
* [Pull Request 610](https://github.com/osrf/vrx/pull/610)

1. Acoustic Tracking Task
* [Pull Request 614](https://github.com/osrf/vrx/pull/614)

1. VRX 2023 Practice Worlds
* [Pull Request 582](https://github.com/osrf/vrx/pull/582)
* [Pull Request 583](https://github.com/osrf/vrx/pull/583)
* [Pull Request 584](https://github.com/osrf/vrx/pull/584)
* [Pull Request 585](https://github.com/osrf/vrx/pull/585)
* [Pull Request 591](https://github.com/osrf/vrx/pull/591)

1. Nathan Benderson Park World for RoboBoat
* [Pull Request 588](https://github.com/osrf/vrx/pull/588)

1. Bug Fixes and Cleanup
* [Pull Request 578](https://github.com/osrf/vrx/pull/578)
* [Pull Request 597](https://github.com/osrf/vrx/pull/597)
* [Pull Request 598](https://github.com/osrf/vrx/pull/598)
* [Pull Request 615](https://github.com/osrf/vrx/pull/615)
* [Pull Request 625](https://github.com/osrf/vrx/pull/625)
* [Pull Request 627](https://github.com/osrf/vrx/pull/627)

### VRX 2.0.0
1. Port VRX Core Functionality to Gazebo Sim
* [Pull Request 474](https://github.com/osrf/vrx/pull/474)
Expand Down
178 changes: 178 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,178 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS


2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ The VRX environment is also the "virtual venue" for the [VRX Competition](https:

## Getting Started

* Watch the [Release 1.5 Highlight Video](https://youtu.be/-2BP2P3CHYw) (Update for release 2.0 coming soon!)
* Watch the [Release 2.3 Highlight Video](https://vimeo.com/851696025).
* The [VRX Wiki](https://github.com/osrf/vrx/wiki) provides documentation and tutorials.
* The instructions assume a basic familiarity with the ROS environment and Gazebo. If these tools are new to you, we recommend starting with the excellent [ROS Tutorials](http://wiki.ros.org/ROS/Tutorials)
* For technical problems, please use the [project issue tracker](https://github.com/osrf/vrx/issues) to describe your problem or request support.
Expand Down
Loading

0 comments on commit 915cbee

Please sign in to comment.