Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Microsoft/AirSim
Browse files Browse the repository at this point in the history
  • Loading branch information
sytelus committed Nov 8, 2017
2 parents 8822f28 + cf499b3 commit 38c4022
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Our goal is to develop AirSim as a platform for AI research to experiment with d

* We now have the [car model](docs/using_car.md).
* New built-in flight controller called [simple_flight](simple_flight.md) that "just works" without any additional setup. It is also now *default*.
* AirSim now also generates [depth as well as disparity impages](image_apis.md) that is in camera plan.
* AirSim now also generates [depth as well as disparity images](docs/image_apis.md) that is in camera plan.
* We also have official Linux build now! If you have been using AirSim with PX4, you might want to read the [release notes](docs/release_notes.md).
* No need to build the code. Just download [our binaries](https://github.com/Microsoft/AirSim/releases) and you are good to go!

Expand Down
4 changes: 2 additions & 2 deletions docs/simple_flight.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ The advantage of using simple_flight is zero additional setup you need to do and

Normally flight controllers are designed to run on actual hardware on vehicles and their support for running in simulator varies widely. They are often fairly difficult to configure for non-expert users and typically have complex build usually lacking cross platform support. All these problems have played significant part in design of simple_flight.

simple_slight is designed from ground up as library with clean interface that can work onboard the vehicle as well as simulator. The core principle is that flight controller has no way to specify special simulation mode and there for it has no way to know if it is running under simulation or real vehicle. We thus view flight controller simply as collection of algorithms packaged in a library. Another key emphasis is to develop this code as dependency free header-only pure standard C++11 code. This means there is no special build required to compile simple_flight. You just copy its source code to any project you wish and it just works.
simple_flight is designed from ground up as library with clean interface that can work onboard the vehicle as well as simulator. The core principle is that flight controller has no way to specify special simulation mode and there for it has no way to know if it is running under simulation or real vehicle. We thus view flight controller simply as collection of algorithms packaged in a library. Another key emphasis is to develop this code as dependency free header-only pure standard C++11 code. This means there is no special build required to compile simple_flight. You just copy its source code to any project you wish and it just works.

## Control

Expand Down Expand Up @@ -70,4 +70,4 @@ Finally, simple_flight uses steppable clock by default which means clock advance
{
"ClockType": "ScalableClock"
}
```
```

0 comments on commit 38c4022

Please sign in to comment.