Skip to content
This repository has been archived by the owner on May 19, 2024. It is now read-only.

Commit

Permalink
refactor: Remove motors.
Browse files Browse the repository at this point in the history
  • Loading branch information
haydenheroux committed Apr 9, 2024
1 parent a2cd733 commit f47b220
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 12 deletions.
7 changes: 5 additions & 2 deletions simgui.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,13 @@
"Position": {
"open": true
},
"Shoulder": {
"open": true
},
"Velocities": {
"open": true
}
},
"open": true
},
"Climber": {
"East": {
Expand Down Expand Up @@ -99,7 +103,6 @@
"Measurement": {
"open": true
},
"open": true,
"setpoint": {
"open": true
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/frc/robot/intake/Intake.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ public class Intake extends Subsystem {
/** Instance variable for the intake subsystem singleton. */
private static Intake instance = null;

/** Roller motors. */
/** Rollers. */
private final VelocityControllerIO frontRoller, backRoller;

/** Roller motor values. */
/** Roller values. */
private final VelocityControllerIOValues frontRollerValues, backRollerValues;

/** Creates a new instance of the intake subsystem. */
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/frc/robot/shooter/Shooter.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ public class Shooter extends Subsystem {

/** Creates a new instance of the shooter subsystem. */
private Shooter() {
serializer = ShooterFactory.createSerializerMotor();
serializer = ShooterFactory.createSerializer();
serializerValues = new VelocityControllerIOValues();
serializer.configure(SerializerConstants.CONTROLLER_CONSTANTS);

flywheel = ShooterFactory.createFlywheelMotor();
flywheel = ShooterFactory.createFlywheel();
flywheelValues = new VelocityControllerIOValues();
flywheel.configure(FlywheelConstants.CONTROLLER_CONSTANTS);
}
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/frc/robot/shooter/ShooterFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
public class ShooterFactory {

/**
* Creates a serializer motor.
* Creates a serializer.
*
* @return a serializer motor.
* @return a serializer.
*/
public static VelocityControllerIO createSerializerMotor() {
public static VelocityControllerIO createSerializer() {
if (Robot.isReal() && RobotConstants.REAL_SUBSYSTEMS.contains(Subsystem.SHOOTER)) {
return new VelocityControllerIOTalonFXPIDF(SerializerConstants.CAN, SerializerConstants.PIDF);
}
Expand All @@ -26,11 +26,11 @@ public static VelocityControllerIO createSerializerMotor() {
}

/**
* Creates a flywheel motor.
* Creates a flywheel.
*
* @return a flywheel motor.
* @return a flywheel.
*/
public static VelocityControllerIO createFlywheelMotor() {
public static VelocityControllerIO createFlywheel() {
if (Robot.isReal() && RobotConstants.REAL_SUBSYSTEMS.contains(Subsystem.SHOOTER)) {
return new VelocityControllerIOTalonFXPIDF(FlywheelConstants.CAN, FlywheelConstants.PIDF);
}
Expand Down

0 comments on commit f47b220

Please sign in to comment.