From 6f3765b19d1e67e61dceb5318cdd6770f166db22 Mon Sep 17 00:00:00 2001 From: Spaceman 11 <135277197+Spaceman113138@users.noreply.github.com> Date: Fri, 4 Sep 2026 19:45:56 -0500 Subject: [PATCH 1/2] Update to XboxController --- .../ctre/src/main/java/first/robot/opmode/MyTeleop.java | 4 ++-- .../rev/src/main/java/first/robot/opmode/MyTeleop.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/stage1/stage1a/solutions/ctre/src/main/java/first/robot/opmode/MyTeleop.java b/examples/stage1/stage1a/solutions/ctre/src/main/java/first/robot/opmode/MyTeleop.java index cffbacca..062a8a6e 100644 --- a/examples/stage1/stage1a/solutions/ctre/src/main/java/first/robot/opmode/MyTeleop.java +++ b/examples/stage1/stage1a/solutions/ctre/src/main/java/first/robot/opmode/MyTeleop.java @@ -6,7 +6,7 @@ package first.robot.opmode; import first.robot.Robot; -import org.wpilib.driverstation.NiDsXboxController; +import org.wpilib.driverstation.XboxController; import org.wpilib.opmode.PeriodicOpMode; import org.wpilib.opmode.Teleop; @@ -15,7 +15,7 @@ public class MyTeleop extends PeriodicOpMode { private final Robot robot; // [Controller] - private final NiDsXboxController xboxController = new NiDsXboxController(0); + private final XboxController xboxController = new XboxController(0); // [/Controller] diff --git a/examples/stage1/stage1a/solutions/rev/src/main/java/first/robot/opmode/MyTeleop.java b/examples/stage1/stage1a/solutions/rev/src/main/java/first/robot/opmode/MyTeleop.java index b942e9b1..d401bf39 100644 --- a/examples/stage1/stage1a/solutions/rev/src/main/java/first/robot/opmode/MyTeleop.java +++ b/examples/stage1/stage1a/solutions/rev/src/main/java/first/robot/opmode/MyTeleop.java @@ -6,7 +6,7 @@ package first.robot.opmode; import first.robot.Robot; -import org.wpilib.driverstation.NiDsXboxController; +import org.wpilib.driverstation.XboxController; import org.wpilib.opmode.PeriodicOpMode; import org.wpilib.opmode.Teleop; @@ -15,7 +15,7 @@ public class MyTeleop extends PeriodicOpMode { private final Robot robot; // [Controller] - private final NiDsXboxController xboxController = new NiDsXboxController(0); + private final XboxController xboxController = new XboxController(0); // [/Controller] /** The Robot instance is passed into the opmode via the constructor. */ From 4e99785fc2f9cdd0c39f3f27734d4ceb87c4950d Mon Sep 17 00:00:00 2001 From: Spaceman 11 <135277197+Spaceman113138@users.noreply.github.com> Date: Fri, 4 Sep 2026 20:12:24 -0500 Subject: [PATCH 2/2] update simGUI keyboard bindings --- .../solutions/ctre/AdvantageScopeLayout.json | 2 +- .../stage1a/solutions/ctre/simgui-ds.json | 130 ++++++++---------- .../solutions/rev/AdvantageScopeLayout.json | 2 +- .../stage1a/solutions/rev/simgui-ds.json | 111 ++++++++------- 4 files changed, 112 insertions(+), 133 deletions(-) diff --git a/examples/stage1/stage1a/solutions/ctre/AdvantageScopeLayout.json b/examples/stage1/stage1a/solutions/ctre/AdvantageScopeLayout.json index 11951129..244bd6c6 100644 --- a/examples/stage1/stage1a/solutions/ctre/AdvantageScopeLayout.json +++ b/examples/stage1/stage1a/solutions/ctre/AdvantageScopeLayout.json @@ -193,5 +193,5 @@ } ], "satellites": [], - "version": "27.0.0-alpha-5" + "version": "27.0.0-alpha-6" } diff --git a/examples/stage1/stage1a/solutions/ctre/simgui-ds.json b/examples/stage1/stage1a/solutions/ctre/simgui-ds.json index 7a068e29..0190734b 100644 --- a/examples/stage1/stage1a/solutions/ctre/simgui-ds.json +++ b/examples/stage1/stage1a/solutions/ctre/simgui-ds.json @@ -1,77 +1,57 @@ { - "Keyboard 0 Settings": { "window": { "visible": true } }, - "keyboardJoysticks": [ - { - "axisConfig": [ - {}, - { - "decKey": 568, - "incKey": 564 - }, - { - "decayRate": 1, - "keyRate": 1 - }, - { - "decayRate": 1, - "keyRate": 1 - }, - { - "decKey": 549, - "incKey": 546 - } - ], - "axisCount": 5, - "buttonCount": 6, - "buttonKeys": [563, -1, -1, -1, 550, 562], - "povConfig": [ - { - "keyDown": 614, - "keyDownLeft": 613, - "keyDownRight": 615, - "keyLeft": 616, - "keyRight": 618, - "keyUp": 620, - "keyUpLeft": 619, - "keyUpRight": 621 - } - ], - "povCount": 1 - }, - { - "axisConfig": [ - {}, - { - "decKey": 554, - "incKey": 556 - } - ], - "axisCount": 2, - "buttonCount": 4, - "buttonKeys": [558, 597, 599, 600], - "povCount": 0 - }, - { - "axisConfig": [ - { - "decKey": 513, - "incKey": 514 - }, - { - "decKey": 515, - "incKey": 516 - } - ], - "axisCount": 2, - "buttonCount": 6, - "buttonKeys": [521, 519, 517, 522, 520, 518], - "povCount": 0 - }, - { - "axisCount": 0, - "buttonCount": 0, - "povCount": 0 - } - ], - "robotJoysticks": [{ "guid": "Keyboard0" }] + "Keyboard 0 Settings": {"window": {"visible": true}}, + "keyboardJoysticks": [{ + "axisConfig": [{}, { + "decKey": 568, + "incKey": 564 + }, { + "decKey": 549, + "decayRate": 1, + "incKey": 546, + "keyRate": 1 + }, { + "decayRate": 1, + "keyRate": 1 + }], + "axisCount": 3, + "buttonCount": 11, + "buttonKeys": [563, -1, -1, -1, -1, -1, -1, -1, -1, 550, 562], + "povConfig": [{ + "keyDown": 614, + "keyDownLeft": 613, + "keyDownRight": 615, + "keyLeft": 616, + "keyRight": 618, + "keyUp": 620, + "keyUpLeft": 619, + "keyUpRight": 621 + }], + "povCount": 1 + }, { + "axisConfig": [{}, { + "decKey": 554, + "incKey": 556 + }], + "axisCount": 2, + "buttonCount": 4, + "buttonKeys": [558, 597, 599, 600], + "povCount": 0 + }, { + "axisConfig": [{ + "decKey": 513, + "incKey": 514 + }, { + "decKey": 515, + "incKey": 516 + }], + "axisCount": 2, + "buttonCount": 6, + "buttonKeys": [521, 519, 517, 522, 520, 518], + "povCount": 0 + }, { + "axisCount": 0, + "buttonCount": 0, + "povCount": 0 + }], + "robotJoysticks": [{"guid": "Keyboard0"}] } diff --git a/examples/stage1/stage1a/solutions/rev/AdvantageScopeLayout.json b/examples/stage1/stage1a/solutions/rev/AdvantageScopeLayout.json index 11951129..244bd6c6 100644 --- a/examples/stage1/stage1a/solutions/rev/AdvantageScopeLayout.json +++ b/examples/stage1/stage1a/solutions/rev/AdvantageScopeLayout.json @@ -193,5 +193,5 @@ } ], "satellites": [], - "version": "27.0.0-alpha-5" + "version": "27.0.0-alpha-6" } diff --git a/examples/stage1/stage1a/solutions/rev/simgui-ds.json b/examples/stage1/stage1a/solutions/rev/simgui-ds.json index 3b66b535..0190734b 100644 --- a/examples/stage1/stage1a/solutions/rev/simgui-ds.json +++ b/examples/stage1/stage1a/solutions/rev/simgui-ds.json @@ -1,58 +1,57 @@ { - "FMS": { "window": { "visible": false } }, - "Joysticks": { "window": { "visible": false } }, - "System Joysticks": { "window": { "visible": false } }, - "keyboardJoysticks": [ - { - "axisConfig": [ - {}, - { - "decKey": 568, - "incKey": 564 - }, - {}, - {}, - { - "decKey": 549, - "decayRate": 0.025, - "incKey": 546, - "keyRate": 0.025 - } - ], - "axisCount": 5, - "buttonCount": 6, - "buttonKeys": [563, -1, -1, -1, 550, 562], - "povConfig": [ - { - "key0": 328, - "key135": 323, - "key180": 322, - "key225": 321, - "key270": 324, - "key315": 327, - "key45": 329, - "key90": 326 - } - ], - "povCount": 1 - }, - { - "axisCount": 2, - "buttonCount": 4, - "buttonKeys": [-1, -1, -1, -1], - "povCount": 0 - }, - { - "axisCount": 2, - "buttonCount": 6, - "buttonKeys": [-1, -1, -1, -1, -1, -1], - "povCount": 0 - }, - { - "axisCount": 0, - "buttonCount": 0, - "povCount": 0 - } - ], - "robotJoysticks": [{ "guid": "Keyboard0" }] + "Keyboard 0 Settings": {"window": {"visible": true}}, + "keyboardJoysticks": [{ + "axisConfig": [{}, { + "decKey": 568, + "incKey": 564 + }, { + "decKey": 549, + "decayRate": 1, + "incKey": 546, + "keyRate": 1 + }, { + "decayRate": 1, + "keyRate": 1 + }], + "axisCount": 3, + "buttonCount": 11, + "buttonKeys": [563, -1, -1, -1, -1, -1, -1, -1, -1, 550, 562], + "povConfig": [{ + "keyDown": 614, + "keyDownLeft": 613, + "keyDownRight": 615, + "keyLeft": 616, + "keyRight": 618, + "keyUp": 620, + "keyUpLeft": 619, + "keyUpRight": 621 + }], + "povCount": 1 + }, { + "axisConfig": [{}, { + "decKey": 554, + "incKey": 556 + }], + "axisCount": 2, + "buttonCount": 4, + "buttonKeys": [558, 597, 599, 600], + "povCount": 0 + }, { + "axisConfig": [{ + "decKey": 513, + "incKey": 514 + }, { + "decKey": 515, + "incKey": 516 + }], + "axisCount": 2, + "buttonCount": 6, + "buttonKeys": [521, 519, 517, 522, 520, 518], + "povCount": 0 + }, { + "axisCount": 0, + "buttonCount": 0, + "povCount": 0 + }], + "robotJoysticks": [{"guid": "Keyboard0"}] }