Skip to content

Commit

Permalink
Merge pull request #137 from StarlingUAS/dev
Browse files Browse the repository at this point in the history
Updates PX4 Version to latest and General Usage Tutorial
  • Loading branch information
mhl787156 authored Jan 4, 2022
2 parents 472eef9 + 97e50d8 commit 4cf6799
Show file tree
Hide file tree
Showing 22 changed files with 804 additions and 27 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ By virtue of the architecture, the system also includes failure recovery and det
## Contact
The initial developers of this project are:

- Mickey Li - [email](mailto:[email protected]) - [github](github.com/mhl787156)
- Robert Clarke - [email](mailto:[email protected]) - [github](github.com/rob-clarke)
- Mickey Li - [email](mailto:[email protected]) - [github](https://github.com/mhl787156)
- Robert Clarke - [email](mailto:[email protected]) - [github](https://github.com/rob-clarke)

## FAQs
Please see documentation, or raise an [Issue on the github repo](github.com/UoBFlightLab/ProjectStarling/issues)
Please see documentation, or raise an [Issue on the github repo](https://github.com/StarlingUAS/ProjectStarling/issues)

## License
This project is released under the MIT license. Please see the [License file](https://github.com/UoBFlightLab/ProjectStarling/blob/master/LICENSE) for more details.
This project is released under the MIT license. Please see the [License file](https://github.com/StarlingUAS/ProjectStarling/blob/master/LICENSE) for more details.
2 changes: 2 additions & 0 deletions docker-compose-2-drones.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ services:
- "PX4_SIM_HOST=localhost"
- "PX4_INSTANCE=0"
- "IGNORE_FAILURE=true"
- "ENABLE_VIRTUAL_FRAMEBUFFER=false"
depends_on:
- simhost
pid: "host" # Share Process ID Namespace
Expand Down Expand Up @@ -70,6 +71,7 @@ services:
- "PX4_INSTANCE=1"
- "IGNORE_FAILURE=true"
- "PX4_SIM_INIT_LOC_X=2"
- "ENABLE_VIRTUAL_FRAMEBUFFER=false"
depends_on:
- simhost
pid: "host" # Share Process ID Namespace
Expand Down
10 changes: 5 additions & 5 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This systems provides a number of key features.
- Built in simulation stack based on Gazebo
- Quick transition from simulation to flying controllers on real drones.

![Simple Architecture](/img/ArchSimple.jpg)
![Simple Architecture](img/ArchSimple.jpg)

## Documentation

Expand Down Expand Up @@ -43,11 +43,11 @@ By virtue of the architecture, the system also includes failure recovery and det
## Contact
The initial developers of this project are:

- Mickey Li - [email](mailto:[email protected]) - [github](github.com/mhl787156)
- Robert Clarke - [email](mailto:[email protected]) - [github](github.com/rob-clarke)
- Mickey Li - [email](mailto:[email protected]) - [github](https://github.com/mhl787156)
- Robert Clarke - [email](mailto:[email protected]) - [github](https://github.com/rob-clarke)

## FAQs
Please see documentation, or raise an [Issue on the github repo](github.com/UoBFlightLab/ProjectStarling/issues)
Please see documentation, or raise an [Issue on the github repo](https://github.com/StarlingUAS/ProjectStarling/issues)

## License
This project is released under the MIT license. Please see the [License file](https://github.com/UoBFlightLab/ProjectStarling/blob/master/LICENSE) for more details.
This project is released under the MIT license. Please see the [License file](https://github.com/StarlingUAS/ProjectStarling/blob/master/LICENSE) for more details.
10 changes: 8 additions & 2 deletions docs/guide/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Contents
[TOC]

## Installation
## Install Docker

The only dependency of running and using Starling locally is the [Docker] containerisation software. Please visit [docker's installation page](https://docs.docker.com/get-docker/) for further details. We recommend using Starling on linux based systems, but it should work on Windows and possible Mac depending on the state of the Docker.

Expand Down Expand Up @@ -43,7 +43,7 @@ This will install Docker, accessible using `sudo` root privileges only. To use d
sudo groupadd docker
sudo usermod -aG docker $USER

2. Log out and log in again to enforce changes
2. Log out and log in again to enforce changes (may need to restart)
3. Verify that it was successful:

docker run hello-world
Expand All @@ -62,6 +62,12 @@ For Mav systems, please see [the Mac Os installation instructions](https://docs.

Starling has not be tested on MAC OS, so there is no guarantee that it is functional. However in theory the single-agent non-cluster (docker-only) application should be compatible.

## Get Starling

Clone the Starling repository:

git clone https://github.com/StarlingUAS/ProjectStarling.git

## Using Starling

Starling provides a framework for users to implement almost any drone related experiment or application. However, we have identified that most applications fall into the following categories. Therefore we have provided detailed user guides for these use cases. It is recommended that the user follow these guides to run starling before starting your own implementation as these guides will also slowly introduce you to the concepts and details Starling uses.
Expand Down
13 changes: 13 additions & 0 deletions docs/kbd.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
kbd > kbd {
background-color: #eee;
border-radius: 3px;
border: 1px solid #b4b4b4;
box-shadow: 0 1px 1px rgba(0, 0, 0, .2), 0 2px 0 0 rgba(255, 255, 255, .7) inset;
color: #333;
display: inline-block;
font-size: .85em;
font-weight: 700;
line-height: 1;
padding: 2px 4px;
white-space: nowrap;
}
2 changes: 1 addition & 1 deletion docs/other/ideas.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
### `ros.env.d`
# `ros.env.d`
Adding a folder to a `/ros.env.d` could provide an extendable way to add to the
ros environment. e.g. including additional model/plugin paths for Gazebo.
3 changes: 3 additions & 0 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
mkdocs
mkdocs-macros-plugin
pymdown-extensions
mkdocs-enumerate-headings-plugin
mkdocs-mermaid2-plugin
Binary file added docs/tutorials/imgs/fenswoodgif.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/tutorials/imgs/fenswoodscreenshot1.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/tutorials/imgs/linux-terminal-on-ubuntu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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/tutorials/imgs/starling-fenswood-demo-1.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/tutorials/imgs/starling-fenswood-demo-2a.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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/tutorials/imgs/ui.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 4cf6799

Please sign in to comment.