Skip to content

Commit

Permalink
Merge branch 'amp-servo' of https://github.com/SaintsRobotics/Crescen…
Browse files Browse the repository at this point in the history
…do2024 into amp-servo
  • Loading branch information
ProgrammingSR committed Oct 10, 2024
2 parents 0648c68 + ea72825 commit a9a0872
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/main/java/frc/robot/subsystems/IntakeSubsystem.java
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ public void resetHard() {
m_armEncoder.reset();
}

/** CS swears the problem isnt their fault yet here I am */
public void resetEvenHarder() {
reset();

Expand Down Expand Up @@ -192,6 +193,7 @@ public void colorSensorToggle() {
* yolo
*/
public void resetArmEncoder() {
// Double initalizing the encoder crashes the code
// m_armEncoder = new DutyCycleEncoder(IntakeConstants.kArmEncoderChannel);

// m_armEncoder.setPositionOffset(IntakeConstants.kArmEncoderOffset);
Expand Down

0 comments on commit a9a0872

Please sign in to comment.