diff --git a/networktables.json b/networktables.json new file mode 100644 index 0000000..fe51488 --- /dev/null +++ b/networktables.json @@ -0,0 +1 @@ +[] diff --git a/simgui-ds.json b/simgui-ds.json new file mode 100644 index 0000000..73cc713 --- /dev/null +++ b/simgui-ds.json @@ -0,0 +1,92 @@ +{ + "keyboardJoysticks": [ + { + "axisConfig": [ + { + "decKey": 65, + "incKey": 68 + }, + { + "decKey": 87, + "incKey": 83 + }, + { + "decKey": 69, + "decayRate": 0.0, + "incKey": 82, + "keyRate": 0.009999999776482582 + } + ], + "axisCount": 3, + "buttonCount": 4, + "buttonKeys": [ + 90, + 88, + 67, + 86 + ], + "povConfig": [ + { + "key0": 328, + "key135": 323, + "key180": 322, + "key225": 321, + "key270": 324, + "key315": 327, + "key45": 329, + "key90": 326 + } + ], + "povCount": 1 + }, + { + "axisConfig": [ + { + "decKey": 74, + "incKey": 76 + }, + { + "decKey": 73, + "incKey": 75 + } + ], + "axisCount": 2, + "buttonCount": 4, + "buttonKeys": [ + 77, + 44, + 46, + 47 + ], + "povCount": 0 + }, + { + "axisConfig": [ + { + "decKey": 263, + "incKey": 262 + }, + { + "decKey": 265, + "incKey": 264 + } + ], + "axisCount": 2, + "buttonCount": 6, + "buttonKeys": [ + 260, + 268, + 266, + 261, + 269, + 267 + ], + "povCount": 0 + }, + { + "axisCount": 0, + "buttonCount": 0, + "povCount": 0 + } + ] +} diff --git a/simgui.json b/simgui.json new file mode 100644 index 0000000..a885f8b --- /dev/null +++ b/simgui.json @@ -0,0 +1,12 @@ +{ + "NTProvider": { + "types": { + "/FMSInfo": "FMSInfo", + "/SmartDashboard/Field": "Field2d", + "/SmartDashboard/SendableChooser[0]": "String Chooser" + } + }, + "NetworkTables Info": { + "visible": true + } +} diff --git a/src/main/java/frc/robot/Robot.java b/src/main/java/frc/robot/Robot.java index 7163e24..ceb7ee4 100644 --- a/src/main/java/frc/robot/Robot.java +++ b/src/main/java/frc/robot/Robot.java @@ -25,7 +25,7 @@ public class Robot extends TimedRobot { public static Alliance initAllianceColor = Alliance.Blue; private void checkDSUpdate() { - Alliance currentAlliance = DriverStation.getAlliance().get(); + Alliance currentAlliance = DriverStation.getAlliance().orElse(Alliance.Blue); // If we have data, and have a new alliance from last time if (DriverStation.isDSAttached() && currentAlliance != Alliance.Blue) { initAllianceColor = currentAlliance; diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index bcce282..79cafac 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -88,7 +88,6 @@ public RobotContainer() { private void configureShuffleBoardBindings(){ m_chooser.addOption("Run on Fly", m_runOnTheFly); - m_chooser.addOption("Test Path", m_trajectoryConfig.followPathGui("Double Path")); m_chooser.addOption("Move to Note", m_moveToNote); m_chooser.addOption("Score Speaker", scoreSpeaker); m_chooser.addOption("Score Amp", scoreAmp); diff --git a/src/main/java/frc/robot/commands/IntakeCommands/IntakeDown.java b/src/main/java/frc/robot/commands/IntakeCommands/IntakeDown.java index c4b0192..b9f9d7c 100644 --- a/src/main/java/frc/robot/commands/IntakeCommands/IntakeDown.java +++ b/src/main/java/frc/robot/commands/IntakeCommands/IntakeDown.java @@ -14,7 +14,7 @@ public class IntakeDown extends Command { public IntakeDown(Intake intake) { // Use addRequirements() here to declare subsystem dependencies. m_Intake = intake; - addRequirements(m_Intake); + addRequirements(intake); } // Called when the command is initially scheduled. diff --git a/src/main/java/frc/robot/commands/IntakeCommands/IntakeUp.java b/src/main/java/frc/robot/commands/IntakeCommands/IntakeUp.java index 2bd4cc2..dd94c54 100644 --- a/src/main/java/frc/robot/commands/IntakeCommands/IntakeUp.java +++ b/src/main/java/frc/robot/commands/IntakeCommands/IntakeUp.java @@ -14,7 +14,7 @@ public class IntakeUp extends Command { public IntakeUp(Intake intake) { // Use addRequirements() here to declare subsystem dependencies. m_Intake = intake; - addRequirements(m_Intake); + addRequirements(intake); } // Called when the command is initially scheduled. diff --git a/src/main/java/frc/robot/commands/IntakeCommands/MoveRollers.java b/src/main/java/frc/robot/commands/IntakeCommands/MoveRollers.java index 67101ee..b543887 100644 --- a/src/main/java/frc/robot/commands/IntakeCommands/MoveRollers.java +++ b/src/main/java/frc/robot/commands/IntakeCommands/MoveRollers.java @@ -14,7 +14,7 @@ public class MoveRollers extends Command { public MoveRollers(Intake intake) { // Use addRequirements() here to declare subsystem dependencies. m_Intake = intake; - addRequirements(m_Intake); + addRequirements(intake); } // Called when the command is initially scheduled. diff --git a/src/main/java/frc/robot/commands/ShooterCommands/ShootNoteAmp.java b/src/main/java/frc/robot/commands/ShooterCommands/ShootNoteAmp.java index c00fab0..e9a06e4 100644 --- a/src/main/java/frc/robot/commands/ShooterCommands/ShootNoteAmp.java +++ b/src/main/java/frc/robot/commands/ShooterCommands/ShootNoteAmp.java @@ -14,7 +14,7 @@ public class ShootNoteAmp extends Command { public ShootNoteAmp(Shooter shooter) { // Use addRequirements() here to declare subsystem dependencies. m_shooter = shooter; - addRequirements(m_shooter); + addRequirements(shooter); } // Called when the command is initially scheduled. diff --git a/src/main/java/frc/robot/commands/ShooterCommands/ShootNoteSpeaker.java b/src/main/java/frc/robot/commands/ShooterCommands/ShootNoteSpeaker.java index 74269dd..1be8cd5 100644 --- a/src/main/java/frc/robot/commands/ShooterCommands/ShootNoteSpeaker.java +++ b/src/main/java/frc/robot/commands/ShooterCommands/ShootNoteSpeaker.java @@ -14,7 +14,7 @@ public class ShootNoteSpeaker extends Command { public ShootNoteSpeaker(Shooter shooter) { // Use addRequirements() here to declare subsystem dependencies. m_Shooter = shooter; - addRequirements(m_Shooter); + addRequirements(shooter); } // Called when the command is initially scheduled. diff --git a/src/main/java/frc/robot/commands/ShooterCommands/ShooterLeftMotor.java b/src/main/java/frc/robot/commands/ShooterCommands/ShooterLeftMotor.java index 8e72e5c..816650a 100644 --- a/src/main/java/frc/robot/commands/ShooterCommands/ShooterLeftMotor.java +++ b/src/main/java/frc/robot/commands/ShooterCommands/ShooterLeftMotor.java @@ -14,7 +14,7 @@ public class ShooterLeftMotor extends Command { public ShooterLeftMotor(Shooter shooter) { // Use addRequirements() here to declare subsystem dependencies. m_shooter = shooter; - addRequirements(m_shooter); + addRequirements(shooter); } // Called when the command is initially scheduled. diff --git a/src/main/java/frc/robot/commands/ShooterCommands/ShooterRightMotor.java b/src/main/java/frc/robot/commands/ShooterCommands/ShooterRightMotor.java index d2841a0..6bf87b7 100644 --- a/src/main/java/frc/robot/commands/ShooterCommands/ShooterRightMotor.java +++ b/src/main/java/frc/robot/commands/ShooterCommands/ShooterRightMotor.java @@ -14,7 +14,7 @@ public class ShooterRightMotor extends Command { public ShooterRightMotor(Shooter shooter) { // Use addRequirements() here to declare subsystem dependencies. m_shooter = shooter; - addRequirements(m_shooter); + addRequirements(shooter); } // Called when the command is initially scheduled.