Skip to content

Commit 9f5c99c

Browse files
authored
Merge branch 'development' into feat/manipulation-improvements
2 parents ec8d67c + 9a752f0 commit 9f5c99c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1600
-789
lines changed

.github/workflows/poetry-test.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ jobs:
4949
run: |
5050
rosdep update
5151
52+
- name: Import ros2 dependencies
53+
shell: bash
54+
run: |
55+
vcs import . < ros_deps.repos
56+
5257
- name: Install ROS 2 package dependencies
5358
shell: bash
5459
run: |
@@ -64,6 +69,5 @@ jobs:
6469
- name: Run tests
6570
shell: bash
6671
run: |
67-
source /opt/ros/${{ matrix.ros_distro }}/setup.bash
68-
source install/setup.bash
69-
poetry run pytest -m "not billable"
72+
source setup_shell.sh
73+
pytest -m "not billable"

.github/workflows/pre-commit.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,30 @@ on:
99

1010
jobs:
1111
pre-commit:
12-
runs-on: ubuntu-24.04
12+
runs-on:
13+
- self-hosted
14+
15+
container:
16+
image: osrf/ros:humble-desktop-full
1317

1418
steps:
19+
- name: Install pre-commit
20+
run: |
21+
apt update && apt install -y python3-pip shellcheck python-is-python3
22+
1523
- name: Checkout code
1624
uses: actions/checkout@v4
1725
with:
1826
fetch-depth: 0
1927

28+
- run: |
29+
git config --global --add safe.directory /__w/rai/rai
30+
31+
- name: Import ros2 dependencies
32+
shell: bash
33+
run: |
34+
vcs import . < ros_deps.repos
35+
2036
- name: Run pre-commit
2137
uses: pre-commit/[email protected]
2238
with:

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ log/
1515
# Distribution / packaging
1616
.Python
1717
build/
18-
develop-eggs/
19-
dist/
18+
develop-eggs/ dist/
2019
downloads/
2120
eggs/
2221
.eggs/
@@ -31,6 +30,7 @@ share/python-wheels/
3130
.installed.cfg
3231
*.egg
3332
MANIFEST
33+
dist/
3434

3535
# PyInstaller
3636
# Usually these files are written by a python script from a template
@@ -176,6 +176,7 @@ artifact_database.pkl
176176
imgui.ini
177177

178178
src/rai_bench/rai_bench/experiments
179+
src/rai_interfaces
179180

180181
# Demo assets
181182
demo_assets/

docs/API_documentation/connectors/overview.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,9 @@ Extends BaseConnector with Human-Robot Interaction capabilities:
4040

4141
### Concrete Implementations
4242

43-
| Connector | Description | Documentation Link |
44-
| ---------------------- | -------------------------------------- | ------------------------------------------ |
45-
| ROS 2 Connectors | Robot Operating System 2 integration | [ROS2 Connectors](./ROS_2_Connectors.md) |
46-
| Sound Device Connector | Audio streaming and playback/recording | [Sound Device Connector](./sounddevice.md) |
43+
| Connector | Description | Documentation Link |
44+
| ---------------- | ------------------------------------ | ---------------------------------------- |
45+
| ROS 2 Connectors | Robot Operating System 2 integration | [ROS2 Connectors](./ROS_2_Connectors.md) |
4746

4847
## Key Features
4948

@@ -89,10 +88,9 @@ Connectors implement thread-safe operations:
8988

9089
## Usage Examples
9190

92-
| Connector | Example Usage Documentation |
93-
| ------------ | -------------------------------------------------------- |
94-
| ROS 2 | [ROS2 Connectors](./ROS_2_Connectors.md#example-usage) |
95-
| Sound Device | [Sound Device Connector](./sounddevice.md#example-usage) |
91+
| Connector | Example Usage Documentation |
92+
| --------- | ------------------------------------------------------ |
93+
| ROS 2 | [ROS2 Connectors](./ROS_2_Connectors.md#example-usage) |
9694

9795
## Error Handling
9896

docs/demos/agriculture.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,21 @@ optimally by calling the RAI agent to decide what to do.
1515
Ensure that every command is run in a sourced shell using `source setup_shell.sh`
1616
Ensure ROS 2 is sourced.
1717

18-
1. **Download the Latest Release**
18+
1. Follow the RAI setup instructions in the [quick setup guide](../setup/install.md#setting-up-developer-environment).
19+
20+
2. Download the Latest Release
1921

2022
```bash
2123
./scripts/download_demo.sh agriculture
2224
```
2325

24-
2. **Run the Simulation**
26+
3. Run the Simulation
2527

2628
```bash
2729
./demo_assets/agriculture/RAIAgricultureDemo/RAIAgricultureDemo.GameLauncher -bg_ConnectToAssetProcessor=0
2830
```
2931

30-
3. **Start the Tractor Node**
32+
4. Start the Tractor Node
3133

3234
```bash
3335
python examples/agriculture-demo.py --tractor_number 1

docs/demos/debugging_assistant.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ where you can ask questions about your ROS 2 setup and execute common debugging
1818

1919
## Running the Assistant
2020

21-
1. Make sure you have RAI installed and configured according to the
22-
[quick setup guide](../setup/install.md)
21+
1. Follow the RAI setup instructions in the [quick setup guide](../setup/install.md#setting-up-developer-environment).
2322

2423
2. Launch the debugging assistant:
2524

docs/demos/manipulation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ manipulation techniques.
1818

1919
Make sure ROS 2 is sourced. (e.g. `source /opt/ros/humble/setup.bash`)
2020

21-
1. Follow the RAI setup instructions in the [quick setup guide](../setup/install.md).
21+
1. Follow the RAI setup instructions in the [quick setup guide](../setup/install.md#setting-up-developer-environment).
2222
2. Download additional dependencies:
2323

2424
```shell

docs/demos/overview.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,6 @@ All demos require:
1616
- ROS 2 (Humble or Jazzy)
1717
- RAI platform setup
1818

19+
Make sure to follow the [installation instructions](../setup/install.md).
20+
1921
For detailed setup and running instructions, please refer to the individual demo documentation linked above.

docs/demos/rosbot_xl.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,15 @@ platform in a nice apartment.
1616

1717
Make sure ROS 2 is sourced. (e.g. `source /opt/ros/humble/setup.bash`)
1818

19-
1. Download the newest binary release:
19+
1. Follow the RAI setup instructions in the [quick setup guide](../setup/install.md#setting-up-developer-environment).
20+
21+
2. Download the newest binary release:
2022

2123
```bash
2224
./scripts/download_demo.sh rosbot
2325
```
2426

25-
2. Install and download required packages
27+
3. Install and download required packages
2628

2729
```bash
2830
sudo apt install ros-${ROS_DISTRO}-navigation2 ros-${ROS_DISTRO}-nav2-bringup

docs/imgs/manipulation_benchmark.png

86.4 KB
Loading

0 commit comments

Comments
 (0)