From 5f85fa6256c2f4fbd905743125758aadec44325f Mon Sep 17 00:00:00 2001 From: steve hocktail Date: Sun, 3 Apr 2022 18:44:03 -0400 Subject: [PATCH 1/5] rereouted xbox sticks, and made A and B flight-control buttons --- interface/resources/controllers/standard.json | 13 +++++++ .../controllers/standard_navigation.json | 4 ++- interface/resources/controllers/xbox.json | 34 +++---------------- 3 files changed, 21 insertions(+), 30 deletions(-) diff --git a/interface/resources/controllers/standard.json b/interface/resources/controllers/standard.json index aa995c6ecb..1c5b72c678 100644 --- a/interface/resources/controllers/standard.json +++ b/interface/resources/controllers/standard.json @@ -6,6 +6,11 @@ "to": "Actions.TranslateZ" }, + { "from": "Standard.RY", + "when": ["!Application.InHMD", "Application.RightHandDominant"], + "to": "Actions.Pitch" + }, + { "from": "Standard.LX", "when": [ "Application.InHMD", "!Application.AdvancedMovement", "Application.RightHandDominant", @@ -57,6 +62,11 @@ "to": "Actions.TranslateZ" }, + { "from": "Standard.LY", + "when": ["!Application.InHMD", "Application.LeftHandDominant"], + "to": "Actions.Pitch" + }, + { "from": "Standard.RX", "when": [ "Application.InHMD", "!Application.AdvancedMovement", "Application.LeftHandDominant", @@ -109,6 +119,9 @@ { "from": "Standard.LT", "to": "Actions.LeftHandClick" }, { "from": "Standard.RT", "to": "Actions.RightHandClick" }, + { "from": "Standard.A", "to": "Actions.VERTICAL_UP" }, + { "from": "Standard.B", "to": "Actions.VERTICAL_DOWN" }, + { "from": "Standard.LeftHand", "to": "Actions.LeftHand" }, { "from": "Standard.LeftHandThumb1", "to": "Actions.LeftHandThumb1"}, { "from": "Standard.LeftHandThumb2", "to": "Actions.LeftHandThumb2"}, diff --git a/interface/resources/controllers/standard_navigation.json b/interface/resources/controllers/standard_navigation.json index a557ba7b45..36cab8be8f 100644 --- a/interface/resources/controllers/standard_navigation.json +++ b/interface/resources/controllers/standard_navigation.json @@ -6,7 +6,9 @@ { "from": "Standard.DL", "to": "Actions.UiNavLateral", "filters": "invert" }, { "from": "Standard.DR", "to": "Actions.UiNavLateral" }, { "from": "Standard.LB", "to": "Actions.UiNavGroup","filters": "invert" }, - { "from": "Standard.RB", "to": "Actions.UiNavGroup" } + { "from": "Standard.RB", "to": "Actions.UiNavGroup" }, + { "from": [ "Standard.A", "Standard.X" ], "to": "Actions.UiNavSelect" }, + { "from": [ "Standard.B", "Standard.Y" ], "to": "Actions.UiNavBack" } ] } diff --git a/interface/resources/controllers/xbox.json b/interface/resources/controllers/xbox.json index cca92e1353..92461afecf 100644 --- a/interface/resources/controllers/xbox.json +++ b/interface/resources/controllers/xbox.json @@ -1,8 +1,8 @@ { "name": "XBox to Standard", "channels": [ - { "from": "GamePad.LY", "filters": { "type": "deadZone", "min": 0.05 }, "to": "Actions.TranslateZ" }, - { "from": "GamePad.LX", "filters": { "type": "deadZone", "min": 0.05 }, "to": "Actions.TranslateX" }, + { "from": "GamePad.LY", "filters": { "type": "deadZone", "min": 0.05 }, "to": "Standard.LY" }, + { "from": "GamePad.LX", "filters": { "type": "deadZone", "min": 0.05 }, "to": "Standard.LX" }, { "from": "GamePad.LT", "to": "Standard.LTClick", "peek": true, @@ -12,29 +12,8 @@ { "from": "GamePad.LB", "to": "Standard.LB" }, { "from": "GamePad.LS", "to": "Standard.LS" }, - - { "from": "GamePad.RX", - "when": [ "Application.InHMD", "Application.SnapTurn" ], - "to": "Actions.StepYaw", - "filters": - [ - { "type": "deadZone", "min": 0.15 }, - "constrainToInteger", - { "type": "pulse", "interval": 0.25 }, - { "type": "scale", "scale": 22.5 } - ] - }, - - { "from": "GamePad.RX", "filters": { "type": "deadZone", "min": 0.05 }, "to": "Actions.Yaw" }, - - { "from": "GamePad.RY", - "to": "Actions.VERTICAL_UP", - "filters": - [ - { "type": "deadZone", "min": 0.95 }, - "invert" - ] - }, + { "from": "GamePad.RX", "filters": { "type": "deadZone", "min": 0.05 }, "to": "Standard.RX" }, + { "from": "GamePad.RY", "filters": { "type": "deadZone", "min": 0.05 }, "to": "Standard.RY" }, { "from": "GamePad.RT", "to": "Standard.RTClick", "peek": true, @@ -55,9 +34,6 @@ { "from": "GamePad.A", "to": "Standard.A" }, { "from": "GamePad.B", "to": "Standard.B" }, { "from": "GamePad.X", "to": "Standard.X" }, - { "from": "GamePad.Y", "to": "Standard.Y" }, - - { "from": [ "Standard.A", "Standard.X" ], "to": "Actions.UiNavSelect" }, - { "from": [ "Standard.B", "Standard.Y" ], "to": "Actions.UiNavBack" } + { "from": "GamePad.Y", "to": "Standard.Y" } ] } From aced8af60137afa0c2d2fa276f74108f3d40583e Mon Sep 17 00:00:00 2001 From: steve hocktail Date: Mon, 4 Apr 2022 11:35:41 -0400 Subject: [PATCH 2/5] fixed deprecated Actions in standard.json --- interface/resources/controllers/standard.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/resources/controllers/standard.json b/interface/resources/controllers/standard.json index 1c5b72c678..4f31451de3 100644 --- a/interface/resources/controllers/standard.json +++ b/interface/resources/controllers/standard.json @@ -119,8 +119,8 @@ { "from": "Standard.LT", "to": "Actions.LeftHandClick" }, { "from": "Standard.RT", "to": "Actions.RightHandClick" }, - { "from": "Standard.A", "to": "Actions.VERTICAL_UP" }, - { "from": "Standard.B", "to": "Actions.VERTICAL_DOWN" }, + { "from": "Standard.A", "to": "Actions.Up" }, + { "from": "Standard.B", "to": "Actions.Down" }, { "from": "Standard.LeftHand", "to": "Actions.LeftHand" }, { "from": "Standard.LeftHandThumb1", "to": "Actions.LeftHandThumb1"}, From ca118990304f47cca996355db9740175f866aca9 Mon Sep 17 00:00:00 2001 From: steve hocktail Date: Fri, 8 Apr 2022 23:58:11 -0400 Subject: [PATCH 3/5] mapped the back shoulder buttons to LT and RT --- interface/resources/controllers/xbox.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/resources/controllers/xbox.json b/interface/resources/controllers/xbox.json index 92461afecf..51a458f9d8 100644 --- a/interface/resources/controllers/xbox.json +++ b/interface/resources/controllers/xbox.json @@ -4,7 +4,7 @@ { "from": "GamePad.LY", "filters": { "type": "deadZone", "min": 0.05 }, "to": "Standard.LY" }, { "from": "GamePad.LX", "filters": { "type": "deadZone", "min": 0.05 }, "to": "Standard.LX" }, - { "from": "GamePad.LT", "to": "Standard.LTClick", + { "from": "GamePad.LT", "to": "Standard.LT", "peek": true, "filters": [ { "type": "hysteresis", "min": 0.85, "max": 0.9 } ] }, @@ -15,7 +15,7 @@ { "from": "GamePad.RX", "filters": { "type": "deadZone", "min": 0.05 }, "to": "Standard.RX" }, { "from": "GamePad.RY", "filters": { "type": "deadZone", "min": 0.05 }, "to": "Standard.RY" }, - { "from": "GamePad.RT", "to": "Standard.RTClick", + { "from": "GamePad.RT", "to": "Standard.RT", "peek": true, "filters": [ { "type": "hysteresis", "min": 0.85, "max": 0.9 } ] }, From 78b8164be11b3411fda017802a844b49aaebe1ea Mon Sep 17 00:00:00 2001 From: steve hocktail Date: Sat, 9 Apr 2022 04:14:26 +0000 Subject: [PATCH 4/5] reverte "mapped the back shoulder buttons to LT and RT" --- interface/resources/controllers/xbox.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/resources/controllers/xbox.json b/interface/resources/controllers/xbox.json index 51a458f9d8..92461afecf 100644 --- a/interface/resources/controllers/xbox.json +++ b/interface/resources/controllers/xbox.json @@ -4,7 +4,7 @@ { "from": "GamePad.LY", "filters": { "type": "deadZone", "min": 0.05 }, "to": "Standard.LY" }, { "from": "GamePad.LX", "filters": { "type": "deadZone", "min": 0.05 }, "to": "Standard.LX" }, - { "from": "GamePad.LT", "to": "Standard.LT", + { "from": "GamePad.LT", "to": "Standard.LTClick", "peek": true, "filters": [ { "type": "hysteresis", "min": 0.85, "max": 0.9 } ] }, @@ -15,7 +15,7 @@ { "from": "GamePad.RX", "filters": { "type": "deadZone", "min": 0.05 }, "to": "Standard.RX" }, { "from": "GamePad.RY", "filters": { "type": "deadZone", "min": 0.05 }, "to": "Standard.RY" }, - { "from": "GamePad.RT", "to": "Standard.RT", + { "from": "GamePad.RT", "to": "Standard.RTClick", "peek": true, "filters": [ { "type": "hysteresis", "min": 0.85, "max": 0.9 } ] }, From 3ce6bb989cd147d47fe687656fda1c78ec07bd39 Mon Sep 17 00:00:00 2001 From: ksuprynowicz Date: Mon, 6 Jun 2022 21:09:43 +0200 Subject: [PATCH 5/5] Added original xbox_orig.json under a new name --- .../resources/controllers/xbox_orig.json | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 interface/resources/controllers/xbox_orig.json diff --git a/interface/resources/controllers/xbox_orig.json b/interface/resources/controllers/xbox_orig.json new file mode 100644 index 0000000000..cca92e1353 --- /dev/null +++ b/interface/resources/controllers/xbox_orig.json @@ -0,0 +1,63 @@ +{ + "name": "XBox to Standard", + "channels": [ + { "from": "GamePad.LY", "filters": { "type": "deadZone", "min": 0.05 }, "to": "Actions.TranslateZ" }, + { "from": "GamePad.LX", "filters": { "type": "deadZone", "min": 0.05 }, "to": "Actions.TranslateX" }, + + { "from": "GamePad.LT", "to": "Standard.LTClick", + "peek": true, + "filters": [ { "type": "hysteresis", "min": 0.85, "max": 0.9 } ] + }, + { "from": "GamePad.LT", "to": "Standard.LT" }, + { "from": "GamePad.LB", "to": "Standard.LB" }, + { "from": "GamePad.LS", "to": "Standard.LS" }, + + + { "from": "GamePad.RX", + "when": [ "Application.InHMD", "Application.SnapTurn" ], + "to": "Actions.StepYaw", + "filters": + [ + { "type": "deadZone", "min": 0.15 }, + "constrainToInteger", + { "type": "pulse", "interval": 0.25 }, + { "type": "scale", "scale": 22.5 } + ] + }, + + { "from": "GamePad.RX", "filters": { "type": "deadZone", "min": 0.05 }, "to": "Actions.Yaw" }, + + { "from": "GamePad.RY", + "to": "Actions.VERTICAL_UP", + "filters": + [ + { "type": "deadZone", "min": 0.95 }, + "invert" + ] + }, + + { "from": "GamePad.RT", "to": "Standard.RTClick", + "peek": true, + "filters": [ { "type": "hysteresis", "min": 0.85, "max": 0.9 } ] + }, + { "from": "GamePad.RT", "to": "Standard.RT" }, + { "from": "GamePad.RB", "to": "Standard.RB" }, + { "from": "GamePad.RS", "to": "Standard.RS" }, + + { "from": "GamePad.Start", "to": "Standard.Start" }, + { "from": "GamePad.Back", "to": "Actions.CycleCamera" }, + + { "from": "GamePad.DU", "to": "Standard.DU" }, + { "from": "GamePad.DD", "to": "Standard.DD" }, + { "from": "GamePad.DL", "to": "Standard.DL" }, + { "from": "GamePad.DR", "to": "Standard.DR" }, + + { "from": "GamePad.A", "to": "Standard.A" }, + { "from": "GamePad.B", "to": "Standard.B" }, + { "from": "GamePad.X", "to": "Standard.X" }, + { "from": "GamePad.Y", "to": "Standard.Y" }, + + { "from": [ "Standard.A", "Standard.X" ], "to": "Actions.UiNavSelect" }, + { "from": [ "Standard.B", "Standard.Y" ], "to": "Actions.UiNavBack" } + ] +}