aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago0B <thiago0b12@hotmail.com>2013-11-11 22:02:40 -0200
committerThiago0B <thiago0b12@hotmail.com>2013-11-11 22:02:40 -0200
commit434de4e949c893f53b0d7a3feb1c2588542cd9af (patch)
tree0755bcb0305a71187bf22ad206905827e5514340
parenta1398c991ede8269d27f5798ea137a43846e7c9f (diff)
downloadpx4-firmware-434de4e949c893f53b0d7a3feb1c2588542cd9af.tar.gz
px4-firmware-434de4e949c893f53b0d7a3feb1c2588542cd9af.tar.bz2
px4-firmware-434de4e949c893f53b0d7a3feb1c2588542cd9af.zip
Fix user abort behave in test
Now the pwm ouput return to the last value before test (useful and safer when testing ESCs).
-rw-r--r--src/systemcmds/pwm/pwm.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/src/systemcmds/pwm/pwm.c b/src/systemcmds/pwm/pwm.c
index 09a934400..898c04cd5 100644
--- a/src/systemcmds/pwm/pwm.c
+++ b/src/systemcmds/pwm/pwm.c
@@ -395,6 +395,17 @@ pwm_main(int argc, char *argv[])
if (pwm_value == 0)
usage("no PWM value provided");
+ /* get current servo values */
+ struct pwm_output_values last_spos;
+
+ for (unsigned i = 0; i < servo_count; i++) {
+
+
+ ret = ioctl(fd, PWM_SERVO_GET(i), (unsigned long)&last_spos.values[i]);
+ if (ret != OK)
+ err(1, "PWM_SERVO_GET(%d)", i);
+ }
+
/* perform PWM output */
/* Open console directly to grab CTRL-C signal */
@@ -420,6 +431,14 @@ pwm_main(int argc, char *argv[])
read(0, &c, 1);
if (c == 0x03 || c == 0x63 || c == 'q') {
+ /* reset output to the last value */
+ for (unsigned i = 0; i < servo_count; i++) {
+ if (set_mask & 1<<i) {
+ ret = ioctl(fd, PWM_SERVO_SET(i), last_spos.values[i]);
+ if (ret != OK)
+ err(1, "PWM_SERVO_SET(%d)", i);
+ }
+ }
warnx("User abort\n");
exit(0);
}