Skip to content

Commit f2911f3

Browse files
committed
alll spark maxes and everything
1 parent 17f6fc9 commit f2911f3

File tree

11 files changed

+67
-5
lines changed

11 files changed

+67
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ public static final class Controllers {
2828

2929
public static class FaultManagerConstants {
3030

31-
public static final ArrayList<Integer> CAN_DEVICE_ORDER = new ArrayList<Integer>(Arrays.asList( 2, 10, 35, 1, 7, 33, 11, 8));
31+
public static final ArrayList<Integer> CAN_DEVICE_ORDER = new ArrayList<Integer>(Arrays.asList( 5, 15, 16, 2, 10, 35, 1, 7, 33, 11, 8));
3232
}
3333
}

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public class Manager extends Subsystem<ManagerStates> {
2020
private Drive drive;
2121
private static Manager instance;
2222
private FaultManager faultManager = FaultManager.getInstance();
23+
private Climber climber;
2324

2425
public static Manager getInstance() {
2526
if (instance == null) {
@@ -32,9 +33,12 @@ public static Manager getInstance() {
3233
public Manager() {
3334
super("Manager", ManagerStates.IDLE);
3435

35-
// climber = new Climber();
3636
algaeCoraler = AlgaeCoraler.getInstance();
3737
drive = Drive.getInstance();
38+
climber = new Climber();
39+
faultManager.addDevice(algaeCoraler.getWheelSpark(), "Coral and Algae Wheel Spark", "Main CAN");
40+
faultManager.addDevice(algaeCoraler.getPivotSpark(), "Pivot Spark", "Main CAN");
41+
faultManager.addDevice(climber.getClimberSpark(), "Climer Spark", "Main CAN");
3842

3943
// Scoring/intaking Coral
4044
// addTrigger(IDLE, CORAL_OUT, () -> robotHasCoral() && DRIVER_CONTROLLER.getYButtonPressed());
@@ -73,12 +77,12 @@ public void runState() {
7377
Logger.recordOutput(SUBSYSTEM_NAME + "/State Time", getStateTime());
7478
Logger.recordOutput(SUBSYSTEM_NAME + "/State String", getState().getStateString());
7579

76-
// climber.setState(getState().getClimber());
80+
climber.setState(getState().getClimber());
7781
algaeCoraler.setState(getState().getAlgaeCoraler());
7882
drive.periodic();
7983
faultManager.periodic();
8084

81-
// climber.periodic();
85+
climber.periodic();
8286
algaeCoraler.periodic();
8387

8488
if (Controllers.DRIVER_CONTROLLER.getXButtonPressed() || Controllers.OPERATOR_CONTROLLER.getXButtonPressed()) {

src/main/java/frc/robot/Subsystems/AlgaeCoraler/AlgaeCoraler.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import org.littletonrobotics.junction.Logger;
77
import org.team7525.subsystem.Subsystem;
88

9+
import com.revrobotics.spark.SparkMax;
10+
911
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
1012

1113
public class AlgaeCoraler extends Subsystem<AlgaeCoralerStates> {
@@ -69,4 +71,12 @@ public boolean hasCoral() {
6971
public double getStateTime() {
7072
return super.getStateTime();
7173
}
74+
75+
public SparkMax getWheelSpark() {
76+
return io.getWheelsSpark();
77+
}
78+
79+
public SparkMax getPivotSpark() {
80+
return io.getPivotSpark();
81+
}
7282
}

src/main/java/frc/robot/Subsystems/AlgaeCoraler/AlgaeCoralerIO.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import edu.wpi.first.units.measure.Angle;
44
import org.littletonrobotics.junction.AutoLog;
55

6+
import com.revrobotics.spark.SparkMax;
7+
68
public interface AlgaeCoralerIO {
79
@AutoLog
810
public static class AlgaeCoralerIOInputs {
@@ -29,5 +31,9 @@ public static class AlgaeCoralerIOInputs {
2931
public boolean hasCoral();
3032

3133
public void setThere(boolean there);
34+
35+
public SparkMax getWheelsSpark();
36+
37+
public SparkMax getPivotSpark();
3238

3339
}

src/main/java/frc/robot/Subsystems/AlgaeCoraler/AlgaeCoralerIOReal.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,4 +109,14 @@ public boolean hasCoral() {
109109
public void setThere(boolean there) {
110110
this.there = there;
111111
}
112+
113+
@Override
114+
public SparkMax getWheelsSpark() {
115+
return wheelsMotor;
116+
}
117+
118+
@Override
119+
public SparkMax getPivotSpark() {
120+
return pivotMotor;
121+
}
112122
}

src/main/java/frc/robot/Subsystems/AlgaeCoraler/AlgaeCoralerIOSim.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,4 +128,14 @@ public boolean hasCoral() {
128128
public void setThere(boolean there) {
129129
System.out.println("...");
130130
}
131+
132+
@Override
133+
public SparkMax getPivotSpark() {
134+
return dummyPivotSpark;
135+
}
136+
137+
@Override
138+
public SparkMax getWheelsSpark() {
139+
return dummyWheelsSpark;
140+
}
131141
}

src/main/java/frc/robot/Subsystems/Climber/Climber.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import org.littletonrobotics.junction.Logger;
77
import org.team7525.subsystem.Subsystem;
88

9+
import com.revrobotics.spark.SparkMax;
10+
911
public class Climber extends Subsystem<ClimberStates> {
1012

1113
private ClimberIO io;
@@ -30,4 +32,7 @@ public void runState() {
3032
Logger.processInputs(SUBSYSTEM_NAME, inputs);
3133
Logger.recordOutput(SUBSYSTEM_NAME + "/State", getState().getStateString());
3234
}
35+
public SparkMax getClimberSpark() {
36+
return io.getClimberSpark();
37+
}
3338
}

src/main/java/frc/robot/Subsystems/Climber/ClimberIO.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package frc.robot.Subsystems.Climber;
22
import org.littletonrobotics.junction.AutoLog;
33

4+
import com.revrobotics.spark.SparkMax;
5+
46
public interface ClimberIO {
57
@AutoLog
68
public static class ClimberIOInputs {
@@ -10,5 +12,6 @@ public static class ClimberIOInputs {
1012
public void updateInputs(ClimberIOInputs input);
1113

1214
public void setSpeed(double speed);
15+
public SparkMax getClimberSpark();
1316

1417
}

src/main/java/frc/robot/Subsystems/Climber/ClimberIOReal.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,9 @@ public void updateInputs(ClimberIOInputs inputs) {
2222
public void setSpeed(double speed) {
2323
motor.set(speed);
2424
}
25+
26+
@Override
27+
public SparkMax getClimberSpark() {
28+
return motor;
29+
}
2530
}

src/main/java/frc/robot/Subsystems/Climber/ClimberIOSim.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,11 @@ public void updateInputs(ClimberIOInputs inputs) {
4444
public void setSpeed(double speed) {
4545
climberSim.setInput(speed);
4646
}
47+
48+
@Override
49+
public SparkMax getClimberSpark() {
50+
return dummySpark;
51+
}
52+
53+
4754
}

0 commit comments

Comments
 (0)