Skip to content

Commit 1f0119b

Browse files
final commit.
1 parent c37170c commit 1f0119b

3 files changed

Lines changed: 12 additions & 12 deletions

File tree

src/main/java/frc/robot/autonomous/CompletedSequences.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,12 @@ private static Sequence createPos1Complex()
112112
autoShooter shoot = new autoShooter();
113113
autoDrive d2 = new autoDrive();
114114
d2.setAngle(-75);
115-
d2.setDist(0.2);
115+
d2.setDist(0.15);
116116
d2.setSpeed(0.72);
117117
autoTurn t2 = new autoTurn();
118-
t2.setAngle(14);
118+
t2.setAngle(14.2);
119119
autoDrive d3 = new autoDrive();
120-
d3.setAngle(13.5);
120+
d3.setAngle(13.7);
121121
d3.setDist(-2.35);
122122
d3.setSpeed(0.692);
123123
d3.setAccFwdLimit(0.18);
@@ -167,8 +167,8 @@ private static Sequence createPos1Complex()
167167
d7.setDist(2);
168168
d7.setSpeed(.64);
169169
d7.setAccFwdLimit(0.02);
170-
d7.setAccRevLimit(0.05);
171-
d7.setDistGain(.63);
170+
d7.setAccRevLimit(0.045);
171+
d7.setDistGain(.57);
172172
timedStep T3 = new timedStep();
173173
T3.setDelay(.94);
174174
autoBallDetectionLimelight ball3 = new autoBallDetectionLimelight();
@@ -247,13 +247,13 @@ private static Sequence createPos4Normal()
247247
{
248248
autoBackIntake intake = new autoBackIntake();
249249
autoTurn t1 = new autoTurn();
250-
t1.setAngle(41.55);
250+
t1.setAngle(41);
251251
autoDrive d1 = new autoDrive();
252-
d1.setAngle(41.5);
252+
d1.setAngle(41);
253253
d1.setDist(-1.5);
254254
d1.setSpeed(0.4);
255255
autoTurn t2 = new autoTurn();
256-
t1.setAngle(45.4);
256+
t1.setAngle(58);
257257
autoLimelight lime1 = new autoLimelight();
258258
autoBallDetectionLimelight ball1 = new autoBallDetectionLimelight();
259259
ball1.setNumBalls(2);
@@ -371,7 +371,7 @@ private static Sequence createPos2Basic()
371371
lime1.setNextTrans(ball1);
372372
lime1.setNextSteps(shoot1);
373373

374-
Sequence seq = new Sequence("Pos 2 Ball", 2);
374+
Sequence seq = new Sequence("Pos 2 2Ball", 2);
375375
seq.setInitialTransitions(t1);
376376
seq.setInitialSteps(t1, intake);
377377
return seq;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public enum ShooterState {
5555

5656
private static ShooterSpeedSlot speedSlot = ShooterSpeedSlot.IDLE;
5757

58-
public static double shooterIdleSpeed = 1800 * Config.kLimelightShooterSpeedModiferPercentage;
58+
public static double shooterIdleSpeed = 2050 * Config.kLimelightShooterSpeedModiferPercentage;
5959
private double shooterShootSpeed = 2450 * Config.kLimelightShooterSpeedModiferPercentage;
6060
private double shooterEjectSpeed = 800;
6161
private double shooterSpinUpSpeed = shooterShootSpeed;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ else if(tx + driverTuning <4 && tx + driverTuning>-4){
103103
else{
104104
m_drive.arcadeDrive(1, visionSteering, 0.0);
105105
}
106-
if(tx + driverTuning <4 && tx + driverTuning >-4){
106+
if(tx + driverTuning <2.25 && tx + driverTuning >-2.25){
107107
if(timesLooped >= 15){
108108
desiredState = VisionState.IDLE;//VisionState.FINDINGSPEED;
109109
}
@@ -161,7 +161,7 @@ else if(tx + driverTuning <4 && tx + driverTuning>-4){
161161
// System.out.println("tx: " + tx);
162162
double AutoVisionSteering = (tx * Constants.kVisionTurnKp);
163163
if(tx <2.5 && tx >-2.5){
164-
double isn = AutoVisionSteering * 3.5;
164+
double isn = AutoVisionSteering * 4.15;
165165
// m_drive.arcadeDrive(0.5, -1, 0.0);
166166
Drive.getInstance().autoArcadeDrive(isn, 0);
167167
}

0 commit comments

Comments
 (0)