Skip to content

Commit 320c6ca

Browse files
committed
renamed goals, added tunnable numbers for each of them
1 parent 12fcf32 commit 320c6ca

File tree

4 files changed

+21
-13
lines changed

4 files changed

+21
-13
lines changed

src/main/java/frc/robot/subsystems/elevator/Elevator.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ public class Elevator extends SubsystemBase {
3131

3232
private static final LoggedTunableNumber stow =
3333
new LoggedTunableNumber("Elevator/Stow Height", kElevatorHeights.stow());
34-
private static final LoggedTunableNumber l1 = new LoggedTunableNumber("Elevator/L1", kElevatorHeights.l1());
35-
private static final LoggedTunableNumber l2 = new LoggedTunableNumber("Elevator/L2", kElevatorHeights.l2());
36-
private static final LoggedTunableNumber l3 = new LoggedTunableNumber("Elevator/L3", kElevatorHeights.l3());
37-
private static final LoggedTunableNumber l4 = new LoggedTunableNumber("Elevator/L4", kElevatorHeights.l4());
34+
private static final LoggedTunableNumber l1 = new LoggedTunableNumber("Elevator/Setpoints/L1", kElevatorHeights.l1());
35+
private static final LoggedTunableNumber l2 = new LoggedTunableNumber("Elevator/Setpoints/L2", kElevatorHeights.l2());
36+
private static final LoggedTunableNumber l3 = new LoggedTunableNumber("Elevator/Setpoints/L3", kElevatorHeights.l3());
37+
private static final LoggedTunableNumber l4 = new LoggedTunableNumber("Elevator/Setpoints/L4", kElevatorHeights.l4());
3838

3939
@Getter
4040
@Setter

src/main/java/frc/robot/subsystems/intake/pivot/IntakePivot.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package frc.robot.subsystems.intake.pivot;
22

33
import static frc.robot.subsystems.elevator.ElevatorConstants.*;
4+
import static frc.robot.subsystems.intake.pivot.IntakePivotConstants.kTolorance;
45

56
import edu.wpi.first.wpilibj2.command.SubsystemBase;
67
import frc.robot.lib.LoggedTunableNumber;
@@ -26,11 +27,16 @@ public class IntakePivot extends SubsystemBase {
2627
private static final LoggedTunableNumber kA = new LoggedTunableNumber("Intake Pivot/Gains/kA", kGains.kA());
2728
private static final LoggedTunableNumber kG = new LoggedTunableNumber("Intake Pivot/Gains/kG", kGains.kG());
2829

30+
private static final LoggedTunableNumber intake = new LoggedTunableNumber("Intake Pivot/Setpoints/intake", 0);
31+
private static final LoggedTunableNumber l1 = new LoggedTunableNumber("Intake Pivot/Setpoints/L1", 50);
32+
private static final LoggedTunableNumber handoff = new LoggedTunableNumber("Intake Pivot/Setpoints/handoff", 150);
33+
34+
2935
public enum IntakePivotGoal {
3036
IDLE(() -> 0), // TODO: set idle angle
31-
TO_INTAKE(() -> 0), // TODO: Set intake angle
32-
TO_SCOREL1(() -> 50), // TODO: set scoring angle
33-
TO_INTAKE_HANDOFF(() -> 150); // TODO: set handoff angle
37+
INTAKE(intake), // TODO: Set intake angle
38+
L1(l1), // TODO: set scoring angle
39+
HANDOFF(handoff); // TODO: set handoff angle
3440

3541
@Getter
3642
private DoubleSupplier pivotAngle;
@@ -70,7 +76,7 @@ public void periodic() {
7076
@AutoLogOutput(key = "Intake Pivot/At Goal")
7177
public boolean atGoal() {
7278
return EqualsUtil.epsilonEquals(
73-
inputs.position, currentGoal.getPivotAngle().getAsDouble());
79+
inputs.position, currentGoal.getPivotAngle().getAsDouble(), kTolorance);
7480
}
7581

7682
public void runVolts(double volts) {

src/main/java/frc/robot/subsystems/outtake/endeffector/EndEffector.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,13 @@ public class EndEffector extends SubsystemBase {
2222
private static final LoggedTunableNumber kA = new LoggedTunableNumber("End Effector Roller/Gains/kA", kGains.kA());
2323
private static final LoggedTunableNumber kG = new LoggedTunableNumber("End Effector Roller/Gains/kG", kGains.kG());
2424

25+
private static final LoggedTunableNumber intake = new LoggedTunableNumber("End Effector Roller/Setpoint/intake", 0.0);
26+
2527
private EndEffectorRollerGoal currentGoal;
2628

2729
public enum EndEffectorRollerGoal {
2830
IDLE(() -> 0), // Should be the current angle
29-
INTAKE(() -> 0); // temporary
31+
INTAKE(intake); // temporary
3032

3133
@Getter
3234
private DoubleSupplier rollerVel;

src/main/java/frc/robot/subsystems/outtake/wrist/Wrist.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ public class Wrist extends SubsystemBase {
2727
private static final LoggedTunableNumber kA = new LoggedTunableNumber("Wrist/Gains/kA", kGains.kA());
2828
private static final LoggedTunableNumber kG = new LoggedTunableNumber("Wrist/Gains/kG", kGains.kG());
2929

30-
private static final LoggedTunableNumber l1 = new LoggedTunableNumber("Wrist/Gains/l1", 0);
31-
private static final LoggedTunableNumber l2 = new LoggedTunableNumber("Wrist/Gains/l2", 3);
32-
private static final LoggedTunableNumber l3 = new LoggedTunableNumber("Wrist/Gains/l3", 2);
33-
private static final LoggedTunableNumber l4 = new LoggedTunableNumber("Wrist/Gains/l4", 1);
30+
private static final LoggedTunableNumber l1 = new LoggedTunableNumber("Wrist/Setpoints/l1", 0);
31+
private static final LoggedTunableNumber l2 = new LoggedTunableNumber("Wrist/Setpoints/l2", 3);
32+
private static final LoggedTunableNumber l3 = new LoggedTunableNumber("Wrist/Setpoints/l3", 2);
33+
private static final LoggedTunableNumber l4 = new LoggedTunableNumber("Wrist/Setpoints/l4", 1);
3434
private static final LoggedTunableNumber handoff = new LoggedTunableNumber("Wrist/Setpoints/handoff", -60);
3535
private static final LoggedTunableNumber algae = new LoggedTunableNumber("Wrist/Setpoints/algae", 80);
3636

0 commit comments

Comments
 (0)