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
15 changes: 12 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,15 @@
[submodule "vendor/adore_model_checker"]
path = vendor/adore_model_checker
url = git@github.com:DLR-TS/adore_model_checker.git
[submodule "ros2_workspace/src/adore_ros2_nodes/operational_design_domain"]
path = ros2_workspace/src/adore_ros2_nodes/operational_design_domain
url = git@github.com:DLR-TS/operational_design_domain.git
[submodule "ros2_workspace/src/vendor/open_odd"]
path = ros2_workspace/src/vendor/open_odd
url = git@github.com:DLR-TS/open_odd.git
[submodule "ros2_workspace/src/vendor/open_odd_ros2_msgs"]
path = ros2_workspace/src/vendor/open_odd_ros2_msgs
url = git@github.com:DLR-TS/open_odd_ros2_msgs.git
[submodule "ros2_workspace/src/vendor/open_odd_ros2_conversions"]
path = ros2_workspace/src/vendor/open_odd_ros2_conversions
url = git@github.com:DLR-TS/open_odd_ros2_conversions.git
[submodule "ros2_workspace/src/adore_ros2_nodes/adore_odd_monitor"]
path = ros2_workspace/src/adore_ros2_nodes/odd_monitor
url = git@github.com:DLR-TS/adore_odd_monitor.git
3 changes: 3 additions & 0 deletions THIRD-PARTY.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ Paths indicate where the content lives in this repository or how it is consumed
| Tracecompass | Eclipse Public License 2.0 | `vendor/ros2_observer/trace_compass` | https://github.com/eclipse-tracecompass/org.eclipse.tracecompass |
| lttng-scope | Eclipse Public License 1.0 | `vendor/ros2_observer/lttng_scope` | https://github.com/lttng/lttng-scope |
| caches | BSD 3-Clause License | `vendor/caches/LICENSE.md` | https://github.com/s0nofab1t/caches (fork of https://github.com/vpetrigo/caches) |
| open_odd | Apache License 2.0 | `ros2_workspace/src/vendor/open_odd/LICENSE.md` | https://github.com/DLR-TS/open_odd |
| open_odd_ros2_msgs | Apache License 2.0 | `ros2_workspace/src/vendor/open_odd_ros2_msgs/LICENSE.md` | https://github.com/DLR-TS/open_odd_ros2_msgs |
| open_odd_ros2_conversionss | Apache License 2.0 | `ros2_workspace/src/vendor/open_odd_ros2_conversions/LICENSE.md` | https://github.com/DLR-TS/open_odd_ros2_conversions |

---

Expand Down
6 changes: 0 additions & 6 deletions adore_scenarios/assets/odd/simulation_odd.json

This file was deleted.

14 changes: 14 additions & 0 deletions adore_scenarios/assets/odd/simulation_odd.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
id: simulation_odd
taxonomy:
- path: vehicle.speed
comparison: less_or_equal
value: 70.0
- path: environment.road.width
comparison: greater_or_equal
value: 2.0
- path: vehicle.base.operational_hour_of_the_day
comparison: greater_or_equal
value: 0
- path: vehicle.base.operational_hour_of_the_day
comparison: less_or_equal
value: 24
2 changes: 1 addition & 1 deletion ros2_workspace/src/adore_ros2_msgs
Submodule adore_ros2_msgs updated 1 files
+0 −3 msg/Odd.msg
1 change: 1 addition & 0 deletions ros2_workspace/src/adore_ros2_nodes/odd_monitor
Submodule odd_monitor added at 0b4bd6
Submodule operational_design_domain deleted from b351ea
1 change: 1 addition & 0 deletions ros2_workspace/src/vendor/open_odd
Submodule open_odd added at ba0bd8
1 change: 1 addition & 0 deletions ros2_workspace/src/vendor/open_odd_ros2_conversions
1 change: 1 addition & 0 deletions ros2_workspace/src/vendor/open_odd_ros2_msgs
Submodule open_odd_ros2_msgs added at c9838a
Loading