From de17dbb1ee956412babb1e1482711b478229e9b0 Mon Sep 17 00:00:00 2001
From: nanthony21 <nickexists@hotmail.com>
Date: Fri, 30 Mar 2018 21:05:56 -0500
Subject: [PATCH] Made it so that joystick values will not be sent out during
 calibration.

---
 src/Joystick/Joystick.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Joystick/Joystick.cc b/src/Joystick/Joystick.cc
index cb7a00b61..53f345461 100644
--- a/src/Joystick/Joystick.cc
+++ b/src/Joystick/Joystick.cc
@@ -445,7 +445,7 @@ void Joystick::run(void)
             }
         }
 
-        if (_activeVehicle->joystickEnabled() && _calibrated) {
+        if (_activeVehicle->joystickEnabled() && !_calibrationMode && _calibrated) {
             int     axis = _rgFunctionAxis[rollFunction];
             float   roll = _adjustRange(_rgAxisValues[axis], _rgCalibration[axis], _deadband);
 
-- 
2.22.0