aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2015-03-20 21:57:31 +0100
committerLorenz Meier <lm@inf.ethz.ch>2015-03-20 21:57:54 +0100
commitecec2d76d9217713c800a48f1be0a886af5bb517 (patch)
treefc841a1e98138fdaed9b5a450457b13026127604
parent4f0f2b032940e9b98b334c623f483137d3d97b5d (diff)
downloadpx4-firmware-ecec2d76d9217713c800a48f1be0a886af5bb517.tar.gz
px4-firmware-ecec2d76d9217713c800a48f1be0a886af5bb517.tar.bz2
px4-firmware-ecec2d76d9217713c800a48f1be0a886af5bb517.zip
Allow a bit more flexibility of PWM range
-rw-r--r--src/drivers/drv_pwm_output.h4
-rw-r--r--src/systemcmds/esc_calib/esc_calib.c7
2 files changed, 8 insertions, 3 deletions
diff --git a/src/drivers/drv_pwm_output.h b/src/drivers/drv_pwm_output.h
index 35e9619f0..6271ad208 100644
--- a/src/drivers/drv_pwm_output.h
+++ b/src/drivers/drv_pwm_output.h
@@ -78,7 +78,7 @@ __BEGIN_DECLS
/**
* Highest PWM allowed as the minimum PWM
*/
-#define PWM_HIGHEST_MIN 1300
+#define PWM_HIGHEST_MIN 1600
/**
* Highest maximum PWM in us
@@ -93,7 +93,7 @@ __BEGIN_DECLS
/**
* Lowest PWM allowed as the maximum PWM
*/
-#define PWM_LOWEST_MAX 1700
+#define PWM_LOWEST_MAX 1400
/**
* Do not output a channel with this value
diff --git a/src/systemcmds/esc_calib/esc_calib.c b/src/systemcmds/esc_calib/esc_calib.c
index aee26680c..d74010553 100644
--- a/src/systemcmds/esc_calib/esc_calib.c
+++ b/src/systemcmds/esc_calib/esc_calib.c
@@ -168,8 +168,13 @@ esc_calib_main(int argc, char *argv[])
}
}
- if (set_mask == 0)
+ if (set_mask == 0) {
usage("no channels chosen");
+ }
+
+ if (pwm_low > pwm_high) {
+ usage("low pwm is higher than high pwm");
+ }
/* make sure no other source is publishing control values now */
struct actuator_controls_s actuators;