aboutsummaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2015-01-15 12:42:28 +0100
committerThomas Gubler <thomasgubler@gmail.com>2015-01-15 12:42:28 +0100
commit96db9e81883ab0e3438e8ffdce8e8dce47d204ce (patch)
tree2d41d99f2837630219cc56699b27d2a2190374aa /README.md
parente60c1a842c856e1a19fcdc1b169dfdbc813e9ce2 (diff)
parente62bd37e73139c77f0d60cd91fe3443ed23df074 (diff)
downloadpx4-firmware-96db9e81883ab0e3438e8ffdce8e8dce47d204ce.tar.gz
px4-firmware-96db9e81883ab0e3438e8ffdce8e8dce47d204ce.tar.bz2
px4-firmware-96db9e81883ab0e3438e8ffdce8e8dce47d204ce.zip
Merge remote-tracking branch 'upstream/master' into ros
Conflicts: src/platforms/px4_middleware.h
Diffstat (limited to 'README.md')
-rw-r--r--README.md11
1 files changed, 7 insertions, 4 deletions
diff --git a/README.md b/README.md
index 1a559d3c3..33b8cdec7 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
* Official Website: http://px4.io
* License: BSD 3-clause (see LICENSE.md)
-* Supported airframes:
+* Supported airframes (more experimental are supported):
* [Multicopters](http://px4.io/platforms/multicopters/start)
* [Fixed wing](http://px4.io/platforms/planes/start)
* [VTOL](http://px4.io/platforms/vtol/start)
@@ -16,7 +16,7 @@
### Users ###
-Please refer to the [user documentation](https://pixhawk.org/users/start) for flying drones with PX4.
+Please refer to the [user documentation](https://pixhawk.org/users/start) for flying drones with the PX4 flight stack.
### Developers ###
@@ -26,9 +26,12 @@ http://px4.io/dev/contributing
Developer guide:
http://px4.io/dev/
+Testing guide:
+http://px4.io/dev/unit_tests
+
This repository contains code supporting these boards:
- * PX4FMUv1.x
- * PX4FMUv2.x
+ * FMUv1.x
+ * FMUv2.x
* AeroCore (v1 and v2)
## NuttShell (NSH) ##