Skip to content

Commit 7bca411

Browse files
committed
Final Last PreLM3 Push
1 parent f36aa0f commit 7bca411

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class OuttakeWrist(val robot: Robot) : Subsystem() {
3535
var basePosition = 0.75
3636

3737
@JvmField
38-
var basketPosition = 0.375
38+
var basketPosition = 0.34
3939

4040
@JvmField
4141
var specimenPosition = basketPosition

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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import org.firstinspires.ftc.teamcode.common.subsystems.outtake.Slides
1616
import org.firstinspires.ftc.teamcode.common.utils.EdgeDetector
1717
import org.firstinspires.ftc.teamcode.common.utils.OpMode
1818
import org.firstinspires.ftc.teamcode.common.utils.Subsystem
19+
import org.firstinspires.ftc.teamcode.common.utils.reset
1920
import kotlin.math.absoluteValue
2021

2122
@Config
@@ -222,9 +223,23 @@ class BasicTeleop : OpMode() {
222223
this@BasicTeleop,
223224
InstantCommand({
224225
robot.imu.resetYaw()
226+
gamepad2.rumble(250)
225227
})
226228
)
227229

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+
)
242+
228243
fun instCmd(cmd: Pair<() -> Unit, List<Subsystem>>): InstantCommand {
229244
return InstantCommand(cmd.first, *cmd.second.toTypedArray())
230245
}
@@ -254,7 +269,10 @@ class BasicTeleop : OpMode() {
254269

255270
// Slides
256271
val slidePower = gamepad1.right_trigger.toDouble() - gamepad1.left_trigger.toDouble()
257-
if (slidePower.absoluteValue > slideThreshold) {
272+
if (gamepad2.dpad_down) {
273+
robot.outtake.slides.isManual = true
274+
robot.outtake.slides.manualPower = -1.0
275+
} else if (slidePower.absoluteValue > slideThreshold) {
258276
robot.outtake.slides.isManual = true
259277
if (!robot.intake.claw.isOpen) {
260278
robot.outtake.slides.manualPower = slidePower.clamp(-1.0, 0)

0 commit comments

Comments
 (0)