File tree Expand file tree Collapse file tree 7 files changed +29
-6
lines changed Expand file tree Collapse file tree 7 files changed +29
-6
lines changed Original file line number Diff line number Diff line change 1616import frc .robot .subsystems .Swerve ;
1717import frc .robot .util .Constants .FieldConstants ;
1818import frc .robot .util .calc .AlignmentCalc ;
19+ import monologue .Annotations .IgnoreLogged ;
1920
2021public class AlignmentCmds {
2122
23+ @ IgnoreLogged
2224 private Climb climb ;
25+ @ IgnoreLogged
2326 private Swerve swerve ;
24- private ShooterCmds shooterCmds ;
2527
28+ private ShooterCmds shooterCmds ;
29+ @ IgnoreLogged
2630 public AlignmentCalc alignmentCalc ;
2731
2832 public AlignmentCmds (Swerve swerve , Climb climb , ShooterCmds shooterCmds ) {
Original file line number Diff line number Diff line change 2626import frc .robot .util .Constants .ShooterConstants ;
2727import frc .robot .util .Constants .ElevatorConstants ;
2828import frc .robot .util .custom .ActiveConditionalCommand ;
29+ import monologue .Annotations .IgnoreLogged ;
2930import monologue .Annotations .Log ;
3031import monologue .Logged ;
3132
3233public class PieceControl implements Logged {
33-
34+
35+ @ IgnoreLogged
3436 private Intake intake ;
37+ @ IgnoreLogged
3538 private Indexer indexer ;
36-
39+
40+ @ IgnoreLogged
3741 private Elevator elevator ;
42+ @ IgnoreLogged
3843 private Ampper ampper ;
44+ @ IgnoreLogged
3945 private ShooterCmds shooterCmds ;
46+
4047
4148 private ColorSensor colorSensor ;
4249
@@ -191,6 +198,7 @@ public Command noteToTrap() {
191198 ampper .outtake (),
192199 shooterCmds .stowPivot (),
193200 indexer .toElevator (),
201+ intake .inCommandSlow (),
194202 Commands .waitUntil (() -> !colorSensor .hasNote ()),
195203 NT .getWaitCommand ("noteToTrap1" ), // 0.2
196204 stopIntakeAndIndexer (),
Original file line number Diff line number Diff line change 1717import frc .robot .util .Constants .ShooterConstants ;
1818import frc .robot .util .calc .ShooterCalc ;
1919import frc .robot .util .custom .SpeedAngleTriplet ;
20+ import monologue .Annotations .IgnoreLogged ;
2021
2122public class ShooterCmds {
22-
23+
24+ @ IgnoreLogged
2325 private Pivot pivot ;
26+ @ IgnoreLogged
2427 private Shooter shooter ;
2528
2629 private SpeedAngleTriplet desiredTriplet = new SpeedAngleTriplet ();
Original file line number Diff line number Diff line change @@ -49,6 +49,10 @@ public Command inCommand() {
4949 return setPercentCommand (IntakeConstants .INTAKE_PERCENT );
5050 }
5151
52+ public Command inCommandSlow () {
53+ return setPercentCommand (IntakeConstants .INTAKE_PERCENT /3.0 );
54+ }
55+
5256 public Command outCommand () {
5357 return setPercentCommand (IntakeConstants .OUTTAKE_PERCENT );
5458 }
Original file line number Diff line number Diff line change @@ -1103,7 +1103,7 @@ public static final class NTConstants {
11031103 put ("noteToIndexer2" , 0.07 );
11041104 put ("noteToIndexer3" , 0.0 );
11051105
1106- put ("noteToTrap1" , 0.2 );
1106+ put ("noteToTrap1" , 0.1 );
11071107 put ("noteToTrap2" , 0.5 );
11081108 put ("noteToTrap3" , 0.0 );
11091109
Original file line number Diff line number Diff line change 1515import frc .robot .util .Constants .AutoConstants ;
1616import frc .robot .util .Constants .DriveConstants ;
1717import frc .robot .util .Constants .FieldConstants ;
18+ import monologue .Annotations .IgnoreLogged ;
1819
1920public class AlignmentCalc {
2021
22+ @ IgnoreLogged
2123 private Swerve swerve ;
2224
2325 public AlignmentCalc (Swerve swerve ) {
Original file line number Diff line number Diff line change 1818import frc .robot .util .Constants .ShooterConstants ;
1919import frc .robot .util .custom .SpeedAngleTriplet ;
2020import monologue .Logged ;
21+ import monologue .Annotations .IgnoreLogged ;
2122import monologue .Annotations .Log ;
2223
2324public class ShooterCalc implements Logged {
2425
26+ @ IgnoreLogged
2527 private Shooter shooter ;
28+ @ IgnoreLogged
2629 private Pivot pivot ;
2730
28-
2931 public ShooterCalc (Shooter shooter , Pivot pivot ) {
3032 this .shooter = shooter ;
3133 this .pivot = pivot ;
You can’t perform that action at this time.
0 commit comments