Skip to content

Commit fe2c93a

Browse files
remove redundant logs and do a small refactor to the noteToTrap logic by running the intake just a touch
1 parent bb20892 commit fe2c93a

File tree

7 files changed

+29
-6
lines changed

7 files changed

+29
-6
lines changed

src/main/java/frc/robot/commands/drive/AlignmentCmds.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,17 @@
1616
import frc.robot.subsystems.Swerve;
1717
import frc.robot.util.Constants.FieldConstants;
1818
import frc.robot.util.calc.AlignmentCalc;
19+
import monologue.Annotations.IgnoreLogged;
1920

2021
public 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) {

src/main/java/frc/robot/commands/managers/PieceControl.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,24 @@
2626
import frc.robot.util.Constants.ShooterConstants;
2727
import frc.robot.util.Constants.ElevatorConstants;
2828
import frc.robot.util.custom.ActiveConditionalCommand;
29+
import monologue.Annotations.IgnoreLogged;
2930
import monologue.Annotations.Log;
3031
import monologue.Logged;
3132

3233
public 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(),

src/main/java/frc/robot/commands/managers/ShooterCmds.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,13 @@
1717
import frc.robot.util.Constants.ShooterConstants;
1818
import frc.robot.util.calc.ShooterCalc;
1919
import frc.robot.util.custom.SpeedAngleTriplet;
20+
import monologue.Annotations.IgnoreLogged;
2021

2122
public class ShooterCmds {
22-
23+
24+
@IgnoreLogged
2325
private Pivot pivot;
26+
@IgnoreLogged
2427
private Shooter shooter;
2528

2629
private SpeedAngleTriplet desiredTriplet = new SpeedAngleTriplet();

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff 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
}

src/main/java/frc/robot/util/Constants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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

src/main/java/frc/robot/util/calc/AlignmentCalc.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@
1515
import frc.robot.util.Constants.AutoConstants;
1616
import frc.robot.util.Constants.DriveConstants;
1717
import frc.robot.util.Constants.FieldConstants;
18+
import monologue.Annotations.IgnoreLogged;
1819

1920
public class AlignmentCalc {
2021

22+
@IgnoreLogged
2123
private Swerve swerve;
2224

2325
public AlignmentCalc(Swerve swerve) {

src/main/java/frc/robot/util/calc/ShooterCalc.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,16 @@
1818
import frc.robot.util.Constants.ShooterConstants;
1919
import frc.robot.util.custom.SpeedAngleTriplet;
2020
import monologue.Logged;
21+
import monologue.Annotations.IgnoreLogged;
2122
import monologue.Annotations.Log;
2223

2324
public 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;

0 commit comments

Comments
 (0)