Skip to content
This repository was archived by the owner on Nov 28, 2025. It is now read-only.

Commit 990296b

Browse files
committed
pushes
1 parent c3af19e commit 990296b

File tree

3 files changed

+21
-21
lines changed

3 files changed

+21
-21
lines changed

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/opmodes/auton/Push.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import com.qualcomm.robotcore.eventloop.opmode.Autonomous;
77

88
import org.firstinspires.ftc.teamcode.CommandRobot;
9-
import org.firstinspires.ftc.teamcode.opmodes.auton.trajectories.SpecFourTrajectories;
9+
import org.firstinspires.ftc.teamcode.opmodes.auton.trajectories.SpecFiveTrajectories;
1010
import org.firstinspires.ftc.teamcode.utils.commands.OpModeCore;
1111
import org.firstinspires.ftc.teamcode.utils.commands.PathChainCommand;
1212
import org.firstinspires.ftc.teamcode.utils.commands.PathCommand;
@@ -15,13 +15,13 @@
1515
@Autonomous(name = "Push", preselectTeleOp = "Main")
1616
public class Push extends OpModeCore {
1717
private CommandRobot robot;
18-
private SpecFourTrajectories trajectories;
18+
private SpecFiveTrajectories trajectories;
1919

20-
public static double SPEED = 0.65;
20+
public static double SPEED = 0.85;
2121

2222
@Override
2323
public void initialize() {
24-
this.trajectories = new SpecFourTrajectories();
24+
this.trajectories = new SpecFiveTrajectories();
2525

2626
this.robot = new CommandRobot(super.hardwareMap, this.trajectories.getStart());
2727
}
@@ -33,10 +33,10 @@ public void runOpMode() {
3333

3434
super.waitForStart();
3535

36+
this.robot.startAutoThreads(this);
3637
CommandScheduler.getInstance().schedule(
3738
new SequentialCommandGroup(
3839
new PathCommand(this.robot, this.trajectories.scorePreload, SPEED),
39-
new PathCommand(this.robot, this.trajectories.backFirst, SPEED),
4040
new PathChainCommand(this.robot, SPEED, this.trajectories.setupTop, this.trajectories.pushTop),
4141
new PathChainCommand(this.robot, SPEED, this.trajectories.setupMid, this.trajectories.pushMid),
4242
new PathChainCommand(this.robot, SPEED, this.trajectories.setupBottom, this.trajectories.pushBottom),

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/opmodes/auton/trajectories/positions/spec5.pp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
},
3737
{
3838
"endPoint": {
39-
"x": 55,
39+
"x": 35,
4040
"y": 24,
4141
"heading": "linear",
4242
"reverse": false,
@@ -69,7 +69,7 @@
6969
},
7070
{
7171
"endPoint": {
72-
"x": 10,
72+
"x": 12,
7373
"y": 24,
7474
"heading": "linear",
7575
"reverse": false,
@@ -83,7 +83,7 @@
8383
},
8484
{
8585
"endPoint": {
86-
"x": 55,
86+
"x": 35,
8787
"y": 14,
8888
"heading": "linear",
8989
"reverse": false,
@@ -94,8 +94,8 @@
9494
},
9595
"controlPoints": [
9696
{
97-
"x": 50,
98-
"y": 30,
97+
"x": 35.44615384615385,
98+
"y": 21.876923076923077,
9999
"name": "setupMidControl",
100100
"index": 10
101101
}
@@ -104,7 +104,7 @@
104104
},
105105
{
106106
"endPoint": {
107-
"x": 10,
107+
"x": 12,
108108
"y": 14,
109109
"heading": "linear",
110110
"reverse": false,
@@ -118,7 +118,7 @@
118118
},
119119
{
120120
"endPoint": {
121-
"x": 55,
121+
"x": 35,
122122
"y": 8,
123123
"heading": "linear",
124124
"reverse": false,
@@ -129,8 +129,8 @@
129129
},
130130
"controlPoints": [
131131
{
132-
"x": 50,
133-
"y": 20,
132+
"x": 30.184615384615384,
133+
"y": 15.5076923076923,
134134
"name": "setupBottomControl",
135135
"index": 13
136136
}
@@ -139,7 +139,7 @@
139139
},
140140
{
141141
"endPoint": {
142-
"x": 10,
142+
"x": 12,
143143
"y": 8,
144144
"heading": "linear",
145145
"reverse": false,
@@ -164,8 +164,8 @@
164164
},
165165
"controlPoints": [
166166
{
167-
"x": 13,
168-
"y": 28,
167+
"x": 9.415384615384616,
168+
"y": 25.476923076923082,
169169
"name": "intakeSecondControl",
170170
"index": 16
171171
}

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/pedroPathing/constants/FConstants.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ public class FConstants {
2020

2121
FollowerConstants.mass = 13.6624119;
2222

23-
FollowerConstants.xMovement = 76.7707208203;
24-
FollowerConstants.yMovement = 55.8087879721;
23+
FollowerConstants.xMovement = (75.2569081094134 + 74.47634687810753 + 74.84969114793611 + 74.01989389575301 + 74.68117853957257) / 5;
24+
FollowerConstants.yMovement = (51.77359773633608 + 53.33455812427246 + 53.652753295638455 + 54.03180225796051 + 53.616598478594426) / 5;
2525

26-
FollowerConstants.forwardZeroPowerAcceleration = -30.5185286985;
27-
FollowerConstants.lateralZeroPowerAcceleration = (-68.58553139679148 + -62.01537998014073 + -58.74530456630615 + -58.99171962162261 + -63.33852005910229) / 5;
26+
FollowerConstants.forwardZeroPowerAcceleration = (-38.15282509154116 + -35.12614067085665 + -34.761979425838284 + -36.43672311260459 + -32.34119403044195) / 5;
27+
FollowerConstants.lateralZeroPowerAcceleration = (-65.24094299732764 + -61.25281822719174 + -65.89813061019508 + -64.45869003996229 + -66.29473846726256) / 5;
2828

2929
FollowerConstants.translationalPIDFCoefficients.setCoefficients(0.35, 0, 0.02, 0);
3030
FollowerConstants.useSecondaryTranslationalPID = true;

0 commit comments

Comments
 (0)