Skip to content

Commit

Permalink
Merge branch 'master' into feature/time-to-collision-condition
Browse files Browse the repository at this point in the history
  • Loading branch information
yamacir-kit authored Sep 25, 2024
2 parents 6da0744 + f0b2eb3 commit 79ec36a
Show file tree
Hide file tree
Showing 84 changed files with 17,283 additions and 144 deletions.
30 changes: 30 additions & 0 deletions common/math/arithmetic/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,36 @@ Changelog for package arithmetic
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

4.3.2 (2024-09-24)
------------------
* Merge branch 'master' into fix/imu_frame
* Merge branch 'master' into fix/imu_frame
* Contributors: Kotaro Yoshimoto

4.3.1 (2024-09-19)
------------------
* Merge branch 'master' into fix/fix-eigen-variable-definition
* Merge branch 'master' into fix/fix-eigen-variable-definition
* Merge branch 'master' into fix/fix-eigen-variable-definition
* Merge branch 'master' into fix/fix-eigen-variable-definition
* Contributors: Masaya Kataoka

4.3.0 (2024-09-19)
------------------
* Merge branch 'master' into RJD-1201/documentation_update
* Contributors: SzymonParapura

4.2.9 (2024-09-19)
------------------
* Merge branch 'master' into RJD-1197/distance
* Merge branch 'master' into RJD-1197/distance
* resolve conflict
* Merge branch 'master' into RJD-1197/distance
* Contributors: Michał Ciasnocha, robomic

4.2.8 (2024-09-18)
------------------

4.2.7 (2024-09-13)
------------------

Expand Down
2 changes: 1 addition & 1 deletion common/math/arithmetic/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>arithmetic</name>
<version>4.2.7</version>
<version>4.3.2</version>
<description>arithmetic library for scenario_simulator_v2</description>
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
<license>Apache License 2.0</license>
Expand Down
30 changes: 30 additions & 0 deletions common/math/geometry/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,36 @@ Changelog for package geometry
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

4.3.2 (2024-09-24)
------------------
* Merge branch 'master' into fix/imu_frame
* Merge branch 'master' into fix/imu_frame
* Contributors: Kotaro Yoshimoto

4.3.1 (2024-09-19)
------------------
* Merge branch 'master' into fix/fix-eigen-variable-definition
* Merge branch 'master' into fix/fix-eigen-variable-definition
* Merge branch 'master' into fix/fix-eigen-variable-definition
* Merge branch 'master' into fix/fix-eigen-variable-definition
* Contributors: Masaya Kataoka

4.3.0 (2024-09-19)
------------------
* Merge branch 'master' into RJD-1201/documentation_update
* Contributors: SzymonParapura

4.2.9 (2024-09-19)
------------------
* Merge branch 'master' into RJD-1197/distance
* Merge branch 'master' into RJD-1197/distance
* resolve conflict
* Merge branch 'master' into RJD-1197/distance
* Contributors: Michał Ciasnocha, robomic

4.2.8 (2024-09-18)
------------------

4.2.7 (2024-09-13)
------------------

Expand Down
2 changes: 1 addition & 1 deletion common/math/geometry/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>geometry</name>
<version>4.2.7</version>
<version>4.3.2</version>
<description>geometry math library for scenario_simulator_v2 application</description>
<maintainer email="[email protected]">Masaya Kataoka</maintainer>
<license>Apache License 2.0</license>
Expand Down
30 changes: 30 additions & 0 deletions common/scenario_simulator_exception/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,36 @@ Changelog for package scenario_simulator_exception
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

4.3.2 (2024-09-24)
------------------
* Merge branch 'master' into fix/imu_frame
* Merge branch 'master' into fix/imu_frame
* Contributors: Kotaro Yoshimoto

4.3.1 (2024-09-19)
------------------
* Merge branch 'master' into fix/fix-eigen-variable-definition
* Merge branch 'master' into fix/fix-eigen-variable-definition
* Merge branch 'master' into fix/fix-eigen-variable-definition
* Merge branch 'master' into fix/fix-eigen-variable-definition
* Contributors: Masaya Kataoka

4.3.0 (2024-09-19)
------------------
* Merge branch 'master' into RJD-1201/documentation_update
* Contributors: SzymonParapura

