Skip to content

Commit 610abdc

Browse files
Removed "Rollers" for flywheels
1 parent 815d856 commit 610abdc

2 files changed

Lines changed: 14 additions & 14 deletions

File tree

src/main/java/frc/robot/constants/ConstRotors.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ public class ConstRotors {
1414
public static final TalonFXConfiguration TRANSFER_ROLLERS_EAST_CONFIGURATION = new TalonFXConfiguration();
1515
public static final TalonFXConfiguration TRANSFER_ROLLERS_WEST_CONFIGURATION = new TalonFXConfiguration();
1616
public static final TalonFXConfiguration FLYWHEEL_EAST_FOLLOWER_CONFIGURATION = new TalonFXConfiguration();
17-
public static final TalonFXConfiguration FLYWHEEL_ROLLERS_EAST_CONFIGURATION = new TalonFXConfiguration();
18-
public static final TalonFXConfiguration FLYWHEEL_ROLLERS_WEST_CONFIGURATION = new TalonFXConfiguration();
17+
public static final TalonFXConfiguration FLYWHEEL_EAST_CONFIGURATION = new TalonFXConfiguration();
18+
public static final TalonFXConfiguration FLYWHEEL_WEST_CONFIGURATION = new TalonFXConfiguration();
1919
public static final TalonFXConfiguration FLYWHEEL_WEST_FOLLOWER_CONFIGURATION = new TalonFXConfiguration();
2020

2121
public static final double STOP = 0;

src/main/java/frc/robot/subsystems/Rotors.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ public class Rotors extends SubsystemBase {
2020
final TalonFX intakeRollersEast = new TalonFX(rotorIDs.INTAKE_ROLLERS_EAST_CAN);
2121
final TalonFX transferRollersWest = new TalonFX((rotorIDs.TRANSFER_ROLLERS_WEST_CAN));
2222
final TalonFX transferRollersEast = new TalonFX((rotorIDs.TRANSFER_ROLLERS_EAST_CAN));
23-
final TalonFX flywheelRollersWest = new TalonFX((rotorIDs.FLYWHEEL_WEST_CAN));
24-
final TalonFX flywheelRollersEast = new TalonFX((rotorIDs.FLYWHEEL_EAST_CAN));
23+
final TalonFX flywheelWest = new TalonFX((rotorIDs.FLYWHEEL_WEST_CAN));
24+
final TalonFX flywheelEast = new TalonFX((rotorIDs.FLYWHEEL_EAST_CAN));
2525
final TalonFX flywheelWestFollower = new TalonFX((rotorIDs.FLYWHEEL_WEST_FOLLOWER_CAN));
2626
final TalonFX flywheelEastFollower = new TalonFX(rotorIDs.FLYWHEEL_EAST_FOLLOWER_CAN);
2727

@@ -32,8 +32,8 @@ public Rotors() {
3232
intakeRollersWest.getConfigurator().apply(ConstRotors.INTAKE_ROLLERS_WEST_CONFIGURATION);
3333
transferRollersEast.getConfigurator().apply(ConstRotors.TRANSFER_ROLLERS_EAST_CONFIGURATION);
3434
transferRollersWest.getConfigurator().apply(ConstRotors.TRANSFER_ROLLERS_WEST_CONFIGURATION);
35-
flywheelRollersEast.getConfigurator().apply(ConstRotors.FLYWHEEL_ROLLERS_EAST_CONFIGURATION);
36-
flywheelRollersWest.getConfigurator().apply(ConstRotors.FLYWHEEL_ROLLERS_WEST_CONFIGURATION);
35+
flywheelEast.getConfigurator().apply(ConstRotors.FLYWHEEL_EAST_CONFIGURATION);
36+
flywheelWest.getConfigurator().apply(ConstRotors.FLYWHEEL_WEST_CONFIGURATION);
3737
flywheelEastFollower.getConfigurator().apply(ConstRotors.FLYWHEEL_EAST_FOLLOWER_CONFIGURATION);
3838
flywheelWestFollower.getConfigurator().apply(ConstRotors.FLYWHEEL_WEST_FOLLOWER_CONFIGURATION);
3939
}
@@ -58,12 +58,12 @@ public AngularVelocity getTransferRollersWestVelocity() {
5858
return transferRollersWest.getVelocity().getValue();
5959
}
6060

61-
public AngularVelocity getFlywheelRollersEastVelocity() {
62-
return flywheelRollersEast.getVelocity().getValue();
61+
public AngularVelocity getFlywheelEastVelocity() {
62+
return flywheelEast.getVelocity().getValue();
6363
}
6464

65-
public AngularVelocity getFlywheelRollersWestVelocity() {
66-
return flywheelRollersWest.getVelocity().getValue();
65+
public AngularVelocity getFlywheelWestVelocity() {
66+
return flywheelWest.getVelocity().getValue();
6767
}
6868

6969
public AngularVelocity getFlywheelEastFollowerVelocity() {
@@ -94,12 +94,12 @@ public void transferRollersWestSpeed(double speed) {
9494
transferRollersWest.set(speed);
9595
}
9696

97-
public void flywheelRollersEastSpeed(double speed) {
98-
flywheelRollersEast.set(speed);
97+
public void flywheelEastSpeed(double speed) {
98+
flywheelEast.set(speed);
9999
}
100100

101-
public void flywheelRollersWestSpeed(double speed) {
102-
flywheelRollersWest.set(speed);
101+
public void flywheelWestSpeed(double speed) {
102+
flywheelWest.set(speed);
103103
}
104104

105105
public void flywheelWestFollowerSpeed(double speed) {

0 commit comments

Comments
 (0)