Skip to content

Commit efd1898

Browse files
committed
1/11/24 - LM3
5-0, 2nd, & Inspire 🔥, Forgot to commit and push lol
1 parent 7bca411 commit efd1898

File tree

5 files changed

+37
-20
lines changed

5 files changed

+37
-20
lines changed

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/common/subsystems/outtake/OuttakeArm.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ class OuttakeArm(val robot: Robot) : Subsystem() {
3838

3939
companion object {
4040
@JvmField
41-
var basePosition = 0.64
41+
var basePosition = 0.62
4242

4343
@JvmField
4444
var basketPosition = 0.5
4545

4646
@JvmField
47-
var specimenPosition = basketPosition
47+
var specimenPosition = 0.519
4848

4949
@JvmField
5050
var extendedPosition = 0.75

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/common/subsystems/outtake/Slides.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ class Slides(val robot: Robot) : Subsystem() {
7676
@JvmField
7777
var highRung: Double = 1200.0
7878

79+
@JvmField
80+
var wall: Double = 200.0
81+
7982
@JvmField
8083
var lowBasket: Double = 700.0
8184

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ class SampleAuton : OpMode() {
183183
var basketX = -49.0
184184

185185
@JvmField
186-
var basketY = 52.0
186+
var basketY = 50.0
187187

188188
@JvmField
189189
var basketDuration: Long = 1000

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ class SpecimenAuton : OpMode() {
8585
SequentialCommandGroup(
8686
robot.outtake.close(),
8787
WaitCommand(outtakePickupClawDelay),
88+
SlidesCommand(robot.outtake.slides, Slides.wall),
8889
ParallelCommandGroup(
8990
InstantCommand({
9091
robot.outtake.arm.state = OuttakeArmPosition.BASKET

TeamCode/src/main/java/org/firstinspires/ftc/teamcode/opmodes/teleop/BasicTeleop.kt

Lines changed: 30 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -218,21 +218,33 @@ class BasicTeleop : OpMode() {
218218
})
219219
)
220220

221-
val imuReset = EdgeDetector(
222-
gamepad2::b,
223-
this@BasicTeleop,
224-
InstantCommand({
225-
robot.imu.resetYaw()
226-
gamepad2.rumble(250)
227-
})
228-
)
221+
// val imuReset = EdgeDetector(
222+
// gamepad2::b,
223+
// this@BasicTeleop,
224+
// InstantCommand({
225+
// robot.imu.resetYaw()
226+
// gamepad2.rumble(250)
227+
// })
228+
// )
229+
//
230+
// val liftReset = EdgeDetector(
231+
// gamepad2::dpad_down,
232+
// {
233+
// gamepad2.rumble(250)
234+
// },
235+
// {
236+
// robot.outtake.slides.isManual = false
237+
// robot.outtake.slides.leftLift.reset()
238+
// robot.outtake.slides.rightLift.reset()
239+
// gamepad2.rumble(250)
240+
// }
241+
// )
229242

230-
val liftReset = EdgeDetector(
231-
gamepad2::dpad_down,
232-
{
233-
gamepad2.rumble(250)
234-
},
235-
{
243+
val reset = EdgeDetector(
244+
gamepad1::cross, {
245+
robot.imu.resetYaw()
246+
gamepad1.rumble(250)
247+
}, {
236248
robot.outtake.slides.isManual = false
237249
robot.outtake.slides.leftLift.reset()
238250
robot.outtake.slides.rightLift.reset()
@@ -247,7 +259,8 @@ class BasicTeleop : OpMode() {
247259
}
248260

249261
override fun initialize() {
250-
super.initialize()
262+
// super.initialize()
263+
// schedule(InstantCommand({ super.initialize() }))
251264
triggers // lazy loads all the triggers w/o having to make each lazy loaded
252265
}
253266

@@ -269,7 +282,7 @@ class BasicTeleop : OpMode() {
269282

270283
// Slides
271284
val slidePower = gamepad1.right_trigger.toDouble() - gamepad1.left_trigger.toDouble()
272-
if (gamepad2.dpad_down) {
285+
if (gamepad1.cross) {
273286
robot.outtake.slides.isManual = true
274287
robot.outtake.slides.manualPower = -1.0
275288
} else if (slidePower.absoluteValue > slideThreshold) {
@@ -328,7 +341,7 @@ class BasicTeleop : OpMode() {
328341
var specimenDelay: Long = 500
329342

330343
@JvmField
331-
var specScoreDelay: Long = 500
344+
var specScoreDelay: Long = 625
332345

333346
@JvmField
334347
var sweepDuration: Long = 1500

0 commit comments

Comments
 (0)