ran (climb moves) only up and calibrate working + adjusted shooter mod

diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
index 56ebb662036c9d1875855c05c47fc705ae997463..85ed2ed134c88ae84259825f2ede963ce35e017f 100644 (file)
--- a/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@ -226,7 +226,7 @@ public class RobotContainer {
 
     if (turret != null && drive != null && hood != null && shooter != null && spindexer != null) {
       Command runSpindexer = new RunSpindexer(spindexer, turret);
-      NamedCommands.registerCommand("Auto shoot", new Superstructure(turret, drive, hood, shooter, spindexer));
+      NamedCommands.registerCommand("Auto shoot", new AutoShootCommand(turret, drive, hood, shooter, spindexer));
       NamedCommands.registerCommand("Start Spindexer",
           new InstantCommand(() -> CommandScheduler.getInstance().schedule(runSpindexer)));
       NamedCommands.registerCommand("Stop Spindexer", new InstantCommand(() -> runSpindexer.cancel()));

diff --git a/src/main/java/frc/robot/subsystems/Climb/ClimbConstants.java b/src/main/java/frc/robot/subsystems/Climb/ClimbConstants.java
index ff626c5f2996e7ad0dc0bcdcdf2b4a96a73c21d8..9a631ff1d3766c6c27b81067500fee7f52b038a3 100644 (file)
--- a/src/main/java/frc/robot/subsystems/Climb/ClimbConstants.java
+++ b/src/main/java/frc/robot/subsystems/Climb/ClimbConstants.java
@@ -1,5 +1,6 @@
 package frc.robot.subsystems.Climb;
 
+
 import edu.wpi.first.math.util.Units;
 
 public class ClimbConstants {
@@ -11,11 +12,11 @@ public class ClimbConstants {
     /** Winch spool radius in meters */
     public final static double WHEEL_RADIUS = Units.inchesToMeters(0.334);
     /** climber stowed ? position in meters */
-    public final static double BOTTOM_POSITION = Units.inchesToMeters(-8);
+    public final static double BOTTOM_POSITION = Units.inchesToMeters(8);
     /** Calibration position: lower than BOTTOM_POSITION to reduce motor strain */
-    public final static double CALIBRATION_POSITION = Units.inchesToMeters(-8.5);
+    public final static double CALIBRATION_POSITION = Units.inchesToMeters(8.5);
     /** position that should put the robot off the ground? in meters. */
-    public final static double CLIMB_POSITION = Units.inchesToMeters(-6);
+    public final static double CLIMB_POSITION = Units.inchesToMeters(6);
     public final static double UP_POSITION = 0.0;
 
     // current limits (in amps)

diff --git a/src/main/java/frc/robot/subsystems/Climb/LinearClimb.java b/src/main/java/frc/robot/subsystems/Climb/LinearClimb.java
index 812a31db9db1c41427423b6fe3914541fe099b77..986c093bb156aaa2b3afa4ebde8258c91400b9da 100644 (file)
--- a/src/main/java/frc/robot/subsystems/Climb/LinearClimb.java
+++ b/src/main/java/frc/robot/subsystems/Climb/LinearClimb.java
@@ -50,7 +50,7 @@ public class LinearClimb extends SubsystemBase implements LinearClimbIO {
         motor.setNeutralMode(NeutralModeValue.Brake);
 
         TalonFXConfiguration config = new TalonFXConfiguration();
-        config.MotorOutput.Inverted = InvertedValue.Clockwise_Positive;
+        config.MotorOutput.Inverted = InvertedValue.CounterClockwise_Positive;
         motor.getConfigurator().apply(config);
 
         setCurrentLimits(ClimbConstants.CALIBRATION_CURRENT);
@@ -147,11 +147,11 @@ public class LinearClimb extends SubsystemBase implements LinearClimbIO {
         }
         motor.set(power);
 
-        SmartDashboard.putNumber("Climb/PID_Setpoint_Rotations", pid.getSetpoint());
-        SmartDashboard.putNumber("Climb/Motor_Actual_Rotations", motor.getPosition().getValueAsDouble());
-        SmartDashboard.putNumber("Climb/Motor_Actual_Meters", inputs.positionMeters);
+        SmartDashboard.putNumber("Climb PID_Setpoint_Rotations", pid.getSetpoint());
+        SmartDashboard.putNumber("Climb Motor_Actual_Rotations", motor.getPosition().getValueAsDouble());
+        SmartDashboard.putNumber("Climb Motor_Actual_Meters", inputs.positionMeters);
 
-        Logger.recordOutput("LinearClimb/setpointMeters", Units.rotationsToRadians(pid.getSetpoint())
+        Logger.recordOutput("LinearClimb setpointMeters", Units.rotationsToRadians(pid.getSetpoint())
                 * ClimbConstants.WHEEL_RADIUS / ClimbConstants.CLIMB_GEAR_RATIO);
         updateInputs();
         Logger.processInputs("LinearClimb", inputs);

diff --git a/src/main/java/frc/robot/subsystems/shooter/Shooter.java b/src/main/java/frc/robot/subsystems/shooter/Shooter.java
index b8c0208e62db0efc070b34580746a4b48d4db139..30090472f4d866ed44d30e65cdfbecc7b11ffa78 100644 (file)
--- a/src/main/java/frc/robot/subsystems/shooter/Shooter.java
+++ b/src/main/java/frc/robot/subsystems/shooter/Shooter.java
@@ -30,7 +30,7 @@ public class Shooter extends SubsystemBase implements ShooterIO {
 
     private final ShooterIOInputsAutoLogged inputs = new ShooterIOInputsAutoLogged();
 
-    double powerModifier = 1.3;
+    double powerModifier = 1.25; // TESTED
 
     public Shooter(){
         updateInputs();