37 Commits

Author SHA1 Message Date
466657022a Merge branch 'dev' 2026-10-12 11:35:41 -05:00
ff561e51a0 Update discovery-phase/missions/Showcase_codes.py 2026-10-12 11:19:00 -05:00
0cd478fde1 resolving 2026-10-12 11:15:42 -05:00
2888d96d30 Cleaning up main branh 2026-10-12 11:14:51 -05:00
d444fb97c5 Add Mission 3, 4, & 5 2026-10-12 11:14:50 -05:00
a9d3cd971e Update discovery-phase/missions/Showcase_codes.py 2026-10-11 23:57:01 +00:00
e608f7ea1f Update discovery-phase/missions/mission_experimental_stalinus.py 2026-10-11 22:21:31 +00:00
f3041b0483 Update discovery-phase/missions/mission_experimental_hirohitus.py 2026-10-11 22:21:06 +00:00
83363ed0c4 Add discovery-phase/missions/Exploding Seeds 2026-10-09 20:43:02 +00:00
c15d8f0fd6 Update discovery-phase/missions/Showcase_codes.py 2026-10-07 02:02:12 +00:00
788745f4f4 Update discovery-phase/missions/Showcase_codes.py 2026-10-02 21:52:26 +00:00
a60078d89d Update discovery-phase/missions/Showcase_codes.py 2026-10-02 21:29:41 +00:00
0e1e580fb0 Update discovery-phase/missions/Showcase_codes.py 2026-10-02 21:07:59 +00:00
98b987fe71 Update discovery-phase/missions/Mission 11, 6+More-Rishabh 2026-09-30 00:59:14 +00:00
19912d759e Update discovery-phase/missions/Showcase_codes.py 2026-09-28 12:43:43 +00:00
e9b42189b0 Add discovery-phase/missions/Mission 1-Rishabh 2026-09-27 23:30:23 +00:00
b1783a2fce Update discovery-phase/missions/Mission 11, 6+More-Rishabh 2026-09-27 23:29:44 +00:00
57844e8b1a Add discovery-phase/missions/Mission 3, 4, 5 - Rishabh 2026-09-27 23:29:13 +00:00
74b363f97e Add discovery-phase/missions/Mission 11, 6+More 2026-09-27 23:28:22 +00:00
e332b0c324 Update discovery-phase/missions/Showcase_codes.py 2026-09-27 04:15:25 +00:00
64a296a84e Update discovery-phase/missions/Showcase_codes.py 2026-09-27 04:12:58 +00:00
de8a3455b0 Add discovery-phase/missions/drone survey.py 2026-09-22 23:56:31 +00:00
3fcbb79439 Add discovery-phase/missions/Showcase_codes.py 2026-09-22 20:58:48 +00:00
8c7bec48ff Update discovery-phase/missions/mission_experimental_stalinus.py 2026-09-21 04:23:15 +00:00
ad69b7560d Update discovery-phase/missions/mission_experimental_hirohitus.py 2026-09-21 04:22:59 +00:00
9125c0b4aa Update discovery-phase/missions 3, 4, 5/Mission 3, 4, & 5.py 2026-09-21 04:20:37 +00:00
54b58c64c3 Update discovery-phase/missions/mission 3_4_5_johannes.py 2026-09-21 04:19:47 +00:00
4c9b7607f6 Add discovery-phase/missions/mission_experimental_johannes_2.py 2026-09-21 04:19:29 +00:00
d8bf319fdf Add discovery-phase/missions/mission_experimental_johannes.py 2026-09-21 04:18:59 +00:00
99826dad19 Add discovery-phase/missions/mission_1_johannes.py 2026-09-21 04:17:55 +00:00
ddbc8a6390 Add discovery-phase/missions/mission_2_johannes.py 2026-09-21 04:17:23 +00:00
4748e17030 Add discovery-phase/missions/Mission 3_4_5 Johannes.py 2026-09-21 04:16:18 +00:00
1ffcfceae7 Add discovery-phase/missions/mission_15_Parthiv.py 2026-09-20 23:19:09 +00:00
b31f815876 Add discovery-phase/missions/mission_9.py 2026-09-20 22:17:05 +00:00
3fee5ba45c Upload files to "discovery-phase/missions 3, 4, 5" 2026-09-20 22:11:53 +00:00
37aa0e9037 added discovery phase folder 2026-09-20 15:45:48 -05:00
08fa18fc72 folder structure commit 2026-09-20 14:56:22 -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)