diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-06-06 07:57:31 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-06-06 07:57:31 +0200 |
| commit | 8ad3aa315f09c32cc3e1a85e89f8f6bb9017676c (patch) | |
| tree | a8f0c7e23f5d64c715cfeade003fd878e3ef027a /src/systemcmds | |
| parent | 971e8103014412d8453b010063318cf46e996288 (diff) | |
| parent | 68931f38d56c82c67d7d01e4db3157fac5815258 (diff) | |
| download | px4-firmware-8ad3aa315f09c32cc3e1a85e89f8f6bb9017676c.tar.gz px4-firmware-8ad3aa315f09c32cc3e1a85e89f8f6bb9017676c.tar.bz2 px4-firmware-8ad3aa315f09c32cc3e1a85e89f8f6bb9017676c.zip | |
Merged master
Diffstat (limited to 'src/systemcmds')
| -rw-r--r-- | src/systemcmds/pwm/pwm.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/systemcmds/pwm/pwm.c b/src/systemcmds/pwm/pwm.c index ff733df52..e150b5a74 100644 --- a/src/systemcmds/pwm/pwm.c +++ b/src/systemcmds/pwm/pwm.c @@ -185,12 +185,18 @@ pwm_main(int argc, char *argv[]) const char *arg = argv[0]; argv++; if (!strcmp(arg, "arm")) { + /* tell IO that its ok to disable its safety with the switch */ + ret = ioctl(fd, PWM_SERVO_SET_ARM_OK, 0); + if (ret != OK) + err(1, "PWM_SERVO_SET_ARM_OK"); + /* tell IO that the system is armed (it will output values if safety is off) */ ret = ioctl(fd, PWM_SERVO_ARM, 0); if (ret != OK) err(1, "PWM_SERVO_ARM"); continue; } if (!strcmp(arg, "disarm")) { + /* disarm, but do not revoke the SET_ARM_OK flag */ ret = ioctl(fd, PWM_SERVO_DISARM, 0); if (ret != OK) err(1, "PWM_SERVO_DISARM"); |