From 9e14191217c9796c7779dbe2bbe9a8d4a3b5c9b7 Mon Sep 17 00:00:00 2001
From: "James B. Pollack" <jamesbradenpollack@gmail.com>
Date: Thu, 18 Aug 2016 08:57:37 -0700
Subject: [PATCH] recondition

---
 .../system/controllers/advancedMovement.js    | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/scripts/system/controllers/advancedMovement.js b/scripts/system/controllers/advancedMovement.js
index cca8dd0f52..620bd2723f 100644
--- a/scripts/system/controllers/advancedMovement.js
+++ b/scripts/system/controllers/advancedMovement.js
@@ -17,22 +17,13 @@ function addTranslationToLeftStick() {
 function registerMappings() {
     mappingName = 'Hifi-AdvancedMovement-Dev-' + Math.random();
     advancedMapping = Controller.newMapping(mappingName);
-    advancedMapping.from(Controller.Hardware.Vive.LY).when(Controller.getValue(Controller.Hardware.Vive.LSY)).invert().to(
-        function(val) {
-            testPrint('LY:' + val);
-        });
-    advancedMapping.from(Controller.Hardware.Vive.LX).when(Controller.getValue(Controller.Hardware.Vive.LSX)).to(
-        function(val) {
-            testPrint('LX' + val)
-        });
-    advancedMapping.from(Controller.Hardware.Vive.RY).when(Controller.getValue(Controller.Hardware.Vive.RSY)).invert().to(
-        function(val) {
-            testPrint('RY' + val)
-        });
+    advancedMapping.from(Controller.Hardware.Vive.LY).when(Controller.getValue(Controller.Hardware.Vive.LSY)===1).invert().to(Controller.Standard.LY);
+    advancedMapping.from(Controller.Hardware.Vive.LX).when(Controller.getValue(Controller.Hardware.Vive.LSX)===1).to(Controller.Standard.LX);
+    advancedMapping.from(Controller.Hardware.Vive.RY).when(Controller.getValue(Controller.Hardware.Vive.RSY)===1).invert().to(Controller.Standard.RY);
 }
 
-function testPrint(what) {
-    print(what)
+function testPrint(what){
+    print('it was controller: ' + what)
 }
 
 function removeTranslationFromLeftStick() {