diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-31 11:37:32 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-31 11:37:32 +0200 |
commit | 93a822fee4d1245bd74800781e2638efc147c4e8 (patch) | |
tree | 16cd8abca9691af516ff2a2b43cef60d31907865 /src/systemcmds | |
parent | 1b3a775e1b8341cdc32e7c9a497acba9da5a9802 (diff) | |
parent | 75dfb0d84d73e56d624c062ba3f35b88505a2f93 (diff) | |
download | px4-firmware-93a822fee4d1245bd74800781e2638efc147c4e8.tar.gz px4-firmware-93a822fee4d1245bd74800781e2638efc147c4e8.tar.bz2 px4-firmware-93a822fee4d1245bd74800781e2638efc147c4e8.zip |
Merged master
Diffstat (limited to 'src/systemcmds')
-rw-r--r-- | src/systemcmds/nshterm/module.mk | 2 | ||||
-rw-r--r-- | src/systemcmds/pwm/pwm.c | 24 |
2 files changed, 23 insertions, 3 deletions
diff --git a/src/systemcmds/nshterm/module.mk b/src/systemcmds/nshterm/module.mk index b22b446da..e2fa0ff80 100644 --- a/src/systemcmds/nshterm/module.mk +++ b/src/systemcmds/nshterm/module.mk @@ -38,4 +38,4 @@ MODULE_COMMAND = nshterm SRCS = nshterm.c -MODULE_STACKSIZE = 1200 +MODULE_STACKSIZE = 1400 diff --git a/src/systemcmds/pwm/pwm.c b/src/systemcmds/pwm/pwm.c index e0e6ca537..c8d698b86 100644 --- a/src/systemcmds/pwm/pwm.c +++ b/src/systemcmds/pwm/pwm.c @@ -70,7 +70,7 @@ usage(const char *reason) { if (reason != NULL) warnx("%s", reason); - errx(1, + errx(1, "usage:\n" "pwm arm|disarm|rate|failsafe|disarmed|min|max|test|info ...\n" "\n" @@ -635,8 +635,28 @@ pwm_main(int argc, char *argv[]) } exit(0); + } else if (!strcmp(argv[1], "forcefail")) { + + if (argc < 3) { + errx(1, "arg missing [on|off]"); + } else { + + if (!strcmp(argv[2], "on")) { + /* force failsafe */ + ret = ioctl(fd, PWM_SERVO_SET_FORCE_FAILSAFE, 1); + } else { + /* force failsafe */ + ret = ioctl(fd, PWM_SERVO_SET_FORCE_FAILSAFE, 0); + } + + if (ret != OK) { + warnx("FAILED setting forcefail %s", argv[2]); + } + } + exit(0); } - usage("specify arm|disarm|rate|failsafe|disarmed|min|max|test|info"); + + usage("specify arm|disarm|rate|failsafe|disarmed|min|max|test|info|forcefail"); return 0; } |