Skip to content

Commit

Permalink
minor misc changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Juliaaaahhhh committed Mar 2, 2024
1 parent bd5793c commit 3e58126
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions src/main/java/org/carlmontrobotics/subsystems/Arm.java
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ public Arm() {
setArmTarget(goalState.position);

// SmartDashboard.putNumber("Arm Max Vel", MAX_FF_VEL );
// SmartDashboard.putNumber("Wrist Max Vel", MAX_FF_VEL[WRIST]);
SmartDashboard.putNumber("ARM_TELEOP_MAX_GOAL_DIFF_FROM_CURRENT_RAD", ARM_TELEOP_MAX_GOAL_DIFF_FROM_CURRENT_RAD);
SmartDashboard.putNumber("Arm Tolerance Pos", posToleranceRad);
SmartDashboard.putNumber("Arm Tolerance Vel", velToleranceRadPSec);
Expand All @@ -93,7 +92,6 @@ public void periodic() {
if(DriverStation.isDisabled()) resetGoal();

//ARM_TELEOP_MAX_GOAL_DIFF_FROM_CURRENT_RAD = SmartDashboard.getNumber("ARM_TELEOP_MAX_GOAL_DIFF_FROM_CURRENT_RAD", ARM_TELEOP_MAX_GOAL_DIFF_FROM_CURRENT_RAD);
// wristConstraints = new TrapezoidProfile.Constraints(MAX_FF_VEL[WRIST], MAX_FF_ACCEL[WRIST]);
// armConstraints = new TrapezoidProfile.Constraints(MAX_FF_VEL , MAX_FF_ACCEL );
armPID1.setP(kP);
armPID1.setI(kI);
Expand Down Expand Up @@ -121,11 +119,7 @@ public void periodic() {
autoCancelArmCommand();
}

public TrapezoidProfile.State calculateCustomSetPoint(double goalSeconds, TrapezoidProfile.State currentPoint, TrapezoidProfile.State goalState) {
return armProfile.calculate(goalSeconds, currentPoint, goalState);
}

public void autoCancelArmCommand() {
public void autoCancelArmCommand() {
if(!(getDefaultCommand() instanceof ArmTeleop) || DriverStation.isAutonomous()) return;

double requestedSpeeds = ((ArmTeleop) getDefaultCommand()).getRequestedSpeeds();
Expand Down Expand Up @@ -187,7 +181,7 @@ public TrapezoidProfile.State getCurrentArmState() {


public TrapezoidProfile.State getCurrentArmGoal() {
return goalState ;
return goalState;
}


Expand Down

0 comments on commit 3e58126

Please sign in to comment.