diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2013-07-17 19:16:49 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2013-07-17 19:16:49 +0400 |
| commit | c6d184e29dbf906c1dfbebe0d7f353653db8cc7e (patch) | |
| tree | af7163073bd470529530f990d6a792e80bde47c7 /src/modules/uORB | |
| parent | b174a6051527dacc858c6ed54b5d113888c5d4de (diff) | |
| parent | 2afd462eed4a0b9a5eb01d2e84bc1c6f90d435c5 (diff) | |
| download | px4-firmware-c6d184e29dbf906c1dfbebe0d7f353653db8cc7e.tar.gz px4-firmware-c6d184e29dbf906c1dfbebe0d7f353653db8cc7e.tar.bz2 px4-firmware-c6d184e29dbf906c1dfbebe0d7f353653db8cc7e.zip | |
Merge branch 'master' into seatbelt_multirotor
Diffstat (limited to 'src/modules/uORB')
| -rw-r--r-- | src/modules/uORB/topics/esc_status.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/modules/uORB/topics/esc_status.h b/src/modules/uORB/topics/esc_status.h index e67a39e1e..00cf59b28 100644 --- a/src/modules/uORB/topics/esc_status.h +++ b/src/modules/uORB/topics/esc_status.h @@ -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 { |