Skip to content

Commit ff75c6f

Browse files
committed
03/14/26 - 21 36
1 parent b8c5006 commit ff75c6f

2 files changed

Lines changed: 11 additions & 8 deletions

File tree

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/common/subsystem/AutoAdjustData.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ fun <K, V> treeMapOf(vararg pairs: Pair<K, V>): TreeMap<K, V> {
1111
}
1212

1313
val DATA: TreeMap<Distance, Pair<RPM, Angle>> = treeMapOf(
14-
40.0 to (3000.0 to 0.0),
15-
44.0 to (3000.0 to 0.0),
16-
48.0 to (2900.0 to 0.0),
17-
52.0 to (2900.0 to 0.0),
18-
56.0 to (3000.0 to 0.0),
19-
60.0 to (3000.0 to 0.0),
14+
40.0 to (2800.0 to 0.0),
15+
44.0 to (2900.0 to 0.0),
16+
48.0 to (2800.0 to 0.0),
17+
52.0 to (2800.0 to 0.0),
18+
56.0 to (2800.0 to 0.0),
19+
60.0 to (2900.0 to 0.0),
2020
64.0 to (3000.0 to 0.0),
2121
68.0 to (3100.0 to 0.0),
2222
72.0 to (3100.0 to 0.0),

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/opmode/auton/Far15BallAuton.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ open class Far15BallAuton(var isRed: Boolean) : OpMode() {
8282

8383
+autonManager.runPath(6)
8484
+autonManager.runPath(7)
85-
Command { SleepFor { stablizationTime } }
85+
Command { SleepFor { intake.power = -1.0; stablizationTimeLong } }
8686
+fire
8787

8888
+autonManager.runPath(8)
@@ -93,7 +93,7 @@ open class Far15BallAuton(var isRed: Boolean) : OpMode() {
9393

9494
+autonManager.runPath(6)
9595
+autonManager.runPath(7)
96-
Command { SleepFor { stablizationTime } }
96+
Command { SleepFor { intake.power = -1.0; stablizationTimeLong } }
9797
+fire
9898

9999
+autonManager.runPath(11)
@@ -110,5 +110,8 @@ open class Far15BallAuton(var isRed: Boolean) : OpMode() {
110110

111111
@JvmField
112112
var stablizationTime = 200L
113+
114+
@JvmField
115+
var stablizationTimeLong = 1000L
113116
}
114117
}

0 commit comments

Comments
 (0)