4.2.9 (2024-09-19)
------------------
* Merge branch 'master' into RJD-1197/distance
* Merge branch 'master' into RJD-1197/distance
* resolve conflict
* Merge branch 'master' into RJD-1197/distance
* Contributors: Michał Ciasnocha, robomic

4.2.8 (2024-09-18)
------------------

4.2.7 (2024-09-13)
------------------

Expand Down
2 changes: 1 addition & 1 deletion common/scenario_simulator_exception/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>scenario_simulator_exception</name>
<version>4.2.7</version>
<version>4.3.2</version>
<description>Exception types for scenario simulator</description>
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
<license>Apache License 2.0</license>
Expand Down
30 changes: 30 additions & 0 deletions common/simple_junit/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,36 @@ Changelog for package junit_exporter
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

4.3.2 (2024-09-24)
------------------
* Merge branch 'master' into fix/imu_frame
* Merge branch 'master' into fix/imu_frame
* Contributors: Kotaro Yoshimoto

4.3.1 (2024-09-19)
------------------
* Merge branch 'master' into fix/fix-eigen-variable-definition
* Merge branch 'master' into fix/fix-eigen-variable-definition
* Merge branch 'master' into fix/fix-eigen-variable-definition
* Merge branch 'master' into fix/fix-eigen-variable-definition
* Contributors: Masaya Kataoka

4.3.0 (2024-09-19)
------------------
* Merge branch 'master' into RJD-1201/documentation_update
* Contributors: SzymonParapura

4.2.9 (2024-09-19)
------------------
* Merge branch 'master' into RJD-1197/distance
* Merge branch 'master' into RJD-1197/distance
* resolve conflict
* Merge branch 'master' into RJD-1197/distance
* Contributors: Michał Ciasnocha, robomic

4.2.8 (2024-09-18)
------------------

4.2.7 (2024-09-13)
------------------

Expand Down
2 changes: 1 addition & 1 deletion common/simple_junit/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>simple_junit</name>
<version>4.2.7</version>
<version>4.3.2</version>
<description>Lightweight JUnit library for ROS 2</description>
<maintainer email="[email protected]">Masaya Kataoka</maintainer>
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
Expand Down
30 changes: 30 additions & 0 deletions common/status_monitor/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,36 @@ Changelog for package status_monitor
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

4.3.2 (2024-09-24)
------------------
* Merge branch 'master' into fix/imu_frame
* Merge branch 'master' into fix/imu_frame
* Contributors: Kotaro Yoshimoto

4.3.1 (2024-09-19)
------------------
* Merge branch 'master' into fix/fix-eigen-variable-definition
* Merge branch 'master' into fix/fix-eigen-variable-definition
* Merge branch 'master' into fix/fix-eigen-variable-definition
* Merge branch 'master' into fix/fix-eigen-variable-definition
* Contributors: Masaya Kataoka

4.3.0 (2024-09-19)
------------------
* Merge branch 'master' into RJD-1201/documentation_update
* Contributors: SzymonParapura

4.2.9 (2024-09-19)
------------------
* Merge branch 'master' into RJD-1197/distance
* Merge branch 'master' into RJD-1197/distance
* resolve conflict
* Merge branch 'master' into RJD-1197/distance
* Contributors: Michał Ciasnocha, robomic

4.2.8 (2024-09-18)
------------------

4.2.7 (2024-09-13)
------------------

Expand Down
2 changes: 1 addition & 1 deletion common/status_monitor/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>status_monitor</name>
<version>4.2.7</version>
<version>4.3.2</version>
<description>none</description>
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
<license>Apache License 2.0</license>
Expand Down
Binary file added docs/image/cpp_scenario_launch.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/image/cpp_scenario_result.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/image/locale_verification.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/image/random_test_runner_launch.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/image/random_test_runner_result.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/image/scenario_test_runner_launch.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/image/scenario_test_runner_result.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/image/ss2_autoware_build_result.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/image/ss2_build_result.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
115 changes: 80 additions & 35 deletions docs/user_guide/BuildInstructions.md
Original file line number Diff line number Diff line change
@@ -1,51 +1,96 @@
# Build Instructions

