Update discovery-phase/missions/Showcase_codes.py

This commit is contained in:
2026-10-02 21:52:26 +00:00
committed by nifrali
parent 1a94799e5a
commit 72ffdf2172

View File

@@ -263,7 +263,7 @@ async def Run2_1(): # Drone Survey, Experimental - Johannes
async def Run3(): # Window to the Past, Leaf Cutter, Humongous Fungus, Experimental - Johannes async def Run3(): # Window to the Past, Leaf Cutter, Humongous Fungus, Experimental - Johannes
await drive_base.straight(110) await drive_base.straight(98)
await drive_base.turn(-45) await drive_base.turn(-45)
await drive_base.straight(300) await drive_base.straight(300)
await right_arm.run_angle(300,120) await right_arm.run_angle(300,120)
@@ -272,6 +272,7 @@ async def Run3(): # Window to the Past, Leaf Cutter, Humongous Fungus, Experimen
await drive_base.straight(250) await drive_base.straight(250)
await drive_base.turn(40) await drive_base.turn(40)
set_speed(100,200,300,200) set_speed(100,200,300,200)
<<<<<<< HEAD
await drive_base.straight(170) await drive_base.straight(170)
<<<<<<< HEAD <<<<<<< HEAD
await drive_base.straight(-145) await drive_base.straight(-145)
@@ -286,17 +287,29 @@ async def Run3(): # Window to the Past, Leaf Cutter, Humongous Fungus, Experimen
set_speed(600, 500, 300, 200) set_speed(600, 500, 300, 200)
await drive_base.straight(-145) await drive_base.straight(-145)
>>>>>>> 0e1e580 (Update discovery-phase/missions/Showcase_codes.py) >>>>>>> 0e1e580 (Update discovery-phase/missions/Showcase_codes.py)
=======
await drive_base.straight(177)
await drive_base.straight(-145)
await drive_base.turn(85)
await drive_base.straight(232)
set_speed(600, 500, 300, 200)
await drive_base.straight(-138)
>>>>>>> 788745f (Update discovery-phase/missions/Showcase_codes.py)
await multitask( await multitask(
drive_base.turn(-36), drive_base.turn(-36),
right_arm.run_angle(200,-140) right_arm.run_angle(200,-140)
) )
set_speed(100,200,300,200) set_speed(100,200,300,200)
await drive_base.straight(230) await drive_base.straight(230)
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
await right_arm.run_angle(300,105) await right_arm.run_angle(300,105)
======= =======
await right_arm.run_angle(300,160) await right_arm.run_angle(300,160)
>>>>>>> 0e1e580 (Update discovery-phase/missions/Showcase_codes.py) >>>>>>> 0e1e580 (Update discovery-phase/missions/Showcase_codes.py)
=======
await right_arm.run_angle(300,105)
>>>>>>> 788745f (Update discovery-phase/missions/Showcase_codes.py)
await wait(200) await wait(200)
await drive_base.turn(-90) await drive_base.turn(-90)
await drive_base.straight(-170) await drive_base.straight(-170)