Skip to content

Commit 6ec6b07

Browse files
TechnototesLaptopkevinfrei
authored andcommitted
viggo & harshini
12/14/2024 i forgot what problems we fixed, but we fixed several problems today I HAVE SAMPLE SIDE AUTO AND OBSERVATION SIDE PARKING YAYAYAYYAYAY LETS GOOOO
1 parent d7ae2d9 commit 6ec6b07

File tree

6 files changed

+29
-8
lines changed

6 files changed

+29
-8
lines changed

Twenty403/src/main/java/org/firstinspires/ftc/twenty403/commands/ArmSubCmds.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ public static Command highbasketArm(ArmSubsystem AS) {
2424
return Command.create(AS::highBasket);
2525
}
2626

27+
public static Command highbasketArmAuto(ArmSubsystem AS) {
28+
return Command.create(AS::highBasketAuto);
29+
}
30+
2731
public static Command highbasketArmWaitTillDone(ArmSubsystem AS) {
2832
return new MoveArmCommand(AS, AS::highBasket);
2933
}

Twenty403/src/main/java/org/firstinspires/ftc/twenty403/commands/AutoHighBasketCommand.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,18 @@ public static SequentialCommandGroup HighBasket(Robot r) {
1515
KidShampooCmds.cmds.StopIntake(r.kidShampooSubsystem),
1616
KidShampooCmds.cmds.ScoopWristAutoOnly(r.kidShampooSubsystem),
1717
ArmSubCmds.cmds.slideZero(r.armSubsystem),
18-
ArmSubCmds.cmds.highbasketArm(r.armSubsystem),
18+
ArmSubCmds.cmds.highbasketArmAuto(r.armSubsystem),
1919
new WaitCommand(1),
2020
ArmSubCmds.cmds.highbasketSlide(r.armSubsystem),
21-
new WaitCommand(1.2),
21+
new WaitCommand(0.8),
22+
KidShampooCmds.cmds.UpRetainer(r.kidShampooSubsystem),
23+
new WaitCommand(0.4),
2224
KidShampooCmds.cmds.DumpWrist(r.kidShampooSubsystem),
23-
KidShampooCmds.cmds.OpenRetainer(r.kidShampooSubsystem),
24-
new WaitCommand(1.5),
25-
KidShampooCmds.cmds.CloseRetainer(r.kidShampooSubsystem),
26-
KidShampooCmds.cmds.ScoopWristAutoOnly(r.kidShampooSubsystem)
25+
new WaitCommand(2.3),
26+
KidShampooCmds.cmds.ScoopWristAutoOnly(r.kidShampooSubsystem),
27+
new WaitCommand(0.2),
28+
KidShampooCmds.cmds.CloseRetainer(r.kidShampooSubsystem)
29+
2730
);
2831
}
2932
}

Twenty403/src/main/java/org/firstinspires/ftc/twenty403/commands/HighBasketCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public static SequentialCommandGroup HighBasket(Robot r) {
2222
new WaitCommand(1.2),
2323
KidShampooCmds.cmds.DumpWrist(r.kidShampooSubsystem),
2424
KidShampooCmds.cmds.OpenRetainer(r.kidShampooSubsystem),
25-
new WaitCommand(0.3),
25+
new WaitCommand(1.2),
2626
KidShampooCmds.cmds.CloseRetainer(r.kidShampooSubsystem),
2727
KidShampooCmds.cmds.ScoopWristAutoOnly(r.kidShampooSubsystem)
2828
);

Twenty403/src/main/java/org/firstinspires/ftc/twenty403/commands/KidShampooCmds.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ public static Command OpenRetainer(KidShampooSubsystem KS) {
1111
return Command.create(KS::openRetainer);
1212
}
1313

14+
public static Command UpRetainer(KidShampooSubsystem KS) {
15+
return Command.create(KS::upRetainer);
16+
}
17+
1418
public static Command CloseRetainer(KidShampooSubsystem KS) {
1519
return Command.create(KS::closeRetainer);
1620
}

Twenty403/src/main/java/org/firstinspires/ftc/twenty403/subsystems/ArmSubsystem.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ public class ArmSubsystem implements Subsystem, Loggable {
2121
public int slideResetPos;
2222
public static double FEEDFORWARD_COEFFICIENT = 0.00014; //11-19-24
2323
public static int ROTATE_MOTOR_LOW_BASKET_SCORING_POSITION = 3100;
24-
public static int ROTATE_MOTOR_HIGH_BASKET_SCORING_POSITION = 3200;
24+
public static int ROTATE_MOTOR_HIGH_BASKET_SCORING_POSITION = 3300;
25+
public static int AUTO_ROTATE_MOTOR_HIGH_BASKET_SCORING_POSITION = 3400;
2526
public static int ROTATE_MOTOR_SPECIMEN_SCORING_POSITION_LOW = 300;
2627
public static int ROTATE_MOTOR_SPECIMEN_SCORING_POSITION_HIGH = 300;
2728
public static double MIN_ANGULAR_VELOCITY = 0.001;
@@ -285,6 +286,10 @@ public void highBasket() {
285286
setArmPos(ROTATE_MOTOR_HIGH_BASKET_SCORING_POSITION);
286287
}
287288

289+
public void highBasketAuto() {
290+
setArmPos(AUTO_ROTATE_MOTOR_HIGH_BASKET_SCORING_POSITION);
291+
}
292+
288293
public void highBasketSlides() {
289294
setSlidePos(SLIDES_MOTOR_HIGH_BASKET_SCORING_POSITION);
290295
}

Twenty403/src/main/java/org/firstinspires/ftc/twenty403/subsystems/KidShampooSubsystem.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ public class KidShampooSubsystem implements Subsystem, Loggable {
2929
public double retainerPos;
3030

3131
public static double RETAINER_OPEN_POSITION = .78;
32+
public static double RETAINER_UP_POSITION = 0.3;
3233

3334
public static double RETAINER_CLOSE_POSITION = .52;
3435

@@ -65,6 +66,10 @@ public void openRetainer() {
6566
setRetainerPosition(RETAINER_OPEN_POSITION);
6667
}
6768

69+
public void upRetainer() {
70+
setRetainerPosition(RETAINER_UP_POSITION);
71+
}
72+
6873
public void closeRetainer() {
6974
setRetainerPosition(RETAINER_CLOSE_POSITION);
7075
}

0 commit comments

Comments
 (0)