Skip to content

Commit

Permalink
Creating some subsystems and adding some variables to constants
Browse files Browse the repository at this point in the history
  • Loading branch information
Yonube committed Jan 17, 2025
1 parent e276870 commit d626125
Show file tree
Hide file tree
Showing 7 changed files with 67 additions and 39 deletions.
Original file line number Diff line number Diff line change
@@ -1,26 +1,21 @@
import frc.robot.subsystems.MechanicalParts.ElevatorSubsystem;
import frc.robot.Commands.PostionsCommands;



public class ElevatorGroundPickUp {

private final Elevator elevator;

public ElevatorGroundPickUp(Elevator elevator) {
this.elevator = elevator;
private final Elevator elevator;

public ElevatorGroundPickUp(Elevator elevator) {
this.elevator = elevator;

addRequirements(elevator);
}
addRequirements(elevator);
}

@Override
public void execute() {
if (!elevator.atTargetExtent()) return;
elevator.setDegrees(ElevatorGroundPickUp.ElevatorPosition);
}
@Override
public void execute() {
if (!elevator.atTargetExtent()) return;
elevator.setDegrees(ElevatorGroundPickUp.ElevatorPosition);
}

@Override
public void end(boolean interrupted) {
elevator.hold();
}
@Override
public void end(boolean interrupted) {
elevator.hold();
}
}
28 changes: 14 additions & 14 deletions main/java/frc/robot/Commands/PostionsCommands/ElevatorL1.java
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
public class ElevatorL1 {
private final Elevator elevator;
private final Elevator elevator;

public ElevatorL1(Elevator elevator) {
this.elevator = elevator;
public ElevatorL1(Elevator elevator) {
this.elevator = elevator;

addRequirements(elevator);
}
addRequirements(elevator);
}

@Override
public void execute() {
if (!elevator.atTargetExtent()) return;
elevator.setDegrees(ElevatorL1.ElevatorPosition);
}
@Override
public void execute() {
if (!elevator.atTargetExtent()) return;
elevator.setDegrees(ElevatorL1.ElevatorPosition);
}

@Override
public void end(boolean interrupted) {
elevator.hold();
}
@Override
public void end(boolean interrupted) {
elevator.hold();
}
}
6 changes: 4 additions & 2 deletions main/java/frc/robot/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,14 @@ public static final class ElevatorConstants {
public static final int L3Position = 2;
public static final int L4Position = 3;
public static final int AlgaeNetPosition = 4;

}

public static final class CoralIntakeConstants {
public static final int CoralIntakeMotor = 30;
public static final int CoralFlatPosition = 0;
public static final int CoralStraightPosition = 1;
}

public static final class ArmConstants {
public static final int ArmMotor = 40;
public static final int ArmFlatPosition = 0;
Expand All @@ -82,8 +83,9 @@ public static final class ArmConstants {
public static final int ArmRightGroundPickUpPosition = 5;
public static final int ArmStowedPosition = 6;
}

public static final class AlgaeIntakeConstants {
public static final int AlgaeIntakeMotor = 50;
public static final int AlgaeIntakeMotorID = 50;
}

public static final class ModuleConstants {
Expand Down
4 changes: 3 additions & 1 deletion main/java/frc/robot/RobotContainer.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
import frc.robot.Constants.DriveConstants;
import frc.robot.Constants.OIConstants;
import frc.robot.subsystems.DriveSubsystem;
import frc.robot.commands.ElevatorDown;
import frc.robot.commands.ElevatorUp;
import frc.robot.subsystems.Elevator;
import java.util.List;

Expand All @@ -35,7 +37,7 @@
public class RobotContainer {
// The robot's subsystems
private final DriveSubsystem m_robotDrive = new DriveSubsystem();
private final Elevator elevator = new Elevator(20);
private final Elevator elevator = new Elevator();

// The driver's controller
XboxController m_driverController = new XboxController(OIConstants.kDriverControllerPort);
Expand Down
29 changes: 27 additions & 2 deletions main/java/frc/robot/subsystems/AlgaeIntake.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,28 @@
public class AlgaeIntake {
import edu.wpi.first.wpilibj2.command.SubsystemBase;

public class AlgaeIntake extends SubsystemBase {
private final CANSparkMax AlgaeIntakeMotor;
public AlgaeIntake(int AlgaeIntakeMotorID) {
AlgaeIntakeMotor =
new CANSparkMax(AlgaeIntakeConstants.AlgaeIntakeMotorID, CANSparkMax.MotorType.kBrushless);

}
}
public void RotateRight() {
AlgaeIntakeMotor.set(1);
}

public void down() {
AlgaeIntakeMotor.set(-1);
}

public void hold() {
AlgaeIntakeMotor.set(0);
}

@Override
public void periodic() {}

public void stop() {
AlgaeIntakeMotor.stopMotor();
}
}
3 changes: 3 additions & 0 deletions main/java/frc/robot/subsystems/Arm.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
import edu.wpi.first.wpilibj2.command.Subsystem;

public class Arm {


}
1 change: 1 addition & 0 deletions main/java/frc/robot/subsystems/CoralIntake.java
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
public class CoralIntake {}

0 comments on commit d626125

Please sign in to comment.