mirror of
https://github.com/Team4388/2026KPopRobotHunters.git
synced 2026-06-09 00:38:03 -06:00
Fix shooter idle speed.
This commit is contained in:
@@ -7,12 +7,12 @@ public final class BuildConstants {
|
|||||||
public static final String MAVEN_GROUP = "";
|
public static final String MAVEN_GROUP = "";
|
||||||
public static final String MAVEN_NAME = "2026KPopRobotHunters";
|
public static final String MAVEN_NAME = "2026KPopRobotHunters";
|
||||||
public static final String VERSION = "unspecified";
|
public static final String VERSION = "unspecified";
|
||||||
public static final int GIT_REVISION = 84;
|
public static final int GIT_REVISION = 85;
|
||||||
public static final String GIT_SHA = "a09a039cb8a5bef1ee897d3307355d975eefd232";
|
public static final String GIT_SHA = "3197a3dce03bf34c001ef4009de3e7d98a181536";
|
||||||
public static final String GIT_DATE = "2026-02-24 16:46:17 MST";
|
public static final String GIT_DATE = "2026-02-24 22:17:58 MST";
|
||||||
public static final String GIT_BRANCH = "reveal-night";
|
public static final String GIT_BRANCH = "reveal-night";
|
||||||
public static final String BUILD_DATE = "2026-02-24 18:42:57 MST";
|
public static final String BUILD_DATE = "2026-02-25 16:32:13 MST";
|
||||||
public static final long BUILD_UNIX_TIME = 1771983777848L;
|
public static final long BUILD_UNIX_TIME = 1772062333884L;
|
||||||
public static final int DIRTY = 1;
|
public static final int DIRTY = 1;
|
||||||
|
|
||||||
private BuildConstants(){}
|
private BuildConstants(){}
|
||||||
|
|||||||
@@ -217,9 +217,9 @@ public class Shooter extends SubsystemBase {
|
|||||||
|
|
||||||
io.setShooterCurrentLimitSpeed(
|
io.setShooterCurrentLimitSpeed(
|
||||||
state,
|
state,
|
||||||
ShooterConstants.SHOOTER_IDLE_PERCENT_OUTPUT.get(),
|
ShooterConstants.SHOOTER_IDLE_PERCENT_OUTPUT.get()
|
||||||
Amps.of(ShooterConstants.SHOOTER_IDLE_MAX_CURRENT.get()),
|
// Amps.of(ShooterConstants.SHOOTER_IDLE_MAX_CURRENT.get()),
|
||||||
RotationsPerSecond.of(ShooterConstants.INDEXER_REVERSE_OUTPUT.get())
|
// RotationsPerSecond.of(ShooterConstants.INDEXER_REVERSE_OUTPUT.get())
|
||||||
);
|
);
|
||||||
io.setIndexerOutput(state, ShooterConstants.INDEXER_REVERSE_OUTPUT.get());
|
io.setIndexerOutput(state, ShooterConstants.INDEXER_REVERSE_OUTPUT.get());
|
||||||
m_robotLED.setMode(Constants.LEDConstants.DEFAULT_PATTERN);
|
m_robotLED.setMode(Constants.LEDConstants.DEFAULT_PATTERN);
|
||||||
|
|||||||
@@ -23,8 +23,8 @@ public class ShooterConstants {
|
|||||||
// public static final ConfigurableDouble SHOOTER_RESTING_VELOCITY = new ConfigurableDouble("Shooter Resting Velocity", 0.0);
|
// public static final ConfigurableDouble SHOOTER_RESTING_VELOCITY = new ConfigurableDouble("Shooter Resting Velocity", 0.0);
|
||||||
|
|
||||||
public static final ConfigurableDouble SHOOTER_IDLE_PERCENT_OUTPUT = new ConfigurableDouble("Shooter idle % output", 0.3);
|
public static final ConfigurableDouble SHOOTER_IDLE_PERCENT_OUTPUT = new ConfigurableDouble("Shooter idle % output", 0.3);
|
||||||
public static final ConfigurableDouble SHOOTER_IDLE_TARGET_VEL = new ConfigurableDouble("Shooter idle target velocity", 20.);
|
// public static final ConfigurableDouble SHOOTER_IDLE_TARGET_VEL = new ConfigurableDouble("Shooter idle target velocity", 20.);
|
||||||
public static final ConfigurableDouble SHOOTER_IDLE_MAX_CURRENT = new ConfigurableDouble("Shooter Idle max current", 10);
|
// public static final ConfigurableDouble SHOOTER_IDLE_MAX_CURRENT = new ConfigurableDouble("Shooter Idle max current", 10);
|
||||||
|
|
||||||
public static final ConfigurableDouble INDEXER_FORWARD_OUTPUT = new ConfigurableDouble("Indexer FWD % Output", -0.4);
|
public static final ConfigurableDouble INDEXER_FORWARD_OUTPUT = new ConfigurableDouble("Indexer FWD % Output", -0.4);
|
||||||
public static final ConfigurableDouble INDEXER_REVERSE_OUTPUT = new ConfigurableDouble("Indexer reverse % Output", 0.0);
|
public static final ConfigurableDouble INDEXER_REVERSE_OUTPUT = new ConfigurableDouble("Indexer reverse % Output", 0.0);
|
||||||
|
|||||||
@@ -40,9 +40,9 @@ public interface ShooterIO {
|
|||||||
public default void setShooterVelocity(ShooterState state, AngularVelocity angularVelocity) {}
|
public default void setShooterVelocity(ShooterState state, AngularVelocity angularVelocity) {}
|
||||||
public default void setShooterCurrentLimitSpeed(
|
public default void setShooterCurrentLimitSpeed(
|
||||||
ShooterState state,
|
ShooterState state,
|
||||||
double percentOutput,
|
double percentOutput
|
||||||
Current currentLimit,
|
// Current currentLimit,
|
||||||
AngularVelocity targetVelocity
|
// AngularVelocity targetVelocity
|
||||||
) {}
|
) {}
|
||||||
// public default void setMotor2Velocity(ShooterState state, AngularVelocity angularVelocity) {}
|
// public default void setMotor2Velocity(ShooterState state, AngularVelocity angularVelocity) {}
|
||||||
public default void setIndexerOutput(ShooterState state, double percentOutput) {}
|
public default void setIndexerOutput(ShooterState state, double percentOutput) {}
|
||||||
|
|||||||
@@ -61,26 +61,26 @@ public class ShooterReal implements ShooterIO {
|
|||||||
@Override
|
@Override
|
||||||
public void setShooterCurrentLimitSpeed(
|
public void setShooterCurrentLimitSpeed(
|
||||||
ShooterState state,
|
ShooterState state,
|
||||||
double percentOutput,
|
double percentOutput
|
||||||
Current currentLimit,
|
// Current currentLimit,
|
||||||
AngularVelocity targetVelocity
|
// AngularVelocity targetVelocity
|
||||||
) {
|
) {
|
||||||
state.motor1TargetVelocity = targetVelocity;
|
// state.motor1TargetVelocity = targetVelocity;
|
||||||
state.motor2TargetVelocity = targetVelocity;
|
// state.motor2TargetVelocity = targetVelocity;
|
||||||
|
|
||||||
double current = Math.abs(state.motor1Current.in(Amps)) + Math.abs(state.motor2Current.in(Amps));
|
// double current = Math.abs(state.motor1Current.in(Amps)) + Math.abs(state.motor2Current.in(Amps));
|
||||||
double velocity = (Math.abs(state.motor1Velocity.in(RotationsPerSecond)) + Math.abs(state.motor2Velocity.in(RotationsPerSecond))) / 2;
|
// double velocity = (Math.abs(state.motor1Velocity.in(RotationsPerSecond)) + Math.abs(state.motor2Velocity.in(RotationsPerSecond))) / 2;
|
||||||
|
|
||||||
if(
|
// if(
|
||||||
Math.abs(currentLimit.in(Amps)) > current &&
|
// Math.abs(currentLimit.in(Amps)) > current &&
|
||||||
Math.abs(targetVelocity.in(RotationsPerSecond)) > velocity
|
// Math.abs(targetVelocity.in(RotationsPerSecond)) > velocity
|
||||||
) {
|
// ) {
|
||||||
m_shooter1Motor.set(percentOutput);
|
m_shooter1Motor.set(percentOutput);
|
||||||
m_shooter2Motor.set(percentOutput);
|
m_shooter2Motor.set(percentOutput);
|
||||||
} else {
|
// } else {
|
||||||
m_shooter1Motor.set(0);
|
// m_shooter1Motor.set(0);
|
||||||
m_shooter2Motor.set(0);
|
// m_shooter2Motor.set(0);
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user