Skip to content

Commit 5f18540

Browse files
committed
unfinished sim stuff
1 parent 1bae63c commit 5f18540

File tree

6 files changed

+21
-1
lines changed

6 files changed

+21
-1
lines changed

src/main/java/frc/robot/Subsystems/Climber/ClimberIOReal.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import com.ctre.phoenix6.hardware.TalonFX;
77
import com.ctre.phoenix6.signals.MotorAlignmentValue;
88
import edu.wpi.first.math.controller.PIDController;
9+
import edu.wpi.first.math.geometry.Pose2d;
10+
import edu.wpi.first.math.geometry.Pose3d;
911
import edu.wpi.first.units.measure.Angle;
1012
import org.littletonrobotics.junction.Logger;
1113

src/main/java/frc/robot/Subsystems/Climber/ClimberIOSim.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import com.ctre.phoenix6.controls.Follower;
66
import com.ctre.phoenix6.signals.MotorAlignmentValue;
77
import com.ctre.phoenix6.sim.TalonFXSimState;
8+
9+
import edu.wpi.first.math.geometry.Pose3d;
810
import edu.wpi.first.math.system.plant.DCMotor;
911
import edu.wpi.first.math.system.plant.LinearSystemId;
1012
import edu.wpi.first.units.measure.Angle;
@@ -52,6 +54,7 @@ public void logOutputs(ClimberIOOutputs outputs) {
5254
Logger.recordOutput(ClimberConstants.SUBSYSTEM_NAME + "/SimLeftRot", outputs.leftPosition.in(Rotations));
5355
Logger.recordOutput(ClimberConstants.SUBSYSTEM_NAME + "/SimRightRot", outputs.rightPosition.in(Rotations));
5456
Logger.recordOutput(ClimberConstants.SUBSYSTEM_NAME + "/SimSetpointRot", outputs.setpoint.in(Rotations));
57+
Logger.recordOutput(ClimberConstants.SUBSYSTEM_NAME + "/Pose", new Pose3d());
5558
}
5659

5760
@Override

src/main/java/frc/robot/Subsystems/Shooter/Shooter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public void runState() {
4343
Logger.recordOutput(SUBSYSTEM_NAME + "/WheelSetpoint", outputs.wheelSetpoint.in(RotationsPerSecond));
4444
Logger.recordOutput(SUBSYSTEM_NAME + "/HoodAngle", outputs.hoodAngle.in(Degrees));
4545
Logger.recordOutput(SUBSYSTEM_NAME + "/HoodSetpoint", outputs.hoodSetpoint.in(Degrees));
46+
Logger.recordOutput(SUBSYSTEM_NAME + "/HoodPose", outputs.hoodPose);
4647
Logger.recordOutput(SUBSYSTEM_NAME + "/state", getState().getStateString());
4748
Logger.recordOutput(SUBSYSTEM_NAME + "/ReadyToShoot", readyToShoot());
4849
}

src/main/java/frc/robot/Subsystems/Shooter/ShooterIO.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package frc.robot.Subsystems.Shooter;
22

3+
import edu.wpi.first.math.geometry.Pose3d;
34
import edu.wpi.first.units.measure.Angle;
45
import edu.wpi.first.units.measure.AngularVelocity;
56

@@ -10,7 +11,8 @@ class ShooterIOOutputs {
1011
public AngularVelocity rightWheelVelocity;
1112
public AngularVelocity wheelSetpoint;
1213
public Angle hoodAngle;
13-
public Angle hoodSetpoint;
14+
public Angle hoodSetpoint;
15+
public Pose3d hoodPose;
1416
}
1517

1618
public abstract void logOutputs(ShooterIOOutputs outputs);

src/main/java/frc/robot/Subsystems/Shooter/ShooterIOSim.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
import com.ctre.phoenix6.hardware.TalonFX;
1212
import com.ctre.phoenix6.signals.MotorAlignmentValue;
1313
import com.ctre.phoenix6.sim.TalonFXSimState;
14+
15+
import edu.wpi.first.math.geometry.Pose3d;
16+
import edu.wpi.first.math.geometry.Rotation3d;
1417
import edu.wpi.first.math.system.plant.DCMotor;
1518
import edu.wpi.first.math.system.plant.LinearSystemId;
1619
import edu.wpi.first.math.util.Units;
@@ -78,6 +81,8 @@ public void logOutputs(ShooterIOOutputs outputs) {
7881
outputs.hoodAngle = Radians.of(hoodSim.getAngleRads());
7982
outputs.hoodSetpoint = hoodSetpoint;
8083
// Throw some stuff here for 3D sim later
84+
85+
outputs.hoodPose = new Pose3d(0, 0, 0, new Rotation3d(Radians.of(hoodSim.getAngleRads()), Radians.of(0), Radians.of(0)));
8186
}
8287

8388
@Override

src/main/java/frc/robot/subsystems/Intake/IntakeIOSim.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,14 @@
33
import static edu.wpi.first.units.Units.*;
44
import static frc.robot.Subsystems.Intake.IntakeConstants.*;
55

6+
import org.littletonrobotics.junction.Logger;
7+
68
import com.ctre.phoenix6.hardware.TalonFX;
79
import com.ctre.phoenix6.sim.TalonFXSimState;
810
import edu.wpi.first.math.controller.PIDController;
11+
import edu.wpi.first.math.geometry.Pose3d;
12+
import edu.wpi.first.math.geometry.Rotation2d;
13+
import edu.wpi.first.math.geometry.Rotation3d;
914
import edu.wpi.first.math.system.plant.DCMotor;
1015
import edu.wpi.first.math.system.plant.LinearSystemId;
1116
import edu.wpi.first.units.measure.AngularVelocity;
@@ -59,6 +64,8 @@ public void logOutputs(IntakeIOOutputs outputs) {
5964
outputs.linearPosition = Meters.of(linearSim.getAngularPositionRotations() * LINEAR_METERS_PER_ROTATION);
6065
outputs.linearSetpoint = setpoint;
6166
outputs.linearVelocity = MetersPerSecond.of(linearSim.getAngularVelocity().in(RotationsPerSecond) * LINEAR_METERS_PER_ROTATION);
67+
68+
Logger.recordOutput("Intake/Intake Position", new Pose3d(0.296694, 0.0, 0.223, new Rotation3d(Radians.of(0), Radians.of(linearSim.getAngularPositionRotations()), Radians.of(0))));
6269
}
6370

6471
@Override

0 commit comments

Comments
 (0)