diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index 8d6f254..ed9c14d 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -172,15 +172,30 @@ public class RobotContainer { .withPosition(0, 0) .withWidget(BuiltInWidgets.kComboBoxChooser); - sensorTab.addDouble("ElevatorPosition", elevator::getEncoderPosition) + sensorTab.addDouble("Elevator Position", elevator::getEncoderPosition) .withSize(2, 1) - .withPosition(0, 0) + .withPosition(0, 1) .withWidget(BuiltInWidgets.kTextView); - sensorTab.addDouble("ArmPosition", manipulatorPivot::getEncoderPosition) + sensorTab.addDouble("Manipulator Position", manipulatorPivot::getEncoderPosition) + .withSize(2, 1) + .withPosition(2, 1) + .withWidget(BuiltInWidgets.kTextView); + + sensorTab.addDouble("Climber Pivot Position", climberPivot::getEncoderPosition) .withSize(2, 1) .withPosition(2, 0) .withWidget(BuiltInWidgets.kTextView); + + sensorTab.addBoolean("Coral Sensor", manipulator::getCoralBeamBreak) + .withSize(1, 1) + .withPosition(4, 1) + .withWidget(BuiltInWidgets.kBooleanBox); + + sensorTab.addBoolean("Algae Sensor", manipulator::getAlgaePhotoSwitch) + .withSize(1, 1) + .withPosition(4, 0) + .withWidget(BuiltInWidgets.kBooleanBox); } public Command getAutonomousCommand() { diff --git a/src/main/java/frc/robot/subsystems/ClimberPivot.java b/src/main/java/frc/robot/subsystems/ClimberPivot.java index a8ee3b4..df065b9 100644 --- a/src/main/java/frc/robot/subsystems/ClimberPivot.java +++ b/src/main/java/frc/robot/subsystems/ClimberPivot.java @@ -62,4 +62,8 @@ public class ClimberPivot extends SubsystemBase { public boolean getCageLimitSwitch() { return cageLimitSwitch.get(); } -} + + public double getEncoderPosition() { + return neoEncoder.getPosition(); + } +} \ No newline at end of file diff --git a/src/main/java/frc/robot/subsystems/Manipulator.java b/src/main/java/frc/robot/subsystems/Manipulator.java index 90e431b..bff58d8 100644 --- a/src/main/java/frc/robot/subsystems/Manipulator.java +++ b/src/main/java/frc/robot/subsystems/Manipulator.java @@ -77,4 +77,12 @@ public class Manipulator extends SubsystemBase { ); }).until(() -> coralBeamBreak.get() || algaeBeamBreak.get()); } + + public boolean getCoralBeamBreak() { + return coralBeamBreak.get(); + } + + public boolean getAlgaePhotoSwitch() { + return algaeBeamBreak.get(); + } }