Skip to content

Commit

Permalink
Merge pull request #257 from frc5567/LimitSwitch3-20-23
Browse files Browse the repository at this point in the history
added limit switches for arm and elevator
  • Loading branch information
coverbeek committed Mar 20, 2023
2 parents 0ba5169 + cb0cea3 commit 14603ec
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/main/java/frc/robot/Arm.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public Arm() {
/**
* Method used to reset the encoder on the arm to 0.
*/
private void zeroEncoders() {
public void zeroEncoders() {
m_arm.getSensorCollection().setIntegratedSensorPosition(0, RobotMap.TIMEOUT_MS);
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/frc/robot/Elevator.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public Elevator() {
/**
* Resets the encoder postition to zero.
*/
private void zeroEncoders() {
public void zeroEncoders() {
m_elevator.setSelectedSensorPosition(0.0, RobotMap.ElevatorConstants.PID_PRIMARY, RobotMap.TIMEOUT_MS);
}

Expand Down
21 changes: 21 additions & 0 deletions src/main/java/frc/robot/Robot.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import edu.wpi.first.cameraserver.CameraServer;
import edu.wpi.first.cscore.UsbCamera;
import edu.wpi.first.wpilibj.DigitalInput;
import edu.wpi.first.wpilibj.TimedRobot;
import edu.wpi.first.wpilibj.smartdashboard.SendableChooser;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
Expand Down Expand Up @@ -41,6 +42,9 @@ public class Robot extends TimedRobot {
private int m_delayCounter;
private int m_outCounter;

private DigitalInput m_armSwitch;
private DigitalInput m_elevatorSwitch;

com.ctre.phoenix.sensors.Pigeon2 m_pigeon;


Expand Down Expand Up @@ -100,6 +104,12 @@ public void robotInit() {
m_shoulder.init();
m_claw.init();

//elevator
m_elevatorSwitch = new DigitalInput(8);

//arm
m_armSwitch = new DigitalInput(9);

try {
m_camera = CameraServer.startAutomaticCapture();

Expand Down Expand Up @@ -271,6 +281,17 @@ public void teleopPeriodic() {
if (coDriverInput.m_shoulderPos == ToggleInput.kToggle) {
m_shoulder.toggleShoulderState();
}

if (m_armSwitch.get()) {
m_arm.zeroEncoders();
//System.out.println("ARM SWITCH zero encoders");
}

if (m_elevatorSwitch.get()) {
m_elevator.zeroEncoders();
//System.out.println("ELEVATOR SWITCH zero encoders");
}

}

/** This function is called once when the robot is disabled. */
Expand Down

0 comments on commit 14603ec

Please sign in to comment.