Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/reuse-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -294,4 +294,4 @@ jobs:
shell: bash
run: |
docker image push ghcr.io/${{ github.repository_owner }}/adore:${BUILD_BRANCH}-${{ inputs.image_platform }}
make push_core_image
make push_image
4 changes: 2 additions & 2 deletions .tests
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,6 @@ wait_for_api_ready() {
# unset ROS_BENCHMARK_MAX_JITTER
# unset ROS_BENCHMARK_MAX_STD
#
exit $benchmark_exit_code
}
# exit $benchmark_exit_code
#}

16 changes: 16 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,22 @@ benchmark: ## Run the ROS Topic benchmark script
make run cmd="bash tools/ros_topic_benchmark.sh"; \
fi

.PHONY: push_image
push_image:
@echo "=== Pushing core image to registry ==="
GITHUB_REPO=$$(echo "${GITHUB_REPOSITORY}" | tr '[:upper:]' '[:lower:]'); \
REGISTRY_PREFIX="ghcr.io/$${GITHUB_REPO}/"; \
echo "Registry prefix: $${REGISTRY_PREFIX}"; \
if docker image inspect "${ADORE_CLI_CORE_IMAGE}" >/dev/null 2>&1; then \
echo "Tagging and pushing core environment: ${ADORE_CLI_CORE_IMAGE}"; \
docker tag "${ADORE_CLI_CORE_IMAGE}" "$${REGISTRY_PREFIX}${ADORE_CLI_CORE_IMAGE}"; \
docker push "$${REGISTRY_PREFIX}${ADORE_CLI_CORE_IMAGE}"; \
echo "✓ Pushed core environment"; \
else \
echo "✗ Core environment image not found locally"; \
fi


