diff options
| author | Julian Oes <joes@student.ethz.ch> | 2012-11-06 18:57:42 -0800 |
|---|---|---|
| committer | Julian Oes <joes@student.ethz.ch> | 2012-11-06 18:57:42 -0800 |
| commit | e0e96c005aab8b35f68ea3def75f5e762a115d32 (patch) | |
| tree | f14e82d9a6c04d97c5fbc705a29e28ec35acfa6c /apps/drivers/px4io/px4io.cpp | |
| parent | 339882063158ce99c628fa75fd9325c377f63f16 (diff) | |
| download | px4-firmware-e0e96c005aab8b35f68ea3def75f5e762a115d32.tar.gz px4-firmware-e0e96c005aab8b35f68ea3def75f5e762a115d32.tar.bz2 px4-firmware-e0e96c005aab8b35f68ea3def75f5e762a115d32.zip | |
Corrected two small bugs considering arming and disarming
Diffstat (limited to 'apps/drivers/px4io/px4io.cpp')
| -rw-r--r-- | apps/drivers/px4io/px4io.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/apps/drivers/px4io/px4io.cpp b/apps/drivers/px4io/px4io.cpp index 4687df2aa..0ec1b9922 100644 --- a/apps/drivers/px4io/px4io.cpp +++ b/apps/drivers/px4io/px4io.cpp @@ -37,7 +37,6 @@ * * PX4IO is connected via serial (or possibly some other interface at a later * point). - */ #include <nuttx/config.h> @@ -384,7 +383,7 @@ PX4IO::task_main() if (fds[2].revents & POLLIN) { - orb_copy(ORB_ID(actuator_armed), _t_armed, &_controls); + orb_copy(ORB_ID(actuator_armed), _t_armed, &_armed); _send_needed = true; } } @@ -538,7 +537,7 @@ PX4IO::ioctl(file *filep, int cmd, unsigned long arg) case PWM_SERVO_DISARM: /* fake a disarmed transition */ - _armed.armed = true; + _armed.armed = false; _send_needed = true; break; |