From 458e43fadc782322dd389c1c753ee7c8a75dc821 Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@brown.edu>
Date: Wed, 3 Aug 2016 10:18:57 -0700
Subject: [PATCH] added dead zones to hydras, style fixes

---
 interface/resources/controllers/hydra.json    | 21 ++++++++++++++-----
 .../resources/controllers/oculus_touch.json   | 12 ++---------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/interface/resources/controllers/hydra.json b/interface/resources/controllers/hydra.json
index 716d283a86..1dc6e44477 100644
--- a/interface/resources/controllers/hydra.json
+++ b/interface/resources/controllers/hydra.json
@@ -1,15 +1,26 @@
 {
     "name": "Hydra to Standard",
     "channels": [
-        { "from": "Hydra.LY", "filters": "invert", "to": "Standard.LY" }, 
-        { "from": "Hydra.LX", "to": "Standard.LX" },
+        { "from": "Hydra.LY", "to": "Standard.LY",
+            "filters": [
+                { "type": "deadZone", "min": 0.05 },
+                "invert"
+            ]
+        },
+        { "from": "Hydra.LX", "filters": { "type": "deadZone", "min": 0.05 }, "to": "Standard.LX" },
         { "from": "Hydra.LT", "to": "Standard.LTClick",  
             "peek": true,
             "filters": [ { "type": "hysteresis", "min": 0.85, "max": 0.9 } ]
         },
-        { "from": "Hydra.LT", "to": "Standard.LT" }, 
-        { "from": "Hydra.RY", "filters": "invert", "to": "Standard.RY" }, 
-        { "from": "Hydra.RX", "to": "Standard.RX" },
+        { "from": "Hydra.LT", "to": "Standard.LT" },
+
+        { "from": "Hydra.RY", "to": "Standard.RY",
+            "filters": [
+                { "type": "deadZone", "min": 0.05 },
+                "invert"
+            ]
+        },
+        { "from": "Hydra.RX", "filters": { "type": "deadZone", "min": 0.05 }, "to": "Standard.RX" },
         { "from": "Hydra.RT", "to": "Standard.RTClick",  
             "peek": true,
             "filters": [ { "type": "hysteresis", "min": 0.85, "max": 0.9 } ]
diff --git a/interface/resources/controllers/oculus_touch.json b/interface/resources/controllers/oculus_touch.json
index 755a709050..91c3a03303 100644
--- a/interface/resources/controllers/oculus_touch.json
+++ b/interface/resources/controllers/oculus_touch.json
@@ -12,11 +12,7 @@
                 "invert"
             ]
         },
-        { "from": "OculusTouch.LX", "to": "Standard.LX",
-            "filters": [
-                { "type": "deadZone", "min": 0.05 }
-            ]
-        },
+        { "from": "OculusTouch.LX", "filters": { "type": "deadZone", "min": 0.05 }, "to": "Standard.LX" },
         { "from": "OculusTouch.LT", "to": "Standard.LTClick",  
             "peek": true,
             "filters": [ { "type": "hysteresis", "min": 0.85, "max": 0.9 } ]
@@ -32,11 +28,7 @@
                 "invert"
             ]
         },
-        { "from": "OculusTouch.RX", "to": "Standard.RX",
-            "filters": [
-                { "type": "deadZone", "min": 0.05 }
-            ]
-        },
+        { "from": "OculusTouch.RX", "filters": { "type": "deadZone", "min": 0.05 }, "to": "Standard.RX" },
         { "from": "OculusTouch.RT", "to": "Standard.RTClick",  
             "peek": true,
             "filters": [ { "type": "hysteresis", "min": 0.85, "max": 0.9 } ]