Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion examples/stage1/stage1a/solutions/ctre/simgui-ds.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"Keyboard 0 Settings": {"window": {"visible": true}},
"keyboardJoysticks": [{
"axisConfig": [{}, {
"decKey": 568,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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]
Expand All @@ -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]
Expand Down
Original file line number Diff line number Diff line change
@@ -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": [
{
Expand All @@ -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": [
Expand All @@ -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": [
Expand All @@ -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": [
Expand All @@ -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": [
Expand All @@ -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": [
Expand All @@ -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": [
Expand All @@ -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": [
Expand All @@ -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": [
Expand All @@ -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": [
Expand All @@ -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": [
Expand All @@ -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": [
Expand All @@ -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": [
Expand All @@ -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": [
Expand All @@ -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": [
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand All @@ -444,4 +446,4 @@
"simMode": "swsim"
}
]
}
}
2 changes: 1 addition & 1 deletion examples/stage1/stage1a/solutions/rev/simgui-ds.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Keyboard 0 Settings": {"window": {"visible": true}},
"Keyboard 0 Settings": {"window": {"visible": false}},
"keyboardJoysticks": [{
"axisConfig": [{}, {
"decKey": 568,
Expand Down
Loading
Loading