diff options
| author | px4dev <px4@purgatory.org> | 2013-03-21 23:41:43 -0700 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-03-21 23:41:43 -0700 |
| commit | 4c448a5be041eaa33c54e4bf1116c98fca487aff (patch) | |
| tree | 4aafb44109540e86a98f22c62d5679dd51091420 | |
| parent | a457a452393308047e9b958906048049ac798081 (diff) | |
| parent | bee896786a3236d7dac3f5460c56ff6e335f1e23 (diff) | |
| download | px4-firmware-4c448a5be041eaa33c54e4bf1116c98fca487aff.tar.gz px4-firmware-4c448a5be041eaa33c54e4bf1116c98fca487aff.tar.bz2 px4-firmware-4c448a5be041eaa33c54e4bf1116c98fca487aff.zip | |
Merge branch 'master' into export-build
| -rw-r--r-- | apps/px4io/controls.c | 2 | ||||
| -rw-r--r-- | apps/sensors/sensors.cpp | 2 |
2 files changed, 2 insertions, 2 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 */ diff --git a/apps/sensors/sensors.cpp b/apps/sensors/sensors.cpp index d725c7727..1f3f7707e 100644 --- a/apps/sensors/sensors.cpp +++ b/apps/sensors/sensors.cpp @@ -1157,7 +1157,7 @@ Sensors::ppm_poll() _rc.chan[i].scaled = (rc_input.values[i] - _parameters.trim[i] - _parameters.dz[i]) / (float)(_parameters.max[i] - _parameters.trim[i] - _parameters.dz[i]); } else if (rc_input.values[i] < (_parameters.trim[i] - _parameters.dz[i])) { - _rc.chan[i].scaled = (rc_input.values[i] - _parameters.trim[i] - _parameters.dz[i]) / (float)(_parameters.trim[i] - _parameters.min[i] - _parameters.dz[i]); + _rc.chan[i].scaled = (rc_input.values[i] - _parameters.trim[i] + _parameters.dz[i]) / (float)(_parameters.trim[i] - _parameters.min[i] - _parameters.dz[i]); } else { /* in the configured dead zone, output zero */ |