Merge pull request #4695 from nanthony21/improve_deadband

Improve deadband

Merge pull request #4695 from nanthony21/improve_deadband
Improve deadband
5c7f03ac · Don Gagne · GitHub · f0c7608d · 279d560f · 5c7f03ac
Commit 5c7f03ac authored Mar 29, 2017 by Don Gagne Committed by GitHub Mar 29, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 5 deletions

Joystick.cc src/Joystick/Joystick.cc +12 -5

No files found.
--- a/src/Joystick/Joystick.cc
+++ b/src/Joystick/Joystick.cc
@@ -339,13 +339,20 @@ float Joystick::_adjustRange(int value, Calibration_t calibration, bool withDead
        axisLength =  calibration.center - calibration.min;
    }

+    float axisPercent;
+
    if (withDeadbands) {
-        if (valueNormalized>calibration.deadband) valueNormalized-=calibration.deadband;
-        else if (valueNormalized<-calibration.deadband) valueNormalized+=calibration.deadband;
-        else valueNormalized = 0.f;
+        if (valueNormalized>calibration.deadband) {
+            axisPercent = (valueNormalized - calibration.deadband) / (axisLength - calibration.deadband);
+        } else if (valueNormalized<-calibration.deadband) {
+            axisPercent = (valueNormalized + calibration.deadband) / (axisLength - calibration.deadband);
+        } else {
+            axisPercent = 0.f;
+        }
+    }
+    else {
+        axisPercent = valueNormalized / axisLength;
    }
-
-    float axisPercent = valueNormalized / axisLength;

    float correctedValue = axisBasis * axisPercent;