diff --git a/src/main/java/org/team1540/robot2024/commands/climb/TrapAndClimbSequence.java b/src/main/java/org/team1540/robot2024/commands/climb/TrapAndClimbSequence.java index c0c0947f..82505982 100644 --- a/src/main/java/org/team1540/robot2024/commands/climb/TrapAndClimbSequence.java +++ b/src/main/java/org/team1540/robot2024/commands/climb/TrapAndClimbSequence.java @@ -20,8 +20,7 @@ public TrapAndClimbSequence(Elevator elevator, Hooks hooks, Tramp tramp) { new ParallelDeadlineGroup( new WaitCommand(Constants.Tramp.TRAP_SCORING_TIME_SECONDS), new ScoreInTrap(tramp) //TODO: Do whatever to this but not my job - ), - new ElevatorSetpointCommand(elevator, ElevatorState.BOTTOM) + ) ); } } diff --git a/src/main/java/org/team1540/robot2024/subsystems/elevator/Elevator.java b/src/main/java/org/team1540/robot2024/subsystems/elevator/Elevator.java index a44f5d25..28616a6a 100644 --- a/src/main/java/org/team1540/robot2024/subsystems/elevator/Elevator.java +++ b/src/main/java/org/team1540/robot2024/subsystems/elevator/Elevator.java @@ -38,7 +38,7 @@ public void periodic(){ public void setElevatorPosition(double positionMeters) { positionMeters = MathUtil.clamp(positionMeters, Constants.Elevator.ELEVATOR_MINIMUM_HEIGHT, Constants.Elevator.ELEVATOR_MAX_HEIGHT); setpointMeters = positionMeters; - io.setPositionMeters(setpointMeters); + io.setSetpointMeters(setpointMeters); positionFilter.clear(); } diff --git a/src/main/java/org/team1540/robot2024/subsystems/elevator/ElevatorIO.java b/src/main/java/org/team1540/robot2024/subsystems/elevator/ElevatorIO.java index c351c053..f0c242bb 100644 --- a/src/main/java/org/team1540/robot2024/subsystems/elevator/ElevatorIO.java +++ b/src/main/java/org/team1540/robot2024/subsystems/elevator/ElevatorIO.java @@ -15,7 +15,7 @@ class ElevatorIOInputs { default void updateInputs(ElevatorIOInputs inputs) {} - default void setPositionMeters(double position) {} + default void setSetpointMeters(double position) {} default void setVoltage(double voltage) {} } diff --git a/src/main/java/org/team1540/robot2024/subsystems/elevator/ElevatorIOSim.java b/src/main/java/org/team1540/robot2024/subsystems/elevator/ElevatorIOSim.java index e0d428aa..55cd8d1a 100644 --- a/src/main/java/org/team1540/robot2024/subsystems/elevator/ElevatorIOSim.java +++ b/src/main/java/org/team1540/robot2024/subsystems/elevator/ElevatorIOSim.java @@ -56,7 +56,7 @@ public void setVoltage(double volts) { elevatorAppliedVolts = MathUtil.clamp(volts, -12.0, 12.0); } @Override - public void setPositionMeters(double position) { + public void setSetpointMeters(double position) { isClosedLoop = true; setpoint = new TrapezoidProfile.State(position, 0.0); } diff --git a/src/main/java/org/team1540/robot2024/subsystems/elevator/ElevatorIOTalonFX.java b/src/main/java/org/team1540/robot2024/subsystems/elevator/ElevatorIOTalonFX.java index f735137e..fcecef4a 100644 --- a/src/main/java/org/team1540/robot2024/subsystems/elevator/ElevatorIOTalonFX.java +++ b/src/main/java/org/team1540/robot2024/subsystems/elevator/ElevatorIOTalonFX.java @@ -90,7 +90,7 @@ public void updateInputs(ElevatorIOInputs inputs) { } @Override - public void setPositionMeters(double positionMeters) { + public void setSetpointMeters(double positionMeters) { leader.setControl(motionMagicOut.withPosition(positionMeters)); } diff --git a/vendordeps/photonlib-json-1.0.json b/vendordeps/photonlib-json-1.0.json index 8b19d38a..5939abc0 100644 --- a/vendordeps/photonlib-json-1.0.json +++ b/vendordeps/photonlib-json-1.0.json @@ -1,7 +1,7 @@ { "fileName": "photonlib.json", "name": "photonlib", - "version": "v2024.2.2", + "version": "v2024.2.3", "uuid": "515fe07e-bfc6-11fa-b3de-0242ac130004", "frcYear": "2024", "mavenUrls": [ @@ -14,7 +14,7 @@ { "groupId": "org.photonvision", "artifactId": "photonlib-cpp", - "version": "v2024.2.2", + "version": "v2024.2.3", "libName": "photonlib", "headerClassifier": "headers", "sharedLibrary": true, @@ -29,7 +29,7 @@ { "groupId": "org.photonvision", "artifactId": "photontargeting-cpp", - "version": "v2024.2.2", + "version": "v2024.2.3", "libName": "photontargeting", "headerClassifier": "headers", "sharedLibrary": true, @@ -46,12 +46,12 @@ { "groupId": "org.photonvision", "artifactId": "photonlib-java", - "version": "v2024.2.2" + "version": "v2024.2.3" }, { "groupId": "org.photonvision", "artifactId": "photontargeting-java", - "version": "v2024.2.2" + "version": "v2024.2.3" } ] }