From b070306c2c002bd08662fcc4c7c3b860bd5fc4cc Mon Sep 17 00:00:00 2001
From: Brad Hefta-Gaub <brad@highfidelity.io>
Date: Thu, 29 Oct 2015 15:53:17 -0700
Subject: [PATCH] tweak comfort mode filters

---
 .../resources/controllers/keyboardMouse.json  | 42 +++++++++++++++++++
 interface/resources/controllers/standard.json | 16 ++++++-
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/interface/resources/controllers/keyboardMouse.json b/interface/resources/controllers/keyboardMouse.json
index 6ea1c42b1e..fba55ffebd 100644
--- a/interface/resources/controllers/keyboardMouse.json
+++ b/interface/resources/controllers/keyboardMouse.json
@@ -1,6 +1,47 @@
 {
     "name": "Keyboard/Mouse to Actions",
     "channels": [
+
+        { "from": ["Keyboard.A", "Keyboard.Left", "Keyboard.TouchpadLeft"],
+          "when": [ "Application.InHMD", "Application.ComfortMode" ],
+          "to": "Actions.StepYaw",
+          "filters":
+            [
+                { "type": "pulse", "interval": 0.5 },
+                { "type": "scale", "scale": -15 }
+            ]
+        },
+
+        { "from": ["Keyboard.D", "Keyboard.Right", "Keyboard.TouchpadRight"],
+          "when": [ "Application.InHMD", "Application.ComfortMode" ],
+          "to": "Actions.StepYaw",
+          "filters":
+            [
+                { "type": "pulse", "interval": 0.5 },
+                { "type": "scale", "scale": 15 }
+            ]
+        },
+
+        { "from": "Keyboard.MouseMoveLeft",
+          "when": [ "Application.InHMD", "Application.ComfortMode", "Keyboard.RightMouseClick" ],
+          "to": "Actions.StepYaw",
+          "filters":
+            [
+                { "type": "pulse", "interval": 0.5 },
+                { "type": "scale", "scale": -15 }
+            ]
+        },
+
+        { "from": "Keyboard.MouseMoveRight",
+          "when": [ "Application.InHMD", "Application.ComfortMode", "Keyboard.RightMouseClick" ],
+          "to": "Actions.StepYaw",
+          "filters":
+            [
+                { "type": "pulse", "interval": 0.5 },
+                { "type": "scale", "scale": 15 }
+            ]
+        },
+
         { "from": "Keyboard.A", "when": "Keyboard.Shift", "to": "Actions.LATERAL_LEFT" },
         { "from": "Keyboard.D", "when": "Keyboard.Shift", "to": "Actions.LATERAL_RIGHT" },
         { "from": "Keyboard.A", "when": "Keyboard.RightMouseClick", "to": "Actions.LATERAL_LEFT" },
@@ -28,6 +69,7 @@
         { "from": "Keyboard.Down", "to": "Actions.LONGITUDINAL_BACKWARD" },
         { "from": "Keyboard.Left", "to": "Actions.YAW_LEFT" },
         { "from": "Keyboard.Right", "to": "Actions.YAW_RIGHT" },
+
         { "from": "Keyboard.PgDown", "to": "Actions.VERTICAL_DOWN" },
         { "from": "Keyboard.PgUp", "to": "Actions.VERTICAL_UP" },
 
diff --git a/interface/resources/controllers/standard.json b/interface/resources/controllers/standard.json
index 5483da925d..871374b85b 100644
--- a/interface/resources/controllers/standard.json
+++ b/interface/resources/controllers/standard.json
@@ -3,10 +3,22 @@
     "channels": [
         { "from": "Standard.LY", "to": "Actions.TranslateZ" },
         { "from": "Standard.LX", "to": "Actions.TranslateX" },
-        { "from": "Standard.RX", "when": [ "Application.InHMD", "Application.ComfortMode" ], "to": "Actions.StepYaw" },
+
+        { "from": "Standard.RX",
+          "when": [ "Application.InHMD", "Application.ComfortMode" ],
+          "to": "Actions.StepYaw",
+          "filters":
+            [
+                { "type": "pulse", "interval": 0.5 },
+                { "type": "scale", "scale": 15 }
+            ]
+        },
+
+
         { "from": "Standard.RX", "to": "Actions.Yaw" },
         { "from": "Standard.RY", "to": "Actions.Pitch" },
 
+
         { "from": [ "Standard.DU", "Standard.DL", "Standard.DR", "Standard.DD" ], "to": "Standard.LeftPrimaryThumb" },
         { "from": "Standard.Back", "to": "Standard.LeftSecondaryThumb" },
 
@@ -20,3 +32,5 @@
         { "from": "Standard.RightHand", "to": "Actions.RightHand" }
     ]
 }
+
+