diff options
author | Jakob Odersky <jodersky@gmail.com> | 2015-05-04 13:58:15 +0200 |
---|---|---|
committer | Jakob Odersky <jodersky@gmail.com> | 2015-05-04 13:58:15 +0200 |
commit | 16e86b5d6919fc85acb82c01bbdf667e02edf3a5 (patch) | |
tree | 90e92014f85c65e5585d2c2aebb466ccc4e4ba46 | |
parent | c52c2c68f633d2eb6adb8387e8b0720908e57ca8 (diff) | |
parent | 57349fb36b91bffc052eff3c3f3a2af09e3d3405 (diff) | |
download | condor-1-16e86b5d6919fc85acb82c01bbdf667e02edf3a5.tar.gz condor-1-16e86b5d6919fc85acb82c01bbdf667e02edf3a5.tar.bz2 condor-1-16e86b5d6919fc85acb82c01bbdf667e02edf3a5.zip |
Merge branch 'master' of github.com:jodersky/condor
Conflicts:
README.md
-rw-r--r-- | README.md | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -13,9 +13,10 @@ This repository contains files related to the quadcopter model. Checkout the [fu ## Projects created/ported for Condor +Project | Progress ------ | -------- Controller board [trifle](https://github.com/jodersky/trifle) | ![alpha](https://img.shields.io/badge/progress-alpha-brightgreen.svg) -Pilot firmware [PX4](https://github.com/jodersky/px4-firmware) (porting forkk | ![wip](https://img.shields.io/badge/progress-wip-orange.svg) | +Pilot firmware [PX4](https://github.com/jodersky/px4-firmware) (porting fork) | ![wip](https://img.shields.io/badge/progress-wip-orange.svg) Real-time OS [NuttX](https://github.com/jodersky/px4-nuttx) (porting fork) | ![wip](https://img.shields.io/badge/progress-wip-orange.svg) Virtual cockpit [VFD](https://github.com/jodersky/vfd) | ![milestone](https://img.shields.io/badge/progress-milestone-green.svg) MAVLink-to-Scala code generation [SBT-MAVLink](https://github.com/jodersky/sbt-mavlink) | ![alpha](https://img.shields.io/badge/progress-alpha-brightgreen.svg) @@ -25,7 +26,7 @@ Progress badges indicate the current state of usability of the project - ![alpha](https://img.shields.io/badge/progress-alpha-brightgreen.svg): most features available - ![milestone](https://img.shields.io/badge/progress-milestone-green.svg): some functionality available -- ![wip](https://img.shields.io/badge/progress-wipl-orange.svg): not functional +- ![wip](https://img.shields.io/badge/progress-wip-orange.svg): not functional ## Other pojects of interest - Communication protocol [MAVLink](https://github.com/mavlink/mavlink) |