diff options
| author | marco <marco@Marcos-MacBook-Pro.local> | 2013-09-13 21:05:41 +0200 |
|---|---|---|
| committer | marco <marco@Marcos-MacBook-Pro.local> | 2013-09-13 21:05:41 +0200 |
| commit | 318abfabcb1e0d8d23df3df8015d4c7bdc011b2a (patch) | |
| tree | 911ebf5ad29922b61ffc03ad83e3f264d4aa6c62 /src/drivers/mkblctrl | |
| parent | 7ad2654b2dfcce9f03682e134f8603fab924b97b (diff) | |
| download | px4-firmware-318abfabcb1e0d8d23df3df8015d4c7bdc011b2a.tar.gz px4-firmware-318abfabcb1e0d8d23df3df8015d4c7bdc011b2a.tar.bz2 px4-firmware-318abfabcb1e0d8d23df3df8015d4c7bdc011b2a.zip | |
mkblctrl fix and qgroundcontrol2 startup script for different frametypes
Diffstat (limited to 'src/drivers/mkblctrl')
| -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) |