resolving
This commit is contained in:
@@ -261,13 +261,18 @@ async def Run4(): # Window to the Past, Leaf Cutter, Humongous Fungus, Experimen
|
||||
|
||||
await drive_base.straight(110)
|
||||
await drive_base.turn(-45)
|
||||
<<<<<<< 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)
|
||||
@@ -278,11 +283,23 @@ 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(-145)
|
||||
await drive_base.turn(80)
|
||||
await drive_base.straight(230)
|
||||
set_speed(600, 500, 300, 200)
|
||||
await drive_base.straight(-138)
|
||||
>>>>>>> 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
|
||||
await drive_base.straight(235)
|
||||
await multitask(
|
||||
right_arm.run_angle(300,100),
|
||||
@@ -290,6 +307,11 @@ 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.turn(-90)
|
||||
await drive_base.straight(-170)
|
||||
set_speed(600,500,300,200)
|
||||
@@ -316,7 +338,11 @@ async def Run5(): # Forest Elder - Parthiv
|
||||
await drive_base.straight(-200)
|
||||
await drive_base.stop
|
||||
|
||||
<<<<<<< HEAD
|
||||
async def Run6(): # Interchangable Mission - Parthiv
|
||||
=======
|
||||
async def Run11(): # Interchangable Mission - Parthiv
|
||||
>>>>>>> 2b44156 (Update discovery-phase/missions/Showcase_codes.py)
|
||||
|
||||
await left_arm.run_angle(200,-80)
|
||||
await drive_base.arc(-350,angle=90)
|
||||
|
||||
Reference in New Issue
Block a user