Skip to content

Commit 17f6fc9

Browse files
committed
pit branch
1 parent ed2b756 commit 17f6fc9

File tree

9 files changed

+291
-321
lines changed

9 files changed

+291
-321
lines changed

src/main/java/frc/robot/AutoManager/AutoCommands.java

Lines changed: 0 additions & 204 deletions
This file was deleted.

src/main/java/frc/robot/AutoManager/AutoManager.java

Lines changed: 0 additions & 79 deletions
This file was deleted.

src/main/java/frc/robot/GlobalConstants.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package frc.robot;
22

3+
import java.util.ArrayList;
4+
import java.util.Arrays;
5+
36
import edu.wpi.first.wpilibj.RobotBase;
47
import edu.wpi.first.wpilibj.XboxController;
58

@@ -14,12 +17,17 @@ public enum RobotMode {
1417

1518
public static final double SIMULATION_PERIOD = 0.02;
1619

17-
public static final RobotMode ROBOT_MODE = RobotBase.isReal() ? RobotMode.SIM : RobotMode.REAL;
20+
public static final RobotMode ROBOT_MODE = RobotBase.isReal() ? RobotMode.REAL : RobotMode.SIM;
1821

1922

2023
public static final class Controllers {
2124

2225
public static final XboxController DRIVER_CONTROLLER = new XboxController(0);
2326
public static final XboxController OPERATOR_CONTROLLER = new XboxController(1);
2427
}
28+
29+
public static class FaultManagerConstants {
30+
31+
public static final ArrayList<Integer> CAN_DEVICE_ORDER = new ArrayList<Integer>(Arrays.asList( 2, 10, 35, 1, 7, 33, 11, 8));
32+
}
2533
}

src/main/java/frc/robot/Manager/Manager.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@
1111
import frc.robot.Subsystems.Climber.Climber;
1212
import frc.robot.Subsystems.Drive.Drive;
1313
import frc.robot.Subsystems.Drive.DriveStates;
14+
import frc.robot.Subsystems.FaultManager.FaultManager;
1415

1516
public class Manager extends Subsystem<ManagerStates> {
1617

1718
// private Climber climber;
1819
private AlgaeCoraler algaeCoraler;
1920
private Drive drive;
2021
private static Manager instance;
22+
private FaultManager faultManager = FaultManager.getInstance();
2123

2224
public static Manager getInstance() {
2325
if (instance == null) {
@@ -26,6 +28,7 @@ public static Manager getInstance() {
2628
return instance;
2729
}
2830

31+
2932
public Manager() {
3033
super("Manager", ManagerStates.IDLE);
3134

@@ -73,6 +76,7 @@ public void runState() {
7376
// climber.setState(getState().getClimber());
7477
algaeCoraler.setState(getState().getAlgaeCoraler());
7578
drive.periodic();
79+
faultManager.periodic();
7680

7781
// climber.periodic();
7882
algaeCoraler.periodic();

src/main/java/frc/robot/Robot.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,20 @@
1616
import edu.wpi.first.cameraserver.CameraServer;
1717
import edu.wpi.first.wpilibj.DriverStation;
1818
import edu.wpi.first.wpilibj2.command.CommandScheduler;
19-
import frc.robot.AutoManager.AutoManager;
19+
import frc.robot.GlobalConstants.FaultManagerConstants;
2020
import frc.robot.Manager.Manager;
2121
import frc.robot.Subsystems.Drive.Drive;
22+
import frc.robot.Subsystems.FaultManager.FaultManager;
2223
import frc.robot.Subsystems.Vision.Vision;
2324
import frc.robot.Utilitys.Utilitys;
25+
import frc.robot.GlobalConstants.FaultManagerConstants;
2426

2527
public class Robot extends LoggedRobot {
2628

2729
private Manager manager;
28-
private AutoManager autoManager;
2930
private Drive drive;
3031
private Vision vision;
32+
private FaultManager faultManager = FaultManager.getInstance();
3133

3234
public Robot() {}
3335

@@ -46,11 +48,12 @@ public void robotInit() {
4648
case REPLAY:
4749
Logger.addDataReceiver(new NT4Publisher());
4850
break;
51+
4952
}
5053

5154
manager = Manager.getInstance();
52-
autoManager = new AutoManager();
5355
vision = Vision.getInstance();
56+
FaultManager.getInstance().calibrateDeviceOrder(FaultManagerConstants.CAN_DEVICE_ORDER, "Main CAN");
5457

5558
Logger.start();
5659
PathfindingCommand.warmupCommand().schedule();
@@ -71,7 +74,6 @@ public void robotPeriodic() {
7174
@Override
7275
public void autonomousInit() {
7376
Drive.getInstance().zeroGyro();
74-
CommandScheduler.getInstance().schedule(autoManager.getSelectedCommand());
7577
}
7678

7779
@Override

0 commit comments

Comments
 (0)