Skip to content

Update 1a for alpha7 #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Adrianamm merged 3 commits into from
Sep 6, 2026
Merged

Update 1a for alpha7 #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f3765b
Update to XboxController
Spaceman113138 Sep 5, 2026
4e99785
update simGUI keyboard bindings
Spaceman113138 Sep 5, 2026
436a1a5
Merge branch 'main' into update1AForAlpha7
Adrianamm Sep 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/stage1/stage1a/solutions/ctre/AdvantageScopeLayout.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,5 +193,5 @@
}
],
"satellites": [],
"version": "27.0.0-alpha-5"
"version": "27.0.0-alpha-6"
}
130 changes: 55 additions & 75 deletions examples/stage1/stage1a/solutions/ctre/simgui-ds.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"}]
}
4 changes: 2 additions & 2 deletions examples/stage1/stage1a/solutions/ctre/src/main/java/first/robot/opmode/MyTeleop.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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]

Expand Down
2 changes: 1 addition & 1 deletion examples/stage1/stage1a/solutions/rev/AdvantageScopeLayout.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,5 +193,5 @@
}
],
"satellites": [],
"version": "27.0.0-alpha-5"
"version": "27.0.0-alpha-6"
}
111 changes: 55 additions & 56 deletions examples/stage1/stage1a/solutions/rev/simgui-ds.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"}]
}
4 changes: 2 additions & 2 deletions examples/stage1/stage1a/solutions/rev/src/main/java/first/robot/opmode/MyTeleop.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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. */
Expand Down
Loading