resolving

This commit is contained in:
2026-10-12 11:24:00 -05:00
parent 75013f1039
commit 99080ce07e

View File

@@ -273,18 +273,30 @@ async def Run3(): # Window to the Past, Leaf Cutter, Humongous Fungus, Experimen
await drive_base.turn(40)
set_speed(100,200,300,200)
await drive_base.straight(170)
<<<<<<< HEAD
await drive_base.straight(-145)
await drive_base.turn(80)
await drive_base.straight(230)
set_speed(600, 500, 300, 200)
await drive_base.straight(-138)
=======
await drive_base.straight(-135)
await drive_base.turn(80)
await drive_base.straight(230)
set_speed(600, 500, 300, 200)
await drive_base.straight(-145)
>>>>>>> 0e1e580 (Update discovery-phase/missions/Showcase_codes.py)
await multitask(
drive_base.turn(-36),
right_arm.run_angle(200,-140)
)
set_speed(100,200,300,200)
await drive_base.straight(230)
<<<<<<< HEAD
await right_arm.run_angle(300,105)
=======
await right_arm.run_angle(300,160)
>>>>>>> 0e1e580 (Update discovery-phase/missions/Showcase_codes.py)
await wait(200)
await drive_base.turn(-90)
await drive_base.straight(-170)