Skip to content

Commit

Permalink
Merge branch 'main' into Autonomous-Improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
team6101 authored Mar 6, 2024
2 parents d09bc1c + 925554a commit d77aeaa
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/main/java/frc/robot/Robot.java
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,13 @@ public class Robot extends TimedRobot {
MotorController leftClimb = MotorControllerFactory.create(
Constants.LEFT_CLIMB_ID,
MotorController.Type.SparkMaxBrushed

);
MotorController rightClimb = MotorControllerFactory.create(
Constants.RIGHT_CLIMB_ID,
MotorController.Type.SparkMaxBrushed
);

// MotorController intake = MotorControllerFactory.create(Constants.INTAKE_ID, MotorController.Type.SparkMaxBrushless);

XboxController driverController = new XboxController(Constants.DRIVER_CONTROLLER_ID);
Expand Down Expand Up @@ -112,6 +114,7 @@ public void robotInit() {
autonRouteChooser.addOption("Test SmartMotion movement", AutonRoutes.TEST_SMART_MOTION_MOVEMENT);
autonRouteChooser.addOption("Test Manual PID movement", AutonRoutes.TEST_PID_MOVEMENT);


SmartDashboard.putData("Auton Routes", autonRouteChooser);

driveLeftChild.follow(driveLeftParent);
Expand Down

0 comments on commit d77aeaa

Please sign in to comment.