Team4388/2023WayOfTheRobot
1
0
Fork 0
mirror of https://github.com/Team4388/2023WayOfTheRobot.git synced 2026-06-09 08:38:02 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Team4388/2023WayOfTheRobot

Browse Source
This commit is contained in:
66945
2023-02-25 14:17:52 -07:00
parent 5cfd803e1b 6165aebf57
commit bb3325aad1
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/frc4388/robot/Robot.java
+4 -1
View File
@@ -13,6 +13,7 @@ import java.io.PrintWriter;
import edu.wpi.first.wpilibj.DriverStation; import edu.wpi.first.wpilibj.DriverStation;
import edu.wpi.first.wpilibj.TimedRobot; import edu.wpi.first.wpilibj.TimedRobot;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import edu.wpi.first.wpilibj2.command.Command; import edu.wpi.first.wpilibj2.command.Command;
import edu.wpi.first.wpilibj2.command.CommandScheduler; import edu.wpi.first.wpilibj2.command.CommandScheduler;
import frc4388.utility.RobotTime; import frc4388.utility.RobotTime;
@@ -41,7 +42,7 @@ public class Robot extends TimedRobot {
// autonomous chooser on the dashboard. // autonomous chooser on the dashboard.
m_robotContainer = new RobotContainer(); m_robotContainer = new RobotContainer();
SmartDashboard.putData("AutoPlayback Chooser", m_robotContainer.chooser);
} }
/** /**
@@ -70,6 +71,8 @@ public class Robot extends TimedRobot {
@Override @Override
public void disabledInit() { public void disabledInit() {
m_robotTime.endMatchTime(); m_robotTime.endMatchTime();
SmartDashboard.putData("AutoPlayback Chooser", m_robotContainer.chooser);
} }
@Override @Override
src/main/java/frc4388/robot/RobotContainer.java
+3 -4
View File
@@ -64,7 +64,7 @@ public class RobotContainer {
private final DeadbandedXboxController m_operatorXbox = new DeadbandedXboxController(OIConstants.XBOX_OPERATOR_ID); private final DeadbandedXboxController m_operatorXbox = new DeadbandedXboxController(OIConstants.XBOX_OPERATOR_ID);
/* Autos */ /* Autos */
private SendableChooser<Command> chooser = new SendableChooser<>(); public SendableChooser<Command> chooser = new SendableChooser<>();
private Command noAuto = new InstantCommand(); private Command noAuto = new InstantCommand();
@@ -143,8 +143,8 @@ public class RobotContainer {
"Blue1Path.txt")) "Blue1Path.txt"))
.onFalse(new InstantCommand()); .onFalse(new InstantCommand());
new JoystickButton(getDeadbandedDriverController(), XboxController.LEFT_BUMPER_BUTTON) // new JoystickButton(getDeadbandedDriverController(), XboxController.LEFT_BUMPER_BUTTON)
.onTrue(new JoystickPlayback(m_robotSwerveDrive, "Blue1Path.txt")); // .onTrue(new JoystickPlayback(m_robotSwerveDrive, "Blue1Path.txt"));
// * Operator Buttons // * Operator Buttons
} }
@@ -157,7 +157,6 @@ public class RobotContainer {
public Command getAutonomousCommand() { public Command getAutonomousCommand() {
return chooser.getSelected(); return chooser.getSelected();
// return new InstantCommand();
} }
public DeadbandedXboxController getDeadbandedDriverController() { public DeadbandedXboxController getDeadbandedDriverController() {