aboutsummaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2013-03-20 23:59:03 -0700
committerLorenz Meier <lm@inf.ethz.ch>2013-03-20 23:59:03 -0700
commit99054e76fbcbb86a1fd708f663c3b6cc8673da67 (patch)
tree9f64f119089625a220eb17e5060902330f18592d /apps
parentb7d65bf8fc65b2fd7c98d46d60fb24fb937baa94 (diff)
parentf1d8aa57ce9854920c9408c78be3abdc064b4b9d (diff)
downloadpx4-firmware-99054e76fbcbb86a1fd708f663c3b6cc8673da67.tar.gz
px4-firmware-99054e76fbcbb86a1fd708f663c3b6cc8673da67.tar.bz2
px4-firmware-99054e76fbcbb86a1fd708f663c3b6cc8673da67.zip
Merge pull request #235 from sjwilks/io-twitch
Stop the servo suddenly jumping when it goes out of the deadzone in one direction
Diffstat (limited to 'apps')
-rw-r--r--apps/px4io/controls.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/px4io/controls.c b/apps/px4io/controls.c
index e80a41f15..dc36f6c93 100644
--- a/apps/px4io/controls.c
+++ b/apps/px4io/controls.c
@@ -177,7 +177,7 @@ controls_tick() {
scaled = 10000.0f * ((raw - conf[PX4IO_P_RC_CONFIG_CENTER] - conf[PX4IO_P_RC_CONFIG_DEADZONE]) / (float)(conf[PX4IO_P_RC_CONFIG_MAX] - conf[PX4IO_P_RC_CONFIG_CENTER] - conf[PX4IO_P_RC_CONFIG_DEADZONE]));
} else if (raw < (conf[PX4IO_P_RC_CONFIG_CENTER] - conf[PX4IO_P_RC_CONFIG_DEADZONE])) {
- scaled = 10000.0f * ((raw - conf[PX4IO_P_RC_CONFIG_CENTER] - conf[PX4IO_P_RC_CONFIG_DEADZONE]) / (float)(conf[PX4IO_P_RC_CONFIG_CENTER] - conf[PX4IO_P_RC_CONFIG_DEADZONE] - conf[PX4IO_P_RC_CONFIG_MIN]));
+ scaled = 10000.0f * ((raw - conf[PX4IO_P_RC_CONFIG_CENTER] + conf[PX4IO_P_RC_CONFIG_DEADZONE]) / (float)(conf[PX4IO_P_RC_CONFIG_CENTER] - conf[PX4IO_P_RC_CONFIG_DEADZONE] - conf[PX4IO_P_RC_CONFIG_MIN]));
} else {
/* in the configured dead zone, output zero */