Skip to content

Commit

Permalink
Includes additional set-up instructions for windows (#182)
Browse files Browse the repository at this point in the history
* Includes additional set-up instructions for windows

Missing applications and change of Ubuntu to LTS version to reduce amount of errors

* Updates IP address command for Windows

hostname -I doesn't give the correct IP address to pass to Webots when in Windows

* Fixes details being nested

* Adding spaces

* Removed indents to fix code blocks

* Yarn formatted

* Update src/book/03-guides/02-tools/03-webots.mdx

Co-authored-by: Kip Hamiltons <[email protected]>

* Update src/book/03-guides/01-main-codebase/01-getting-started.mdx

Co-authored-by: Kip Hamiltons <[email protected]>

* Revert "Update src/book/03-guides/01-main-codebase/01-getting-started.mdx"

This reverts commit 7b64140.

* Update src/book/03-guides/02-tools/03-webots.mdx

Co-authored-by: Kip Hamiltons <[email protected]>

Co-authored-by: Kip Hamiltons <[email protected]>
  • Loading branch information
miikyla and KipHamiltons authored Oct 2, 2021
1 parent 835b8dd commit e9e2c5b
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 5 deletions.
12 changes: 9 additions & 3 deletions src/book/03-guides/01-main-codebase/01-getting-started.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,18 @@ To install on Ubuntu, use the [official Docker instructions](https://docs.docker
```
- Restart your computer.
3. Go to the Microsoft Store. Search for Ubuntu and install it. Launch Ubuntu.
3. Go to the Microsoft Store. Search for '**Ubuntu 20.04 LTS**' and install it. Launch Ubuntu.
4. Ensure Ubuntu is using WSL 2.
- In Powershell, run `wsl --list --verbose`.
- If the version is not 2, run `wsl --set-version ubuntu 2`.
- In Powershell, run:
```bash
wsl --list --verbose
```
- If the version is not 2, run:
```bash
wsl --set-version Ubuntu-20.04 2
```
<Alert type='info'> Note that 'ubuntu' in the last command may need to be capitalised. Check the exact spelling from the list output in the first command of this step. </Alert>
Expand Down
22 changes: 20 additions & 2 deletions src/book/03-guides/02-tools/03-webots.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ slug: /guides/tools/webots-setup

```bash
sudo apt-get update
sudo apt-get install libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-render-util0 libxcb-xfixes0 libxcb-xinerama0 libxcb-xkb1 libxkbcommon-x11-0 libxkbcommon0
sudo apt-get install -y libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-render-util0 libxcb-xfixes0 libxcb-xinerama0 libxcb-xkb1 libxkbcommon-x11-0 libxkbcommon0 libxdamage-dev
```

<Alert type='info'>
Expand Down Expand Up @@ -229,7 +229,25 @@ Running the RoboCup scenario requires two things: [the Webots simulator](https:/

3. On the computer you will be running the Webots simulator on, open the `NUWebots` repo in a text editor. Open the file `webots/projects/samples/contests/robocup/controllers/referee/game.json` (you can use <kbd>Ctrl</kbd>+<kbd>p</kbd>, search for `game.json` and the first file should be the correct one).

4. Under `red: hosts:` add the hostname of any computers you are running the robot code on. For any robots running on the same computer as the Webots simulator, do not add its own hostname.
4. Under `red: hosts:` add the IP address given by the following command for any computers you are running the robot code on. Robots running on the same computer as the Webots simulation do not need their hostname or IP address listed.

<details>
<summary>Windows</summary>

```bash
cat /etc/resolv.conf | grep nameserver | cut -d ' ' -f2
```

</details>

<details>
<summary>Linux</summary>

```bash
hostname -I
```

</details>

4. Run the Webots simulator:

Expand Down

0 comments on commit e9e2c5b

Please sign in to comment.