diff options
author | Julian Oes <joes@student.ethz.ch> | 2013-02-25 09:26:16 -0800 |
---|---|---|
committer | Julian Oes <joes@student.ethz.ch> | 2013-02-25 09:26:16 -0800 |
commit | f0d8ce009ebee5de25a167ebe3af02ea3ce2635f (patch) | |
tree | d7900e67a9f3ae948d60007f48564a1a1d61a842 /apps/px4io | |
parent | 34c84752d1ff7494529dfea8e72f3c090b451b3c (diff) | |
parent | 231a721ed4666123cff73611e6064328c0ffbfad (diff) | |
download | px4-firmware-f0d8ce009ebee5de25a167ebe3af02ea3ce2635f.tar.gz px4-firmware-f0d8ce009ebee5de25a167ebe3af02ea3ce2635f.tar.bz2 px4-firmware-f0d8ce009ebee5de25a167ebe3af02ea3ce2635f.zip |
Merge remote-tracking branch 'upstream/master' into new_state_machine
Diffstat (limited to 'apps/px4io')
-rw-r--r-- | apps/px4io/dsm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/px4io/dsm.c b/apps/px4io/dsm.c index f0e8e0f32..a79c9734c 100644 --- a/apps/px4io/dsm.c +++ b/apps/px4io/dsm.c @@ -231,6 +231,7 @@ dsm_guess_format(bool reset) 0x3f, /* 6 channels (DX6) */ 0x7f, /* 7 channels (DX7) */ 0xff, /* 8 channels (DX8) */ + 0x1ff, /* 9 channels (DX9, etc.) */ 0x3ff, /* 10 channels (DX10) */ 0x3fff /* 18 channels (DX10) */ }; |