Compare commits
40 Commits
dev
...
466657022a
| Author | SHA1 | Date | |
|---|---|---|---|
| 466657022a | |||
| f4cfa3e8f4 | |||
| 0c3b2e1053 | |||
| cc1643f9e8 | |||
| 47a5a8445b | |||
| e53e367751 | |||
| 13a24e17ad | |||
| bda38fab1c | |||
| 275c73382c | |||
| 72ffdf2172 | |||
| 1a94799e5a | |||
| 99080ce07e | |||
| 75013f1039 | |||
| f2a0d940e0 | |||
| 656591ee43 | |||
| 2b44156e6c | |||
| 635f79db04 | |||
| 58d9160a2c | |||
| 97e67ce81d | |||
| 8399fae12b | |||
| 6480331d5e | |||
| 8b0258273b | |||
| c2a1f0abb3 | |||
| 143380f0ec | |||
| 0f87f0e49a | |||
| 1cae9c258f | |||
| 9b262cc39d | |||
| fdbe815d51 | |||
| f79ac34715 | |||
| 03adeb476d | |||
| cf95327d1a | |||
| 2d197652a6 | |||
| 66acbde5df | |||
| 9021a0bf09 | |||
| 2b7088edaa | |||
| 9788fae8cd | |||
| ea09f1fdc2 | |||
| 81bd650958 | |||
| 4ab24a47c2 | |||
| bcf6b0524c |
@@ -209,9 +209,140 @@ 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
|
||||||
|
await set_speed(600,200,300,200)
|
||||||
|
await drive_base.straight(500)
|
||||||
|
await multitask(
|
||||||
|
drive_base.straight(-200),
|
||||||
|
right_arm.run_angle(400,-150)
|
||||||
|
)
|
||||||
|
await set_speed(600,500,100,200)
|
||||||
|
await drive_base.turn(45)
|
||||||
|
await drive_base.straight(346)
|
||||||
|
await drive_base.turn(-68)
|
||||||
|
await multitask(
|
||||||
|
left_arm.run_angle(600,240),
|
||||||
|
set_speed(300,200,300,200),
|
||||||
|
drive_base.straight(280)
|
||||||
|
)
|
||||||
|
await left_arm.run_angle(600,-100)
|
||||||
|
await drive_base.turn(22)
|
||||||
|
await drive_base.straight(-100)
|
||||||
|
await right_arm.run_angle(5000,45)
|
||||||
|
await set_speed(600,500,100,200)
|
||||||
|
await drive_base.straight(200)
|
||||||
|
await drive_base.arc(-1500,None,-1000)
|
||||||
|
|
||||||
|
async def Run2(): # Exploding Seeds - Johannes
|
||||||
|
|
||||||
|
await multitask(
|
||||||
|
right_arm.run_angle(400,-100),
|
||||||
|
left_arm.run_angle(300,100),
|
||||||
|
drive_base.arc(150,None,115)
|
||||||
|
)
|
||||||
|
await drive_base.straight(270)
|
||||||
|
await left_arm.run_angle(300,-100)
|
||||||
|
await drive_base.straight(-100)
|
||||||
|
await left_arm.run_angle(300,-100)
|
||||||
|
await drive_base.arc(-1000,None,-800)
|
||||||
|
|
||||||
|
|
||||||
|
async def Run2_1(): # Drone Survey, Experimental - Johannes
|
||||||
|
|
||||||
|
await multitask(
|
||||||
|
right_arm.run_angle(400,100),
|
||||||
|
set_speed(600,200,300,200),
|
||||||
|
drive_base.straight(300)
|
||||||
|
)
|
||||||
|
set_speed(600,500,300,200)
|
||||||
|
await drive_base.straight(470)
|
||||||
|
await drive_base.turn(-15)
|
||||||
|
await drive_base.straight(55)
|
||||||
|
await drive_base.straight(-280)
|
||||||
|
await drive_base.turn(15)
|
||||||
|
await right_arm.run_angle(400,-100)
|
||||||
|
await drive_base.straight(40)
|
||||||
|
await drive_base.turn(-15)
|
||||||
|
await drive_base.straight(50)
|
||||||
|
await drive_base.turn(-25)
|
||||||
|
|
||||||
|
|
||||||
|
async def Run3(): # Window to the Past, Leaf Cutter, Humongous Fungus, Experimental - Johannes
|
||||||
|
|
||||||
|
await drive_base.straight(98)
|
||||||
|
await drive_base.turn(-45)
|
||||||
|
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)
|
||||||
|
<<<<<<< HEAD
|
||||||
|
await drive_base.straight(170)
|
||||||
|
<<<<<<< HEAD
|
||||||
|
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)
|
||||||
|
=======
|
||||||
|
await drive_base.straight(-135)
|
||||||
|
await drive_base.turn(80)
|
||||||
|
await drive_base.straight(230)
|
||||||
|
set_speed(600, 500, 300, 200)
|
||||||
|
await drive_base.straight(-145)
|
||||||
|
>>>>>>> 0e1e580 (Update discovery-phase/missions/Showcase_codes.py)
|
||||||
|
=======
|
||||||
|
await drive_base.straight(177)
|
||||||
|
await drive_base.straight(-145)
|
||||||
|
await drive_base.turn(85)
|
||||||
|
await drive_base.straight(232)
|
||||||
|
set_speed(600, 500, 300, 200)
|
||||||
|
await drive_base.straight(-138)
|
||||||
|
>>>>>>> 788745f (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)
|
||||||
|
await drive_base.straight(230)
|
||||||
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
|
await right_arm.run_angle(300,105)
|
||||||
|
=======
|
||||||
|
await right_arm.run_angle(300,160)
|
||||||
|
>>>>>>> 0e1e580 (Update discovery-phase/missions/Showcase_codes.py)
|
||||||
|
=======
|
||||||
|
await right_arm.run_angle(300,105)
|
||||||
|
>>>>>>> 788745f (Update discovery-phase/missions/Showcase_codes.py)
|
||||||
|
await wait(200)
|
||||||
|
await drive_base.turn(-90)
|
||||||
|
await drive_base.straight(-170)
|
||||||
|
set_speed(600,500,300,200)
|
||||||
|
await drive_base.straight(100)
|
||||||
|
await drive_base.arc(800,None,-900)
|
||||||
|
|
||||||
|
|
||||||
|
async def Run4(): #Flip the Rock, Lucky Leaves, Reaching Roots - Rishabh
|
||||||
|
|
||||||
|
#Run
|
||||||
|
=======
|
||||||
|
>>>>>>> c15d8f0 (Update discovery-phase/missions/Showcase_codes.py)
|
||||||
|
await drive_base.straight(550)#Works (600(Previous))
|
||||||
|
await drive_base.straight(-200)
|
||||||
|
=======
|
||||||
|
|
||||||
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)
|
||||||
|
=======
|
||||||
|
|
||||||
|
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)
|
||||||
@@ -229,6 +360,12 @@ async def Run1(): # Flip The Rock, Lucky Leaves, Reaching Roots - Johannes
|
|||||||
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
|
||||||
|
async def Run11(): # Interchangable Mission - Parthiv
|
||||||
|
=======
|
||||||
|
=======
|
||||||
|
>>>>>>> dev
|
||||||
async def Run2(): # Exploding Seeds - Johannes
|
async def Run2(): # Exploding Seeds - Johannes
|
||||||
|
|
||||||
await multitask(
|
await multitask(
|
||||||
@@ -267,6 +404,10 @@ async def Run4(): # Window to the Past, Leaf Cutter, Humongous Fungus, Experimen
|
|||||||
await drive_base.straight(110)
|
await drive_base.straight(110)
|
||||||
await drive_base.turn(-45)
|
await drive_base.turn(-45)
|
||||||
<<<<<<< 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)
|
||||||
@@ -293,11 +434,30 @@ 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 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)
|
||||||
|
=======
|
||||||
|
>>>>>>> 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
|
||||||
|
>>>>>>> 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),
|
||||||
@@ -305,6 +465,10 @@ 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
|
||||||
|
=======
|
||||||
|
>>>>>>> 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),
|
||||||
@@ -317,6 +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 right_arm.run_angle(300,105)
|
||||||
|
await wait(200)
|
||||||
|
>>>>>>> 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)
|
||||||
@@ -370,10 +542,24 @@ async def Run1(): # Flip The Rock, Lucky Leaves, Reaching Roots - Parthiv
|
|||||||
>>>>>>> 3cd1849 (Update discovery-phase/missions/Showcase_codes.py)
|
>>>>>>> 3cd1849 (Update discovery-phase/missions/Showcase_codes.py)
|
||||||
|
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< 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)
|
||||||
|
=======
|
||||||
async def Run6(): # Interchangable Mission - Parthiv
|
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)
|
||||||
|
>>>>>>> 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)
|
||||||
|
|||||||
Reference in New Issue
Block a user