From d45bd0ebb38c7e70cc5eb89c31a7a4f23a4929f1 Mon Sep 17 00:00:00 2001 From: Spaceman 11 <135277197+Spaceman113138@users.noreply.github.com> Date: Fri, 18 Sep 2026 15:21:41 -0500 Subject: [PATCH 1/6] update 1b ctre --- .../stage1b/solutions/ctre/simgui-ds.json | 130 ++++++++---------- .../first/robot/mechanisms/Drivetrain.java | 9 +- .../java/first/robot/mechanisms/Feeder.java | 3 +- .../robot/mechanisms/IntakeLauncher.java | 3 +- ...a-1.json => Phoenix6-26.70.0-alpha-2.json} | 68 ++++----- 5 files changed, 99 insertions(+), 114 deletions(-) rename examples/stage1/stage1b/solutions/ctre/vendordeps/{Phoenix6-26.50.0-alpha-1.json => Phoenix6-26.70.0-alpha-2.json} (90%) diff --git a/examples/stage1/stage1b/solutions/ctre/simgui-ds.json b/examples/stage1/stage1b/solutions/ctre/simgui-ds.json index 2267e9ae..0190734b 100644 --- a/examples/stage1/stage1b/solutions/ctre/simgui-ds.json +++ b/examples/stage1/stage1b/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": 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" }] + "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/stage1b/solutions/ctre/src/main/java/first/robot/mechanisms/Drivetrain.java b/examples/stage1/stage1b/solutions/ctre/src/main/java/first/robot/mechanisms/Drivetrain.java index b754d478..c0d7cc24 100644 --- a/examples/stage1/stage1b/solutions/ctre/src/main/java/first/robot/mechanisms/Drivetrain.java +++ b/examples/stage1/stage1b/solutions/ctre/src/main/java/first/robot/mechanisms/Drivetrain.java @@ -17,15 +17,16 @@ import org.wpilib.command3.Mechanism; import org.wpilib.drive.DifferentialDrive; import org.wpilib.framework.RobotBase; +import org.wpilib.hardware.bus.CANPort; import org.wpilib.hardware.imu.OnboardIMU; import org.wpilib.hardware.imu.OnboardIMU.MountOrientation; public class Drivetrain implements Mechanism { private static final int leftLeaderID = 0, rightLeaderID = 2; - private final TalonFX leftLeader = new TalonFX(leftLeaderID, CANBus.systemcore(0)); - private final TalonFX leftFollower = new TalonFX(1, CANBus.systemcore(0)); - private final TalonFX rightLeader = new TalonFX(rightLeaderID, CANBus.systemcore(0)); - private final TalonFX rightFollower = new TalonFX(3, CANBus.systemcore(0)); + private final TalonFX leftLeader = new TalonFX(leftLeaderID, new CANBus(CANPort.CAN_S0)); + private final TalonFX leftFollower = new TalonFX(1, new CANBus(CANPort.CAN_S0)); + private final TalonFX rightLeader = new TalonFX(rightLeaderID, new CANBus(CANPort.CAN_S0)); + private final TalonFX rightFollower = new TalonFX(3, new CANBus(CANPort.CAN_S0)); private final OnboardIMU imu = new OnboardIMU(MountOrientation.FLAT); private final DifferentialDrive differentialDrive = diff --git a/examples/stage1/stage1b/solutions/ctre/src/main/java/first/robot/mechanisms/Feeder.java b/examples/stage1/stage1b/solutions/ctre/src/main/java/first/robot/mechanisms/Feeder.java index cdfdcd81..b3c39f5d 100644 --- a/examples/stage1/stage1b/solutions/ctre/src/main/java/first/robot/mechanisms/Feeder.java +++ b/examples/stage1/stage1b/solutions/ctre/src/main/java/first/robot/mechanisms/Feeder.java @@ -11,9 +11,10 @@ import org.wpilib.command3.Command; import org.wpilib.command3.Mechanism; import org.wpilib.framework.RobotBase; +import org.wpilib.hardware.bus.CANPort; public class Feeder implements Mechanism { - private final TalonFX motor = new TalonFX(5, CANBus.systemcore(0)); + private final TalonFX motor = new TalonFX(5, new CANBus(CANPort.CAN_S0)); private final SingleFlywheelSim sim = SingleFlywheelSim.forFeeder(motor); public Feeder() { diff --git a/examples/stage1/stage1b/solutions/ctre/src/main/java/first/robot/mechanisms/IntakeLauncher.java b/examples/stage1/stage1b/solutions/ctre/src/main/java/first/robot/mechanisms/IntakeLauncher.java index 6e977c06..3ffb476e 100644 --- a/examples/stage1/stage1b/solutions/ctre/src/main/java/first/robot/mechanisms/IntakeLauncher.java +++ b/examples/stage1/stage1b/solutions/ctre/src/main/java/first/robot/mechanisms/IntakeLauncher.java @@ -13,9 +13,10 @@ import org.wpilib.command3.Command; import org.wpilib.command3.Mechanism; import org.wpilib.framework.RobotBase; +import org.wpilib.hardware.bus.CANPort; public class IntakeLauncher implements Mechanism { - private final TalonFX motor = new TalonFX(4, CANBus.systemcore(0)); + private final TalonFX motor = new TalonFX(4, new CANBus(CANPort.CAN_S0)); private final SingleFlywheelSim sim = SingleFlywheelSim.forIntakeLauncher(motor); public IntakeLauncher() { diff --git a/examples/stage1/stage1b/solutions/ctre/vendordeps/Phoenix6-26.50.0-alpha-1.json b/examples/stage1/stage1b/solutions/ctre/vendordeps/Phoenix6-26.70.0-alpha-2.json similarity index 90% rename from examples/stage1/stage1b/solutions/ctre/vendordeps/Phoenix6-26.50.0-alpha-1.json rename to examples/stage1/stage1b/solutions/ctre/vendordeps/Phoenix6-26.70.0-alpha-2.json index ccc4b8c5..af2ed5f8 100644 --- a/examples/stage1/stage1b/solutions/ctre/vendordeps/Phoenix6-26.50.0-alpha-1.json +++ b/examples/stage1/stage1b/solutions/ctre/vendordeps/Phoenix6-26.70.0-alpha-2.json @@ -1,10 +1,12 @@ { - "fileName": "Phoenix6-26.50.0-alpha-1.json", + "fileName": "Phoenix6-26.70.0-alpha-2.json", "name": "CTRE-Phoenix (v6)", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "wpilibYear": "2027_alpha7", "uuid": "e995de00-2c64-4df5-8831-c1441420ff19", - "mavenUrls": ["https://maven.ctr-electronics.com/release/"], + "mavenUrls": [ + "https://maven.ctr-electronics.com/release/" + ], "jsonUrl": "https://maven.ctr-electronics.com/release/com/ctre/phoenix6/latest/Phoenix6-frc2027-latest.json", "conflictsWith": [ { @@ -17,14 +19,14 @@ { "groupId": "com.ctre.phoenix6", "artifactId": "wpiapi-java", - "version": "26.50.0-alpha-1" + "version": "26.70.0-alpha-2" } ], "jniDependencies": [ { "groupId": "com.ctre.phoenix6", "artifactId": "api-cpp", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ @@ -38,7 +40,7 @@ { "groupId": "com.ctre.phoenix6", "artifactId": "tools", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ @@ -52,7 +54,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "api-cpp-sim", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ @@ -66,7 +68,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "tools-sim", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ @@ -80,7 +82,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simTalonSRX", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ @@ -94,7 +96,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simVictorSPX", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ @@ -108,7 +110,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simPigeonIMU", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ @@ -122,7 +124,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simProTalonFX", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ @@ -136,7 +138,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simProTalonFXS", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ @@ -150,7 +152,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simProCANcoder", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ @@ -164,7 +166,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simProPigeon2", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ @@ -178,7 +180,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simProCANrange", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ @@ -192,7 +194,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simProCANdi", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ @@ -206,7 +208,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simProCANdle", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ @@ -222,7 +224,7 @@ { "groupId": "com.ctre.phoenix6", "artifactId": "wpiapi-cpp", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "libName": "CTRE_Phoenix6_WPI", "headerClassifier": "headers", "sharedLibrary": true, @@ -238,7 +240,7 @@ { "groupId": "com.ctre.phoenix6", "artifactId": "tools", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "libName": "CTRE_PhoenixTools", "headerClassifier": "headers", "sharedLibrary": true, @@ -254,7 +256,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "wpiapi-cpp-sim", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "libName": "CTRE_Phoenix6_WPISim", "headerClassifier": "headers", "sharedLibrary": true, @@ -270,7 +272,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "tools-sim", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "libName": "CTRE_PhoenixTools_Sim", "headerClassifier": "headers", "sharedLibrary": true, @@ -286,7 +288,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simTalonSRX", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "libName": "CTRE_SimTalonSRX", "headerClassifier": "headers", "sharedLibrary": true, @@ -302,7 +304,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simVictorSPX", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "libName": "CTRE_SimVictorSPX", "headerClassifier": "headers", "sharedLibrary": true, @@ -318,7 +320,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simPigeonIMU", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "libName": "CTRE_SimPigeonIMU", "headerClassifier": "headers", "sharedLibrary": true, @@ -334,7 +336,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simProTalonFX", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "libName": "CTRE_SimProTalonFX", "headerClassifier": "headers", "sharedLibrary": true, @@ -350,7 +352,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simProTalonFXS", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "libName": "CTRE_SimProTalonFXS", "headerClassifier": "headers", "sharedLibrary": true, @@ -366,7 +368,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simProCANcoder", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "libName": "CTRE_SimProCANcoder", "headerClassifier": "headers", "sharedLibrary": true, @@ -382,7 +384,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simProPigeon2", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "libName": "CTRE_SimProPigeon2", "headerClassifier": "headers", "sharedLibrary": true, @@ -398,7 +400,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simProCANrange", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "libName": "CTRE_SimProCANrange", "headerClassifier": "headers", "sharedLibrary": true, @@ -414,7 +416,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simProCANdi", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "libName": "CTRE_SimProCANdi", "headerClassifier": "headers", "sharedLibrary": true, @@ -430,7 +432,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simProCANdle", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "libName": "CTRE_SimProCANdle", "headerClassifier": "headers", "sharedLibrary": true, @@ -444,4 +446,4 @@ "simMode": "swsim" } ] -} +} \ No newline at end of file From fbeb65723cfb5bccb9be5f5efdfe22d79a1fbe8b Mon Sep 17 00:00:00 2001 From: Spaceman 11 <135277197+Spaceman113138@users.noreply.github.com> Date: Fri, 18 Sep 2026 15:24:08 -0500 Subject: [PATCH 2/6] update 1b rev --- .../stage1b/solutions/rev/simgui-ds.json | 50 ++++++++++++------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/examples/stage1/stage1b/solutions/rev/simgui-ds.json b/examples/stage1/stage1b/solutions/rev/simgui-ds.json index 78d93887..0190734b 100644 --- a/examples/stage1/stage1b/solutions/rev/simgui-ds.json +++ b/examples/stage1/stage1b/solutions/rev/simgui-ds.json @@ -1,40 +1,52 @@ { - "FMS": {"window": {"visible": false}}, - "Joysticks": {"window": {"visible": false}}, - "System Joysticks": {"window": {"visible": false}}, + "Keyboard 0 Settings": {"window": {"visible": true}}, "keyboardJoysticks": [{ "axisConfig": [{}, { "decKey": 568, "incKey": 564 - }, {}, {}, { + }, { "decKey": 549, - "decayRate": 0.025, + "decayRate": 1, "incKey": 546, - "keyRate": 0.025 + "keyRate": 1 + }, { + "decayRate": 1, + "keyRate": 1 }], - "axisCount": 5, - "buttonCount": 6, - "buttonKeys": [563, -1, -1, -1, 550, 562], + "axisCount": 3, + "buttonCount": 11, + "buttonKeys": [563, -1, -1, -1, -1, -1, -1, -1, -1, 550, 562], "povConfig": [{ - "key0": 328, - "key135": 323, - "key180": 322, - "key225": 321, - "key270": 324, - "key315": 327, - "key45": 329, - "key90": 326 + "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": [-1, -1, -1, -1], + "buttonKeys": [558, 597, 599, 600], "povCount": 0 }, { + "axisConfig": [{ + "decKey": 513, + "incKey": 514 + }, { + "decKey": 515, + "incKey": 516 + }], "axisCount": 2, "buttonCount": 6, - "buttonKeys": [-1, -1, -1, -1, -1, -1], + "buttonKeys": [521, 519, 517, 522, 520, 518], "povCount": 0 }, { "axisCount": 0, From d0b8f51bf781bbead95e3f11a09c2be051ff9825 Mon Sep 17 00:00:00 2001 From: Spaceman 11 <135277197+Spaceman113138@users.noreply.github.com> Date: Fri, 18 Sep 2026 15:28:14 -0500 Subject: [PATCH 3/6] update 1a ctre --- .../ctre/src/main/java/first/robot/Robot.java | 13 ++-- ...a-1.json => Phoenix6-26.70.0-alpha-2.json} | 68 ++++++++++--------- 2 files changed, 42 insertions(+), 39 deletions(-) rename examples/stage1/stage1a/solutions/ctre/vendordeps/{Phoenix6-26.50.0-alpha-1.json => Phoenix6-26.70.0-alpha-2.json} (90%) diff --git a/examples/stage1/stage1a/solutions/ctre/src/main/java/first/robot/Robot.java b/examples/stage1/stage1a/solutions/ctre/src/main/java/first/robot/Robot.java index e77589c3..1b204c85 100644 --- a/examples/stage1/stage1a/solutions/ctre/src/main/java/first/robot/Robot.java +++ b/examples/stage1/stage1a/solutions/ctre/src/main/java/first/robot/Robot.java @@ -16,6 +16,7 @@ import first.robot.simulation.SingleFlywheelSim; import org.wpilib.drive.DifferentialDrive; import org.wpilib.framework.OpModeRobot; +import org.wpilib.hardware.bus.CANPort; import org.wpilib.hardware.imu.OnboardIMU; import org.wpilib.hardware.imu.OnboardIMU.MountOrientation; @@ -32,13 +33,13 @@ public class Robot extends OpModeRobot { // [DriveMotorsLeft] - private final TalonFX leftLeader = new TalonFX(0, CANBus.systemcore(0)); - private final TalonFX leftFollower = new TalonFX(1, CANBus.systemcore(0)); + private final TalonFX leftLeader = new TalonFX(0, new CANBus(CANPort.CAN_S0)); + private final TalonFX leftFollower = new TalonFX(1, new CANBus(CANPort.CAN_S0)); // [/DriveMotorsLeft] // [DriveMotorsRight] - private final TalonFX rightLeader = new TalonFX(2, CANBus.systemcore(0)); - private final TalonFX rightFollower = new TalonFX(3, CANBus.systemcore(0)); + private final TalonFX rightLeader = new TalonFX(2, new CANBus(CANPort.CAN_S0)); + private final TalonFX rightFollower = new TalonFX(3, new CANBus(CANPort.CAN_S0)); // [/DriveMotorsRight] // [DrivetrainInstance] @@ -57,8 +58,8 @@ public class Robot extends OpModeRobot { // [/RobotWithSimPart1] // [AdditionalMotors] - public final TalonFX intakeLauncher = new TalonFX(4, CANBus.systemcore(0)); - public final TalonFX feeder = new TalonFX(5, CANBus.systemcore(0)); + public final TalonFX intakeLauncher = new TalonFX(4, new CANBus(CANPort.CAN_S0)); + public final TalonFX feeder = new TalonFX(5, new CANBus(CANPort.CAN_S0)); // [/AdditionalMotors] // [IntakeLauncherSim] diff --git a/examples/stage1/stage1a/solutions/ctre/vendordeps/Phoenix6-26.50.0-alpha-1.json b/examples/stage1/stage1a/solutions/ctre/vendordeps/Phoenix6-26.70.0-alpha-2.json similarity index 90% rename from examples/stage1/stage1a/solutions/ctre/vendordeps/Phoenix6-26.50.0-alpha-1.json rename to examples/stage1/stage1a/solutions/ctre/vendordeps/Phoenix6-26.70.0-alpha-2.json index ccc4b8c5..af2ed5f8 100644 --- a/examples/stage1/stage1a/solutions/ctre/vendordeps/Phoenix6-26.50.0-alpha-1.json +++ b/examples/stage1/stage1a/solutions/ctre/vendordeps/Phoenix6-26.70.0-alpha-2.json @@ -1,10 +1,12 @@ { - "fileName": "Phoenix6-26.50.0-alpha-1.json", + "fileName": "Phoenix6-26.70.0-alpha-2.json", "name": "CTRE-Phoenix (v6)", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "wpilibYear": "2027_alpha7", "uuid": "e995de00-2c64-4df5-8831-c1441420ff19", - "mavenUrls": ["https://maven.ctr-electronics.com/release/"], + "mavenUrls": [ + "https://maven.ctr-electronics.com/release/" + ], "jsonUrl": "https://maven.ctr-electronics.com/release/com/ctre/phoenix6/latest/Phoenix6-frc2027-latest.json", "conflictsWith": [ { @@ -17,14 +19,14 @@ { "groupId": "com.ctre.phoenix6", "artifactId": "wpiapi-java", - "version": "26.50.0-alpha-1" + "version": "26.70.0-alpha-2" } ], "jniDependencies": [ { "groupId": "com.ctre.phoenix6", "artifactId": "api-cpp", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ @@ -38,7 +40,7 @@ { "groupId": "com.ctre.phoenix6", "artifactId": "tools", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ @@ -52,7 +54,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "api-cpp-sim", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ @@ -66,7 +68,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "tools-sim", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ @@ -80,7 +82,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simTalonSRX", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ @@ -94,7 +96,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simVictorSPX", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ @@ -108,7 +110,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simPigeonIMU", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ @@ -122,7 +124,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simProTalonFX", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ @@ -136,7 +138,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simProTalonFXS", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ @@ -150,7 +152,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simProCANcoder", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ @@ -164,7 +166,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simProPigeon2", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ @@ -178,7 +180,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simProCANrange", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ @@ -192,7 +194,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simProCANdi", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ @@ -206,7 +208,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simProCANdle", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ @@ -222,7 +224,7 @@ { "groupId": "com.ctre.phoenix6", "artifactId": "wpiapi-cpp", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "libName": "CTRE_Phoenix6_WPI", "headerClassifier": "headers", "sharedLibrary": true, @@ -238,7 +240,7 @@ { "groupId": "com.ctre.phoenix6", "artifactId": "tools", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "libName": "CTRE_PhoenixTools", "headerClassifier": "headers", "sharedLibrary": true, @@ -254,7 +256,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "wpiapi-cpp-sim", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "libName": "CTRE_Phoenix6_WPISim", "headerClassifier": "headers", "sharedLibrary": true, @@ -270,7 +272,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "tools-sim", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "libName": "CTRE_PhoenixTools_Sim", "headerClassifier": "headers", "sharedLibrary": true, @@ -286,7 +288,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simTalonSRX", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "libName": "CTRE_SimTalonSRX", "headerClassifier": "headers", "sharedLibrary": true, @@ -302,7 +304,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simVictorSPX", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "libName": "CTRE_SimVictorSPX", "headerClassifier": "headers", "sharedLibrary": true, @@ -318,7 +320,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simPigeonIMU", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "libName": "CTRE_SimPigeonIMU", "headerClassifier": "headers", "sharedLibrary": true, @@ -334,7 +336,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simProTalonFX", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "libName": "CTRE_SimProTalonFX", "headerClassifier": "headers", "sharedLibrary": true, @@ -350,7 +352,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simProTalonFXS", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "libName": "CTRE_SimProTalonFXS", "headerClassifier": "headers", "sharedLibrary": true, @@ -366,7 +368,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simProCANcoder", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "libName": "CTRE_SimProCANcoder", "headerClassifier": "headers", "sharedLibrary": true, @@ -382,7 +384,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simProPigeon2", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "libName": "CTRE_SimProPigeon2", "headerClassifier": "headers", "sharedLibrary": true, @@ -398,7 +400,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simProCANrange", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "libName": "CTRE_SimProCANrange", "headerClassifier": "headers", "sharedLibrary": true, @@ -414,7 +416,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simProCANdi", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "libName": "CTRE_SimProCANdi", "headerClassifier": "headers", "sharedLibrary": true, @@ -430,7 +432,7 @@ { "groupId": "com.ctre.phoenix6.sim", "artifactId": "simProCANdle", - "version": "26.50.0-alpha-1", + "version": "26.70.0-alpha-2", "libName": "CTRE_SimProCANdle", "headerClassifier": "headers", "sharedLibrary": true, @@ -444,4 +446,4 @@ "simMode": "swsim" } ] -} +} \ No newline at end of file From c5b62345da982a864a404e4d5702205722468fb5 Mon Sep 17 00:00:00 2001 From: Spaceman 11 <135277197+Spaceman113138@users.noreply.github.com> Date: Fri, 18 Sep 2026 15:36:26 -0500 Subject: [PATCH 4/6] update text --- .../docs/learning-course/stage1/stage1a/kitbot-drivetrain.mdx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/content/docs/learning-course/stage1/stage1a/kitbot-drivetrain.mdx b/src/content/docs/learning-course/stage1/stage1a/kitbot-drivetrain.mdx index bd844b53..74fcdd53 100644 --- a/src/content/docs/learning-course/stage1/stage1a/kitbot-drivetrain.mdx +++ b/src/content/docs/learning-course/stage1/stage1a/kitbot-drivetrain.mdx @@ -68,6 +68,10 @@ This is how the motor controller objects for the left motors will look. ```java {ctreRobot}#DriveMotorsLeft ``` + CTRE uses a `CANBus` that is constructed with a `CANPort enum to specify which of Systemcore's CANBuses the device is connected too. + This enum is a field in the `CANPort` class and only CAN_S0 through CAN_S4 will ever be used since Systemcore only has five CAN Busses. + + ```java {revRobot}#DriveMotorsLeft From b627cf1fe4cdc27fbc4fe53407e67c81d706558d Mon Sep 17 00:00:00 2001 From: Spaceman 11 <135277197+Spaceman113138@users.noreply.github.com> Date: Fri, 18 Sep 2026 23:11:29 -0500 Subject: [PATCH 5/6] sim-gui changes --- examples/stage1/stage1a/solutions/ctre/simgui-ds.json | 1 - examples/stage1/stage1a/solutions/rev/simgui-ds.json | 2 +- examples/stage1/stage1b/solutions/ctre/simgui-ds.json | 2 +- examples/stage1/stage1b/solutions/rev/simgui-ds.json | 2 +- examples/stage1/templates/ctre/simgui-ds.json | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/examples/stage1/stage1a/solutions/ctre/simgui-ds.json b/examples/stage1/stage1a/solutions/ctre/simgui-ds.json index 0190734b..75cb9302 100644 --- a/examples/stage1/stage1a/solutions/ctre/simgui-ds.json +++ b/examples/stage1/stage1a/solutions/ctre/simgui-ds.json @@ -1,5 +1,4 @@ { - "Keyboard 0 Settings": {"window": {"visible": true}}, "keyboardJoysticks": [{ "axisConfig": [{}, { "decKey": 568, diff --git a/examples/stage1/stage1a/solutions/rev/simgui-ds.json b/examples/stage1/stage1a/solutions/rev/simgui-ds.json index 0190734b..5b6a5ec1 100644 --- a/examples/stage1/stage1a/solutions/rev/simgui-ds.json +++ b/examples/stage1/stage1a/solutions/rev/simgui-ds.json @@ -1,5 +1,5 @@ { - "Keyboard 0 Settings": {"window": {"visible": true}}, + "Keyboard 0 Settings": {"window": {"visible": false}}, "keyboardJoysticks": [{ "axisConfig": [{}, { "decKey": 568, diff --git a/examples/stage1/stage1b/solutions/ctre/simgui-ds.json b/examples/stage1/stage1b/solutions/ctre/simgui-ds.json index 0190734b..5b6a5ec1 100644 --- a/examples/stage1/stage1b/solutions/ctre/simgui-ds.json +++ b/examples/stage1/stage1b/solutions/ctre/simgui-ds.json @@ -1,5 +1,5 @@ { - "Keyboard 0 Settings": {"window": {"visible": true}}, + "Keyboard 0 Settings": {"window": {"visible": false}}, "keyboardJoysticks": [{ "axisConfig": [{}, { "decKey": 568, diff --git a/examples/stage1/stage1b/solutions/rev/simgui-ds.json b/examples/stage1/stage1b/solutions/rev/simgui-ds.json index 0190734b..5b6a5ec1 100644 --- a/examples/stage1/stage1b/solutions/rev/simgui-ds.json +++ b/examples/stage1/stage1b/solutions/rev/simgui-ds.json @@ -1,5 +1,5 @@ { - "Keyboard 0 Settings": {"window": {"visible": true}}, + "Keyboard 0 Settings": {"window": {"visible": false}}, "keyboardJoysticks": [{ "axisConfig": [{}, { "decKey": 568, diff --git a/examples/stage1/templates/ctre/simgui-ds.json b/examples/stage1/templates/ctre/simgui-ds.json index 7a068e29..5b9b28d6 100644 --- a/examples/stage1/templates/ctre/simgui-ds.json +++ b/examples/stage1/templates/ctre/simgui-ds.json @@ -1,5 +1,5 @@ { - "Keyboard 0 Settings": { "window": { "visible": true } }, + "Keyboard 0 Settings": { "window": { "visible": false } }, "keyboardJoysticks": [ { "axisConfig": [ From 8b510cb62cc13b11092d4b3bc85e2a7cc5c12ebd Mon Sep 17 00:00:00 2001 From: Spaceman 11 <135277197+Spaceman113138@users.noreply.github.com> Date: Fri, 18 Sep 2026 23:19:00 -0500 Subject: [PATCH 6/6] ?