diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-09-19 01:24:31 -0700 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-09-19 01:24:31 -0700 |
| commit | 8b992f720b79546f1c0dc9e5fdf71753221695d5 (patch) | |
| tree | c93af973aa330051777b9fb8b90a77ac136b1975 /src/drivers | |
| parent | d289467dadd1adec4984ac987c0a8f779795d9dd (diff) | |
| parent | 318abfabcb1e0d8d23df3df8015d4c7bdc011b2a (diff) | |
| download | px4-firmware-8b992f720b79546f1c0dc9e5fdf71753221695d5.tar.gz px4-firmware-8b992f720b79546f1c0dc9e5fdf71753221695d5.tar.bz2 px4-firmware-8b992f720b79546f1c0dc9e5fdf71753221695d5.zip | |
Merge pull request #398 from NosDE/master
mkblctrl fix and qgroundcontrol2 startup script for different frametypes
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/mkblctrl/mkblctrl.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/drivers/mkblctrl/mkblctrl.cpp b/src/drivers/mkblctrl/mkblctrl.cpp index 1bc3e97a4..d0de26a1a 100644 --- a/src/drivers/mkblctrl/mkblctrl.cpp +++ b/src/drivers/mkblctrl/mkblctrl.cpp @@ -96,9 +96,10 @@ class MK : public device::I2C { public: enum Mode { + MODE_NONE, MODE_2PWM, MODE_4PWM, - MODE_NONE + MODE_6PWM, }; enum MappingMode { @@ -1023,9 +1024,11 @@ MK::ioctl(file *filp, int cmd, unsigned long arg) return ret; /* if we are in valid PWM mode, try it as a PWM ioctl as well */ + /* switch (_mode) { case MODE_2PWM: case MODE_4PWM: + case MODE_6PWM: ret = pwm_ioctl(filp, cmd, arg); break; @@ -1033,6 +1036,8 @@ MK::ioctl(file *filp, int cmd, unsigned long arg) debug("not in a PWM mode"); break; } + */ + ret = pwm_ioctl(filp, cmd, arg); /* if nobody wants it, let CDev have it */ if (ret == -ENOTTY) |