Update discovery-phase/missions/Showcase_codes.py
This commit is contained in:
@@ -202,7 +202,12 @@ async def multilift_down(rotation_angle):
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
async def Run1(): # Flip The Rock, Lucky Leaves, Reaching Roots - Parthiv
|
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
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
@@ -464,7 +469,33 @@ async def Run5(): # Forest Elder - Parthiv
|
|||||||
await drive_base.turn(15)
|
await drive_base.turn(15)
|
||||||
await right_arm.run_angle(200,-200)
|
await right_arm.run_angle(200,-200)
|
||||||
await drive_base.straight(-200)
|
await drive_base.straight(-200)
|
||||||
|
<<<<<<< HEAD
|
||||||
await drive_base.stop
|
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
|
async def Run6(): # Interchangable Mission - Parthiv
|
||||||
@@ -493,6 +524,12 @@ async def Run11(): # Interchangable Mission - Parthiv
|
|||||||
await drive_base.straight(-775)
|
await drive_base.straight(-775)
|
||||||
await drive_base.stop
|
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
|
async def Run7(): # Seed Dispersal and Keystone - Parthiv
|
||||||
|
|
||||||
await drive_base.straight(600)
|
await drive_base.straight(600)
|
||||||
@@ -507,6 +544,10 @@ async def Run7(): # Seed Dispersal and Keystone - Parthiv
|
|||||||
await drive_base.straight(-350)
|
await drive_base.straight(-350)
|
||||||
|
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
>>>>>>> a9d3cd9 (Update discovery-phase/missions/Showcase_codes.py)
|
||||||
|
>>>>>>> 3cd1849 (Update discovery-phase/missions/Showcase_codes.py)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user