This setup instruction is based on ROS 2 humble.
These setup instructions guide you through the process of building **Scenario Simulator v2**, which currently supports **ROS 2 Humble Hawksbill**.

## Setup ROS 2 environment

This framework only supports ROS 2 Galactic Geochelone now. (We are planning to support ROS 2 Humble Hawksbill)
You can install Galactic by executing the command below in your terminal.
1. Configure the locale.
Ensure that your system is configured with a locale that supports UTF-8.

```bash
sudo apt update && sudo apt install locales
sudo locale-gen en_US en_US.UTF-8
sudo update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8
export LANG=en_US.UTF-8
```

Verify that the locale is properly set:
```bash
locale
```
![Locale Verification](../image/locale_verification.png)
<br>*The expected result after running the `locale` command should look like this, with `LANG` set to `en_US.UTF-8` by default.*

3. Enable the Ubuntu Universe repository.
```bash
sudo apt install software-properties-common
sudo add-apt-repository universe
```

4. Add the ROS 2 GPG key.
```bash
sudo apt update && sudo apt install curl -y
sudo curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg
```

5. Add the ROS 2 repository to the system's package sources list.
```bash
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu $(. /etc/os-release && echo $UBUNTU_CODENAME) main" | sudo tee /etc/apt/sources.list.d/ros2.list > /dev/null
```
6. Install ROS 2 Humble Desktop.
```bash
sudo apt update
sudo apt install ros-humble-desktop
```
7. Install development tools.
```bash
sudo apt install ros-dev-tools
```
!!! info
For more detailed information, refer to the [ROS 2 Humble Installation Guide](https://docs.ros.org/en/humble/Installation.html).
```bash
sudo apt update
sudo apt install locales
sudo locale-gen en_US en_US.UTF-8
sudo update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8
export LANG=en_US.UTF-8
sudo apt update
sudo apt install curl gnupg2 lsb-release
curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | sudo apt-key add -
sudo sh -c 'echo "deb [arch=$(dpkg --print-architecture)] http://packages.ros.org/ros2/ubuntu $(lsb_release -cs) main" > /etc/apt/sources.list.d/ros2-latest.list'
sudo apt update
sudo apt install ros-humble-desktop
source /opt/ros/humble/setup.bash
sudo apt install -y python3-pip python3-rosdep2 python3-vcstool python3-colcon-common-extensions
rosdep update
```
reference : <https://docs.ros.org/en/humble/Installation.html>
## Setup workspace
```bash
mkdir -p ~/scenario_simulator_ws/src
cd ~/scenario_simulator_ws/src
git clone https://github.com/tier4/scenario_simulator_v2.git
# These lines are necessary right now, but it will be removed in the near future
cd scenario_simulator_v2
# This script clones the part of the source codes in Autoware and add it to the workspace
vcs import external < dependency_humble.repos
```
1. Create the workspace directory.
```bash
mkdir -p ~/scenario_simulator_ws/src
cd ~/scenario_simulator_ws/src
```
2. Clone the Scenario Simulator repository.
```bash
git clone https://github.com/tier4/scenario_simulator_v2.git
cd scenario_simulator_v2
```
3. Import Autoware dependencies.
```bash
vcs import external < dependency_humble.repos
```
## Install dependencies via rosdep
```bash
cd ~/scenario_simulator_ws
source /opt/ros/humble/setup.bash
rosdep install -iry --from-paths src/scenario_simulator_v2 --rosdistro humble
```
1. Move to the workspace directory.
```bash
cd ~/scenario_simulator_ws
```
## Build scenario_simulator_v2
2. Source the ROS 2 environment.
```bash
source /opt/ros/humble/setup.bash
```
3. Install all required dependencies.
```bash
rosdep install -iry --from-paths src/scenario_simulator_v2 --rosdistro humble
```
## Build scenario_simulator_v2
To build **Scenario Simulator v2**, run this command:
```bash
colcon build --symlink-install --cmake-args -DCMAKE_BUILD_TYPE=Release
```
![Build success](../image/ss2_build_result.png)
*As a result of running the `colcon build` command, all packages should be built successfully.*
Loading

0 comments on commit 79ec36a

Please sign in to comment.