diff --git a/discovery-phase/missions/Showcase_codes.py b/discovery-phase/missions/Showcase_codes.py index fc4d8a0..19e062f 100644 --- a/discovery-phase/missions/Showcase_codes.py +++ b/discovery-phase/missions/Showcase_codes.py @@ -394,6 +394,7 @@ 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) ======= @@ -421,17 +422,31 @@ async def Run4(): # 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) +======= + 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( @@ -440,6 +455,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.straight(230) await right_arm.run_angle(300,105) @@ -497,12 +517,15 @@ async def Run1(): # Flip The Rock, Lucky Leaves, Reaching Roots - Parthiv 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)