Merge branch 'dev'

This commit is contained in:
2026-10-12 11:35:41 -05:00

View File

@@ -209,6 +209,7 @@ async def Run1(): # Flip The Rock, Lucky Leaves, Reaching Roots - Parthiv
async def Run1(): # Flip The Rock, Lucky Leaves, Reaching Roots - Johannes async def Run1(): # Flip The Rock, Lucky Leaves, Reaching Roots - Johannes
>>>>>>> 3cd1849 (Update discovery-phase/missions/Showcase_codes.py) >>>>>>> 3cd1849 (Update discovery-phase/missions/Showcase_codes.py)
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
await set_speed(600,200,300,200) await set_speed(600,200,300,200)
@@ -337,6 +338,11 @@ async def Run4(): #Flip the Rock, Lucky Leaves, Reaching Roots - Rishabh
await drive_base.straight(415) await drive_base.straight(415)
await drive_base.straight(-150) await drive_base.straight(-150)
>>>>>>> a9d3cd9 (Update discovery-phase/missions/Showcase_codes.py) >>>>>>> a9d3cd9 (Update discovery-phase/missions/Showcase_codes.py)
=======
await drive_base.straight(415)
await drive_base.straight(-150)
>>>>>>> dev
await drive_base.turn(45) await drive_base.turn(45)
await drive_base.straight(600) await drive_base.straight(600)
await drive_base.turn(-90) await drive_base.turn(-90)
@@ -354,9 +360,12 @@ async def Run4(): #Flip the Rock, Lucky Leaves, Reaching Roots - Rishabh
set_speed(700,500,300,200) set_speed(700,500,300,200)
await drive_base.arc(-700,angle=-150) await drive_base.arc(-700,angle=-150)
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
async def Run11(): # Interchangable Mission - Parthiv async def Run11(): # Interchangable Mission - Parthiv
======= =======
=======
>>>>>>> dev
async def Run2(): # Exploding Seeds - Johannes async def Run2(): # Exploding Seeds - Johannes
await multitask( await multitask(
@@ -396,6 +405,9 @@ async def Run4(): # Window to the Past, Leaf Cutter, Humongous Fungus, Experimen
await drive_base.turn(-45) await drive_base.turn(-45)
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> dev
await drive_base.straight(280) await drive_base.straight(280)
======= =======
await drive_base.straight(300) await drive_base.straight(300)
@@ -422,6 +434,7 @@ async def Run4(): # Window to the Past, Leaf Cutter, Humongous Fungus, Experimen
await drive_base.turn(40) await drive_base.turn(40)
set_speed(100,200,300,200) set_speed(100,200,300,200)
await drive_base.straight(170) await drive_base.straight(170)
<<<<<<< HEAD
======= =======
await drive_base.straight(300) await drive_base.straight(300)
await right_arm.run_angle(300,120) await right_arm.run_angle(300,120)
@@ -432,14 +445,19 @@ async def Run4(): # Window to the Past, Leaf Cutter, Humongous Fungus, Experimen
set_speed(100,200,300,200) set_speed(100,200,300,200)
await drive_base.straight(170) await drive_base.straight(170)
>>>>>>> 2b44156 (Update discovery-phase/missions/Showcase_codes.py) >>>>>>> 2b44156 (Update discovery-phase/missions/Showcase_codes.py)
=======
>>>>>>> dev
await drive_base.straight(-145) await drive_base.straight(-145)
await drive_base.turn(80) await drive_base.turn(80)
await drive_base.straight(230) await drive_base.straight(230)
set_speed(600, 500, 300, 200) set_speed(600, 500, 300, 200)
await drive_base.straight(-138) await drive_base.straight(-138)
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 2b44156 (Update discovery-phase/missions/Showcase_codes.py) >>>>>>> 2b44156 (Update discovery-phase/missions/Showcase_codes.py)
======= =======
=======
>>>>>>> dev
>>>>>>> 2b44156 (Update discovery-phase/missions/Showcase_codes.py) >>>>>>> 2b44156 (Update discovery-phase/missions/Showcase_codes.py)
await multitask( await multitask(
drive_base.turn(-36), drive_base.turn(-36),
@@ -448,6 +466,9 @@ async def Run4(): # Window to the Past, Leaf Cutter, Humongous Fungus, Experimen
set_speed(100,200,300,200) set_speed(100,200,300,200)
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> dev
await drive_base.straight(235) await drive_base.straight(235)
await multitask( await multitask(
right_arm.run_angle(300,100), right_arm.run_angle(300,100),
@@ -460,11 +481,14 @@ async def Run4(): # Window to the Past, Leaf Cutter, Humongous Fungus, Experimen
await right_arm.run_angle(300,105) await right_arm.run_angle(300,105)
await wait(200) await wait(200)
>>>>>>> 2b44156 (Update discovery-phase/missions/Showcase_codes.py) >>>>>>> 2b44156 (Update discovery-phase/missions/Showcase_codes.py)
<<<<<<< HEAD
======= =======
await drive_base.straight(230) await drive_base.straight(230)
await right_arm.run_angle(300,105) await right_arm.run_angle(300,105)
await wait(200) await wait(200)
>>>>>>> 2b44156 (Update discovery-phase/missions/Showcase_codes.py) >>>>>>> 2b44156 (Update discovery-phase/missions/Showcase_codes.py)
=======
>>>>>>> dev
await drive_base.turn(-90) await drive_base.turn(-90)
await drive_base.straight(-170) await drive_base.straight(-170)
set_speed(600,500,300,200) set_speed(600,500,300,200)
@@ -517,6 +541,7 @@ async def Run1(): # Flip The Rock, Lucky Leaves, Reaching Roots - Parthiv
await drive_base.arc(-700,angle=-150) await drive_base.arc(-700,angle=-150)
>>>>>>> 3cd1849 (Update discovery-phase/missions/Showcase_codes.py) >>>>>>> 3cd1849 (Update discovery-phase/missions/Showcase_codes.py)
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
async def Run6(): # Interchangable Mission - Parthiv async def Run6(): # Interchangable Mission - Parthiv
@@ -529,6 +554,12 @@ async def Run6(): # Interchangable Mission - Parthiv
async def Run11(): # Interchangable Mission - Parthiv async def Run11(): # Interchangable Mission - Parthiv
>>>>>>> 2b44156 (Update discovery-phase/missions/Showcase_codes.py) >>>>>>> 2b44156 (Update discovery-phase/missions/Showcase_codes.py)
>>>>>>> 0cd478f (resolving) >>>>>>> 0cd478f (resolving)
=======
async def Run6(): # Interchangable Mission - Parthiv
=======
async def Run11(): # Interchangable Mission - Parthiv
>>>>>>> 2b44156 (Update discovery-phase/missions/Showcase_codes.py)
>>>>>>> dev
await left_arm.run_angle(200,-80) await left_arm.run_angle(200,-80)
await drive_base.arc(-350,angle=90) await drive_base.arc(-350,angle=90)