.PHONY: test
test: ci_test ## Run ADORe Unit Tests
cd tools/adore_cli && make test
Expand Down
4 changes: 2 additions & 2 deletions adore_scenarios/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ ros2 launch simulation_test.py
```
3. Open lichtblick (in another shell):
```bash
chromium http://localhost:8080/\?ds\=foxglove-websocket\&ds.url\=ws://localhost:8765\&layout\=Default.json
chromium http://localhost:8080//?ds=rosbridge-websocket&ds.url=ws://localhost:9090&ds\=rosbridge-websocket\&layout\=Default.json
```
or with a link:
[http://localhost:8080/?ds=foxglove-websocket&ds.url=ws://localhost:8765&layout=Default.json](http://localhost:8080/?ds=foxglove-websocket&ds.url=ws://localhost:8765&layout=Default.json)
[http://localhost:8080//?ds=rosbridge-websocket&ds.url=ws://localhost:9090&ds\=rosbridge-websocket\&layout\=Default.json](http://localhost:8080/?ds=rosbridge-websocket&ds.url=ws://localhost:9090&layout=Default.json)
Goal


Expand Down
8 changes: 6 additions & 2 deletions adore_scenarios/scenario_helpers/visualizer.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,18 @@ def create_visualization_nodes(whitelist, asset_folder, ns="ego_vehicle", use_ce
return [
Node(
package='foxglove_bridge',
namespace='global',
executable='foxglove_bridge',
name='foxglove_bridge',
output='screen',
emulate_tty=True,
parameters=[
{'port': port},
{'send_buffer_limit': send_buffer_limit}
{'send_buffer_limit': send_buffer_limit},
{'use_compression': False} # Try disabling compression
],
arguments=['--ros-args', '--log-level', 'info'],
respawn=True,
respawn_delay=2.0
),
Node(
package='visualizer',
Expand Down
9 changes: 8 additions & 1 deletion documentation/.aspell.en.pws
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
personal_ws-1.1 en 129 utf-8
colcon
ADORe's
executables
teardown
benchmarking
GTest
ADORe
ADORes
pytest
Async
Abulehia
Anas
BUFWu
Expand Down
39 changes: 0 additions & 39 deletions documentation/mkdocs/img/DLR_Logo.svg

This file was deleted.

Binary file not shown.
Binary file not shown.
4 changes: 4 additions & 0 deletions documentation/mkdocs/mkdocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ nav:
- ADORe CLI:
- ADORe CLI: generated/adore_cli/README.md
- Multi-arch Build Support: system_and_development/multiarch_support.md
- Testing:
- System Testing: system_and_development/system_tests.md
- ROS Unit Testing: system_and_development/ros_unit_testing.md
- C++ Library Testing: system_and_development/library_testing.md
- Submodules: generated/modules/modules.md
- Troubleshooting: problems_and_solutions.md
- Licensing: licensing.md
Expand Down
2 changes: 1 addition & 1 deletion documentation/technical_reference_manual/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ automated vehicles. It is developed by [The German Aerospace Center (DLR), Insti
- ADORe is developed with algorithms and data models applied in real automated driving system for motion planning and control
- ADORe features mechanisms for safe interaction with other CAVs, infrastructure, traffic management, interactions with human-driven vehicles, bicyclists, pedestrians

ADORe is designed around both single agent automated driving (SAAD) and multi agent automated driving (MAAD), to allow both individual and cooperative driving behaviors. ADORes features can be separated into the following categories.
ADORe is designed around both single agent automated driving (SAAD) and multi agent automated driving (MAAD), to allow both individual and cooperative driving behaviors. ADORe's features can be separated into the following categories.

![ADORe Overview](/img/adore_categories_overview.svg)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,13 @@ make build
> **ℹ️INFO:** On first run of the ADORe CLI the entire system will be built.
> Initial build can take 10-15 minutes depending on system and network.

> **⚠️ WARNING:**
> Building ADORe **will** fail until all submodules have been properly initialized.
> If cloning or repository initialization fails refer to the
> [troubleshooting](../problems_and_solutions.md) guide before proceeding.
> Do not proceed with building ADORe until `git submodule update --init --receive`
> finishes without error.

## Running ADORe
After cloning and satisfying all system prerequisites and building ADORe
you can start the ADORe CLI interactive shell docker context.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ see the [ADORe Lichtblick-Suite README 🔗](../generated/visualization/lichtbli
```bash
make cli
cd adore_scenarios/simulation_scenarios
ros2 launch simulation_test.py
ros2 launch simulation_test.launch.py
```

3. Open lichtblick (in another shell):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,25 @@ cd ros2_workspace && make build_single_core


## Problem: Build exits with undefined targets
Build fails with missing or undefined targets:
Build fails with missing or undefined targets or directories:
```
cd ros2_observer && make clean
make[2]: * No rule to make target 'clean'. Stop.
make[1]: * [Makefile:42: clean] Error 2
make: *** [Makefile:72: clean] Error 2
```
or
```
docker cp $(docker create --rm helix:latest):/helix/ "./build"
Successfully copied 15MB to /home/ts-labs0019/Projects/adore/vendor/helix/build
mkdir -p build
cp mathematics_toolbox/eigen/build build/eigen -r
cp: cannot stat 'mathematics_toolbox/eigen/build': No such file or directory
make[1]: * [Makefile:19: build] Error 1
make: * [Makefile:56: build_vendor_libraries] Error 2
➜ adore git:(develop)
```

The ADORe repositories uses git submodules, if they fail to clone or update
this will cause other activities to fail.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,13 @@
********************************************************************************
-->
# Anonymous Cloning
In order to make development more friendly nearly all git submodules are
configured to use git over ssh via the .gitmodules. The downside of this is that
GitHub requires account keys to be configured to in order to clone the repository.
If you attempt to clone without configuring your account keys you will receive

In order to make development more friendly nearly all git submodules are
configured to use git over ssh via the `.gitmodules`. The downside of this is that
GitHub requires account keys to be configured in order to clone the repository.


If you attempt to clone without configuring your account keys you will receive
the following error:

```bash
Expand All @@ -34,23 +37,65 @@ Please make sure you have the correct access rights
and the repository exists.
```

## Anonymous Cloning Over HTTPS
## Anonymous Cloning Over HTTPS **GLOBAL**

You can configure git to exclusively use https. This can be done with the
You can configure git to exclusively use HTTPS. This can be done with the
following commands:

```bash
git config --global url."https://github.com/".insteadOf git@github.com:
git config --global url."https://".insteadOf git://
```

Next, you can clone the repository as normal except use https:
Next, you can clone the repository as normal except use HTTPS:

```bash
git clone --recurse-submodules -j$(nproc) https://github.com/eclipse-adore/adore.git
```

To undo these global configuration changes you can run:

```bash
git config --global --unset url."git@github.com:".insteadof
git config --global --unset url."git://".insteadof
```

## Anonymous Cloning Without Global Configuration

If you prefer not to modify your global git settings, you can configure HTTPS
rewrites **only for this repository** after cloning:

```bash
git clone https://github.com/eclipse-adore/adore.git
cd adore
git config url."https://github.com/".insteadOf git@github.com:
git config url."https://".insteadOf git://
git submodule update --init --recursive
```

This will update the repository’s local `.git/config` file, allowing submodules
to be fetched over HTTPS without requiring SSH keys or affecting other projects.

You can verify the settings with:

```bash
git config --local --list | grep insteadOf
```

To remove the local configuration later, run:

```bash
git config --unset url."git@github.com:".insteadof
git config --unset url."git://".insteadof
```

# Tips
Building ADORe **will** fail until all submodules have been properly initialized.
If cloning or repository initialization fails refer to the
[troubleshooting](../problems_and_solutions.md) guide before proceeding.

> **⚠️ WARNING:**
> Do not proceed with building ADORe until `git submodule update --init --receive`
> finishes without error.


Loading
Loading