Merge branch 'master' into seatbelt_multirotor

This commit is contained in:
Anton Babushkin
2013-07-17 19:16:49 +04:00
13 changed files with 822 additions and 298 deletions
+2 -1
View File
@@ -63,7 +63,8 @@
enum ESC_VENDOR {
ESC_VENDOR_GENERIC = 0, /**< generic ESC */
ESC_VENDOR_MIKROKOPTER /**< Mikrokopter */
ESC_VENDOR_MIKROKOPTER, /**< Mikrokopter */
ESC_VENDOR_GRAUPNER_HOTT /**< Graupner HoTT ESC */
};
enum ESC_CONNECTION_TYPE {