diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-06-10 15:01:44 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-06-10 15:01:44 +0200 |
| commit | 9444def5f861745da2716a443026e3d0bf061161 (patch) | |
| tree | b25a9429d78fab148debc9e1f2d31f6d3a0afd54 /src/systemcmds | |
| parent | 308ec6001a2e1ac31ea818b1d482a34b8ed0099b (diff) | |
| parent | 42ce3112ad645e53788463180c350279b243b02e (diff) | |
| download | px4-firmware-9444def5f861745da2716a443026e3d0bf061161.tar.gz px4-firmware-9444def5f861745da2716a443026e3d0bf061161.tar.bz2 px4-firmware-9444def5f861745da2716a443026e3d0bf061161.zip | |
Merge branch 'master' into fmuv2_bringup
Diffstat (limited to 'src/systemcmds')
| -rw-r--r-- | src/systemcmds/mixer/mixer.c | 4 | ||||
| -rw-r--r-- | src/systemcmds/pwm/pwm.c | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/systemcmds/mixer/mixer.c b/src/systemcmds/mixer/mixer.c index 55c4f0836..e642ed067 100644 --- a/src/systemcmds/mixer/mixer.c +++ b/src/systemcmds/mixer/mixer.c @@ -88,8 +88,8 @@ load(const char *devname, const char *fname) { int dev; FILE *fp; - char line[80]; - char buf[512]; + char line[120]; + char buf[2048]; /* open the device */ if ((dev = open(devname, 0)) < 0) 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"); |