Skip to content

Commit 4e5d0cb

Browse files
author
Roberts Kalnins
committed
Detune azimuths
1 parent 24d6d31 commit 4e5d0cb

File tree

6 files changed

+24
-7
lines changed

6 files changed

+24
-7
lines changed

src/main/java/frc/team2767/deepspace/Robot.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public void disabledInit() {
9898
public void autonomousInit() {
9999
BISCUIT.setPosition(BISCUIT.getPosition());
100100
DRIVE.setAngleAdjustment(true);
101-
// sandstorm.start();
101+
sandstorm.start();
102102
}
103103

104104
@Override

src/main/java/frc/team2767/deepspace/command/approach/HoldHeadingUntilCompressionCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class HoldHeadingUntilCompressionCommand extends Command {
1818
private static final VacuumSubsystem VACUUM = Robot.VACUUM;
1919
private static final VisionSubsystem VISION = Robot.VISION;
2020
private static final double FORWARD_OUTPUT = 0.2;
21-
private static final double OUT_TIME_SEC = 0.075;
21+
private static final double OUT_TIME_SEC = 0.05;
2222
private static final double PAUSE_TIME = 0.2;
2323
private final Logger logger = LoggerFactory.getLogger(this.getClass());
2424
private DriveState driveState;

src/main/java/frc/team2767/deepspace/command/approach/VisionAutoAlignPlaceCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.strykeforce.thirdcoast.util.RateLimit;
1414

1515
public class VisionAutoAlignPlaceCommand extends Command {
16-
private static final double kP_STRAFE = 0.11; // 0.11
16+
private static final double kP_STRAFE = 0.07; // 0.11
1717
private static final double kP_YAW = 0.01; // 0.00625 tuning for NT method, 0.01 pyeye
1818
private static final double MAX_YAW = 0.3;
1919
private static final double goodEnoughYaw = 1.5;
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package frc.team2767.deepspace.command.approach.sandstorm;
2+
3+
import edu.wpi.first.wpilibj.command.CommandGroup;
4+
import frc.team2767.deepspace.command.approach.sequences.AutoHatchPlaceCommandGroup;
5+
import frc.team2767.deepspace.command.sequences.pickup.SandstormHatchPickupCommandGroup;
6+
import frc.team2767.deepspace.command.states.SetFieldDirectionCommand;
7+
import frc.team2767.deepspace.subsystem.FieldDirection;
8+
9+
public class AutoPlaceTestCommand extends CommandGroup {
10+
11+
public AutoPlaceTestCommand() {
12+
addSequential(new SandstormHatchPickupCommandGroup(), 0.5);
13+
addSequential(new SetFieldDirectionCommand(FieldDirection.LEFT));
14+
addSequential(new AutoHatchPlaceCommandGroup(0.0));
15+
}
16+
}

src/main/java/frc/team2767/deepspace/control/DriverControls.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import edu.wpi.first.wpilibj.buttons.JoystickButton;
55
import edu.wpi.first.wpilibj.command.Command;
66
import frc.team2767.deepspace.command.ZeroGyroCommand;
7-
import frc.team2767.deepspace.command.approach.sandstorm.SandstormCommandGroup;
7+
import frc.team2767.deepspace.command.approach.sandstorm.AutoPlaceTestCommand;
88
import frc.team2767.deepspace.command.approach.sequences.AutoHatchPickupCommandGroup;
99
import frc.team2767.deepspace.command.biscuit.BiscuitNegativeCommand;
1010
import frc.team2767.deepspace.command.biscuit.BiscuitPositiveCommand;
@@ -58,8 +58,8 @@ public class DriverControls {
5858
// interrupt
5959
// new JoystickButton(joystick, Trim.LEFT_Y_NEG.id).whenPressed(new InterruptCommand());
6060
// new JoystickButton(joystick, Trim.LEFT_Y_POS.id).whenPressed(new InterruptCommand());
61-
new JoystickButton(joystick, Trim.LEFT_Y_POS.id).whenPressed(new SandstormCommandGroup());
62-
new JoystickButton(joystick, Trim.LEFT_Y_NEG.id).whenPressed(new SandstormCommandGroup());
61+
new JoystickButton(joystick, Trim.LEFT_Y_POS.id).whenPressed(new AutoPlaceTestCommand());
62+
new JoystickButton(joystick, Trim.LEFT_Y_NEG.id).whenPressed(new AutoPlaceTestCommand());
6363

6464
// biscuit
6565
new JoystickButton(joystick, Trim.LEFT_X_POS.id).whenPressed(new BiscuitPositiveCommand());

src/main/java/frc/team2767/deepspace/subsystem/VisionSubsystem.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ public class VisionSubsystem extends Subsystem implements Item {
4242
private static final double CAMERA_RANGE_SLOPE_LEFT = 1.0499; // 0.8259
4343
private static final double CAMERA_RANGE_OFFSET_LEFT = -4.8818; // -5.6325
4444
// NEGATIVE = TOWARDS FIELD LEFT
45-
private static final double STRAFE_CORRECTION_RIGHT = 0.4; // -1.0
45+
private static final double STRAFE_CORRECTION_RIGHT =
46+
0.325; // -1.0 // NEGATIVE TO FIELD LEFT FOR THIS ONE?
4647
private static final double STRAFE_CORRECTION_LEFT = 0.9;
4748

4849
private final Logger logger = LoggerFactory.getLogger(this.getClass());

0 commit comments

Comments
 (0)