3 Commits

Author SHA1 Message Date
f4cfa3e8f4 resolving 2026-10-12 11:28:46 -05:00
0c3b2e1053 Update discovery-phase/missions/Showcase_codes.py 2026-10-12 11:28:46 -05:00
cc1643f9e8 resolving again 2026-10-12 11:28:43 -05:00

View File

@@ -202,7 +202,12 @@ async def multilift_down(rotation_angle):
)
<<<<<<< HEAD
async def Run1(): # Flip The Rock, Lucky Leaves, Reaching Roots - Parthiv
=======
<<<<<<< HEAD
async def Run1(): # Flip The Rock, Lucky Leaves, Reaching Roots - Johannes
>>>>>>> 3cd1849 (Update discovery-phase/missions/Showcase_codes.py)
<<<<<<< HEAD
<<<<<<< HEAD
@@ -389,13 +394,19 @@ async def Run4(): # Window to the Past, Leaf Cutter, Humongous Fungus, Experimen
await drive_base.straight(110)
await drive_base.turn(-45)
<<<<<<< HEAD
<<<<<<< HEAD
await drive_base.straight(280)
=======
await drive_base.straight(300)
>>>>>>> 2b44156 (Update discovery-phase/missions/Showcase_codes.py)
await right_arm.run_angle(300,120)
await left_arm.run_angle(400,200)
await drive_base.straight(-70)
await left_arm.run_angle(600,-110)
await drive_base.straight(370)
await drive_base.turn(50)
<<<<<<< HEAD
await multitask(
drive_base.straight(250),
left_arm.run_angle(600,-60)
@@ -406,11 +417,37 @@ async def Run4(): # Window to the Past, Leaf Cutter, Humongous Fungus, Experimen
await drive_base.straight(-135)
await drive_base.turn(80)
await drive_base.straight(85)
=======
await drive_base.straight(250)
await drive_base.turn(40)
set_speed(100,200,300,200)
await drive_base.straight(170)
=======
await drive_base.straight(300)
await right_arm.run_angle(300,120)
await drive_base.straight(290)
await drive_base.turn(50)
await drive_base.straight(250)
await drive_base.turn(40)
set_speed(100,200,300,200)
await drive_base.straight(170)
>>>>>>> 2b44156 (Update discovery-phase/missions/Showcase_codes.py)
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)
<<<<<<< HEAD
>>>>>>> 2b44156 (Update discovery-phase/missions/Showcase_codes.py)
=======
>>>>>>> 2b44156 (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)
<<<<<<< HEAD
<<<<<<< HEAD
await drive_base.straight(235)
await multitask(
right_arm.run_angle(300,100),
@@ -418,6 +455,16 @@ async def Run4(): # Window to the Past, Leaf Cutter, Humongous Fungus, Experimen
)
await wait(200)
await drive_base.straight(30)
=======
await drive_base.straight(230)
await right_arm.run_angle(300,105)
await wait(200)
>>>>>>> 2b44156 (Update discovery-phase/missions/Showcase_codes.py)
=======
await drive_base.straight(230)
await right_arm.run_angle(300,105)
await wait(200)
>>>>>>> 2b44156 (Update discovery-phase/missions/Showcase_codes.py)
await drive_base.turn(-90)
await drive_base.straight(-170)
set_speed(600,500,300,200)
@@ -442,10 +489,46 @@ async def Run5(): # Forest Elder - Parthiv
await drive_base.turn(15)
await right_arm.run_angle(200,-200)
await drive_base.straight(-200)
<<<<<<< HEAD
await drive_base.stop
=======
=======
async def Run1(): # Flip The Rock, Lucky Leaves, Reaching Roots - Parthiv
await drive_base.straight(415)
await drive_base.straight(-150)
>>>>>>> a9d3cd9 (Update discovery-phase/missions/Showcase_codes.py)
await drive_base.turn(45)
await drive_base.straight(600)
await drive_base.turn(-90)
await multitask(
left_arm.run_angle(200,300),
right_arm.run_angle(200,-290)
)
set_speed(100,500,300,200)
await drive_base.straight(300)
await left_arm.run_angle(200,-300)
await drive_base.straight(-95)
await drive_base.turn(22)
await right_arm.run_angle(5000,100)
await drive_base.straight(90)
set_speed(700,500,300,200)
await drive_base.arc(-700,angle=-150)
>>>>>>> 3cd1849 (Update discovery-phase/missions/Showcase_codes.py)
<<<<<<< HEAD
<<<<<<< HEAD
async def Run6(): # Interchangable Mission - Parthiv
<<<<<<< HEAD
>>>>>>> c15d8f0 (Update discovery-phase/missions/Showcase_codes.py)
=======
=======
=======
>>>>>>> 2b44156 (Update discovery-phase/missions/Showcase_codes.py)
async def Run11(): # Interchangable Mission - Parthiv
>>>>>>> 2b44156 (Update discovery-phase/missions/Showcase_codes.py)
>>>>>>> 0cd478f (resolving)
await left_arm.run_angle(200,-80)
await drive_base.arc(-350,angle=90)
@@ -464,6 +547,12 @@ async def Run6(): # Interchangable Mission - Parthiv
await drive_base.straight(-775)
await drive_base.stop
<<<<<<< HEAD
=======
<<<<<<< HEAD
async def Run12(): # Experimental Research Platform Lifter
=======
>>>>>>> 3cd1849 (Update discovery-phase/missions/Showcase_codes.py)
async def Run7(): # Seed Dispersal and Keystone - Parthiv
await drive_base.straight(600)
@@ -478,6 +567,10 @@ async def Run7(): # Seed Dispersal and Keystone - Parthiv
await drive_base.straight(-350)
<<<<<<< HEAD
=======
>>>>>>> a9d3cd9 (Update discovery-phase/missions/Showcase_codes.py)
>>>>>>> 3cd1849 (Update discovery-phase/missions/Showcase_codes.py)