Skip to content

Commit

Permalink
Merge pull request #333 from wouter-heerwegh/Release_V2.2.0
Browse files Browse the repository at this point in the history
Release v2.2.0
  • Loading branch information
wouter-heerwegh authored Jan 15, 2023
2 parents 5f12e09 + 832d02a commit f62f3b4
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions UE4Project/Config/DefaultGame.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ LicensingTerms=GPL V2
ProjectDisplayedTitle=NSLOCTEXT("[/Script/EngineSettings]", "8F8B6B2A472F9FDFB69E2B8CFAE8C4E0", "Formula Student Driverless Simulator")
ProjectDebugTitleInfo=NSLOCTEXT("[/Script/EngineSettings]", "F31D7C524A9E9BC66DD2AA922D309408", "Formula Student Driverless Simulator (debug)")
CopyrightNotice=This program is free software; you can redistribute it and/ormodify it under the terms of the GNU General Public License as published by the Free Software Foundation
ProjectVersion=2.2.0

[/Script/UnrealEd.ProjectPackagingSettings]
Build=IfProjectHasCode
Expand Down
6 changes: 3 additions & 3 deletions docker/download_FSDSSimulator_binary.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Shell script to download Simulator bins from github; For custom versions of simulator path has to be updated
sudo apt-get install unzip
wget -c https://github.com/FS-Driverless/Formula-Student-Driverless-Simulator/releases/download/v2.1.0/fsds-v2.1.0-linux.zip
unzip fsds-v2.1.0-linux.zip
rm fsds-v2.1.0-linux.zip
wget -c https://github.com/FS-Driverless/Formula-Student-Driverless-Simulator/releases/download/v2.2.0/fsds-v2.2.0-linux.zip
unzip fsds-v2.2.0-linux.zip
rm fsds-v2.2.0-linux.zip
8 changes: 4 additions & 4 deletions docs/docker_ubuntu.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ After building the image, verify that the image exists by runnig:
```

#### Run FSDS inside the Docker container
Get [the binary](https://github.com/FS-Driverless/Formula-Student-Driverless-Simulator/releases/download/v2.1.0/fsds-v2.1.0-linux.zip), or package your own project in Ubuntu.
Get [the binary](https://github.com/FS-Driverless/Formula-Student-Driverless-Simulator/releases/download/v2.2.0/fsds-v2.2.0-linux.zip), or package your own project in Ubuntu.
You can either download the latest version yourself, or use the `download_FSDSSimulator_binary.sh` helper script.

Now, run fsds inside the Docker container:
Expand All @@ -41,15 +41,15 @@ Now, run fsds inside the Docker container:

Replace the variables as follows:
* `DOCKER_IMAGE_NAME`: Same as `target_image` parameter in previous step. By default, enter `fsdsairsim_binary:vulkan-ubuntu18.04`
* `UNREAL_BINARY_SHELL_SCRIPT`: for FSDSsimulator enviroment, it will be `fsds-v2.1.0-linux/FSDS.sh`
* `UNREAL_BINARY_SHELL_SCRIPT`: for FSDSsimulator enviroment, it will be `fsds-v2.2.0-linux/FSDS.sh`
* `UNREAL_BINARY_ARGUMENTS`: For FSDSsimulator, most relevant would be `-windowed`, `-ResX`, `-ResY`. [See here all options](https://docs.unrealengine.com/en-us/Programming/Basics/CommandLineArguments).

For FSDSsimulator, you can do a `$ ./run_airsim_image_binary.sh fsdsairsim_binary:vulkan-ubuntu18.04 fsds-v2.1.0-linux/FSDS.sh -windowed -ResX=1080 -ResY=720`
For FSDSsimulator, you can do a `$ ./run_airsim_image_binary.sh fsdsairsim_binary:vulkan-ubuntu18.04 fsds-v2.2.0-linux/FSDS.sh -windowed -ResX=1080 -ResY=720`

To run in headless mode, use suffix `-- headless` at the end:

```bash
$ ./run_airsim_image_binary.sh fsds-v2.1.0-linux/FSDS.sh -- headless
$ ./run_airsim_image_binary.sh fsds-v2.2.0-linux/FSDS.sh -- headless
```

You need to have a `settings.json` file in the current working directory from where you run `./run_airsim_image_binary.sh`.
2 changes: 1 addition & 1 deletion docs/getting-started-with-ros.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ ln -s /mnt/c/Users/developer/Formula-Student-Driverless-Simulator ~/Formula-Stud
```

Now, checkout the version equal to the simulator.
If you are running for example simulator packaged version v2.1.0, run `git checkout tags/v2.1.0` to get the ROS brige to the same version
If you are running for example simulator packaged version v2.2.0, run `git checkout tags/v2.2.0` to get the ROS brige to the same version

## Preparing AirLib

Expand Down

0 comments on commit f62f3b4

Please sign in to comment.