Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/main/java/frc/robot/DeviceIDs.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ public static class drivetrainIDs {
public static final int BACK_RIGHT_ABSOLUTE_ENCODER_CAN = 3;
}

// Rotor and Motion IDs: 10~29
public static class rotorIDs {
// FreeSpin IDs: 10~29
public static class freeSpinIDs {

}

// Motion Profile IDs: 30~49
public static class motionIDs {
// Positional IDs: 30~49
public static class positionalIDs {

}
}
12 changes: 6 additions & 6 deletions src/main/java/frc/robot/RobotContainer.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
import frc.robot.subsystems.DriverStateMachine;
import frc.robot.subsystems.DriverStateMachine.DriverState;
import frc.robot.subsystems.Drivetrain;
import frc.robot.subsystems.Motion;
import frc.robot.subsystems.FreeSpin;
import frc.robot.subsystems.Positional;
import frc.robot.subsystems.RobotPoses;
import frc.robot.subsystems.Rotors;
import frc.robot.subsystems.StateMachine;
import frc.robot.subsystems.StateMachine.RobotState;
import frc.robot.subsystems.Telemetry;
Expand All @@ -48,10 +48,10 @@ public class RobotContainer {

private final SN_XboxController conDriver = new SN_XboxController(controllerIDs.DRIVER_USB);

public static final Rotors rotorsInstance = new Rotors();
private final Rotors loggedRotorsInstance = rotorsInstance;
public static final Motion motionInstance = new Motion();
private final Motion loggedMotionInstance = motionInstance;
public static final FreeSpin freeSpinInstance = new FreeSpin();
private final FreeSpin loggedFreeSpinInstance = freeSpinInstance;
public static final Positional positionalInstance = new Positional();
private final Positional loggedPositionalInstance = positionalInstance;
public static final Drivetrain drivetrainInstance = new Drivetrain();
private final Drivetrain loggedDrivetrainInstance = drivetrainInstance;
public static final DriverStateMachine driverStateMachineInstance = new DriverStateMachine();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package frc.robot.constants;

/** Add your docs here. */
public class ConstMotion {
public class ConstFreeSpin {
public static final double STOP = 0;

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package frc.robot.constants;

/** Add your docs here. */
public class ConstRotors {
public class ConstPositional {
public static final double STOP = 0;

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@
import edu.wpi.first.wpilibj2.command.SubsystemBase;

@Logged
public class Motion extends SubsystemBase {
/** Creates a new Motion. */
public Motion() {
public class FreeSpin extends SubsystemBase {
public FreeSpin() {
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@
import edu.wpi.first.wpilibj2.command.SubsystemBase;

@Logged
public class Rotors extends SubsystemBase {
/** Creates a new Rotors. */
public Rotors() {
public class Positional extends SubsystemBase {
public Positional() {
}

@Override
Expand Down
Loading