1313import com .team581 .math .PolynomialRegression ;
1414import com .team581 .util .tuning .TunableInterpolatingDoubleTreeMap ;
1515import edu .wpi .first .math .interpolation .InterpolatingDoubleTreeMap ;
16+ import frc .robot .config .RobotKind ;
17+
1618import java .util .Map ;
1719
1820public class ShooterConfig {
@@ -25,7 +27,7 @@ public class ShooterConfig {
2527 public static final double SELF_TEST_RIGHT_MOTOR_RPM_TOLERANCE = 250 ;
2628 public static final double SELF_TEST_RIGHT_MOTOR_EXPECTED_CURRENT = 10.0 ;
2729 public static final double SELF_TEST_RIGHT_MOTOR_CURRENT_TOLERANCE = 5 ;
28- public static final int RPM_TOLERANCE = 100 ;
30+ public static final int RPM_TOLERANCE = 150 ;
2931 public static final int RPM_TOLERANCE_FEEDING = 1000 ;
3032
3133 public static final double IDLE_RPM = 400 ;
@@ -83,7 +85,12 @@ public class ShooterConfig {
8385 new MotorOutputConfigs ()
8486 .withNeutralMode (NeutralModeValue .Coast )
8587 .withInverted (InvertedValue .CounterClockwise_Positive ))
86- .withSlot0 (new Slot0Configs ().withKP (0.75 ).withKV (0.127 ).withKD (0.00015 ))
88+ .withSlot0 (
89+ new Slot0Configs ()
90+ .withKP (RobotKind .IS_COMP_BOT ? 0.7 : 0.0 )
91+ .withKV (RobotKind .IS_COMP_BOT ? 0.127 : 0.127 )
92+ // .withKD(0.00015)
93+ )
8794 .withVoltage (new VoltageConfigs ().withPeakReverseVoltage (0 ))
8895 .withTorqueCurrent (
8996 new TorqueCurrentConfigs ()
@@ -106,7 +113,12 @@ public class ShooterConfig {
106113 new MotorOutputConfigs ()
107114 .withNeutralMode (NeutralModeValue .Coast )
108115 .withInverted (InvertedValue .Clockwise_Positive ))
109- .withSlot0 (new Slot0Configs ().withKP (0.75 ).withKV (0.127 ).withKD (0.00015 ))
116+ .withSlot0 (
117+ new Slot0Configs ()
118+ .withKP (RobotKind .IS_COMP_BOT ? 0.7 : 0.0 )
119+ .withKV (RobotKind .IS_COMP_BOT ? 0.127 : 0.127 )
120+ //.withKD(0.00015)
121+ )
110122 .withVoltage (new VoltageConfigs ().withPeakReverseVoltage (0 ))
111123 .withTorqueCurrent (
112124 new TorqueCurrentConfigs ()
0 commit comments