resolving

This commit is contained in:
2026-10-12 11:27:31 -05:00
parent e53e367751
commit 47a5a8445b

View File

@@ -202,8 +202,9 @@ async def multilift_down(rotation_angle):
) )
async def Run1(): # Flip The Rock, Lucky Leaves, Reaching Roots - Rishabh async def Run1(): # Flip The Rock, Lucky Leaves, Reaching Roots - Parthiv
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
await set_speed(600,200,300,200) await set_speed(600,200,300,200)
await drive_base.straight(500) await drive_base.straight(500)
@@ -326,18 +327,27 @@ async def Run4(): #Flip the Rock, Lucky Leaves, Reaching Roots - Rishabh
>>>>>>> c15d8f0 (Update discovery-phase/missions/Showcase_codes.py) >>>>>>> c15d8f0 (Update discovery-phase/missions/Showcase_codes.py)
await drive_base.straight(550)#Works (600(Previous)) await drive_base.straight(550)#Works (600(Previous))
await drive_base.straight(-200) await drive_base.straight(-200)
=======
await drive_base.straight(415)
await drive_base.straight(-150)
>>>>>>> a9d3cd9 (Update discovery-phase/missions/Showcase_codes.py)
await drive_base.turn(45) await drive_base.turn(45)
await drive_base.straight(575) await drive_base.straight(600)
await drive_base.turn(-90)#-90 for Coach Cisco table await drive_base.turn(-90)
await left_arm.run_angle(200,270) await multitask(
left_arm.run_angle(200,300),
right_arm.run_angle(200,-290)
)
set_speed(100,500,300,200)
await drive_base.straight(300) await drive_base.straight(300)
await left_arm.run_angle(200,-265) await left_arm.run_angle(200,-300)
await right_arm.run_angle(200, -200) await drive_base.straight(-95)
await drive_base.straight(-105)#Use -105 for Coach Cisco table(-105 for school) await drive_base.turn(22)
await drive_base.turn(32)#was 24-Use 24 for Coach Cisco's table(32 for school) await right_arm.run_angle(5000,100)
await right_arm.run_angle(1500, 180) await drive_base.straight(90)
await drive_base.turn(30) set_speed(700,500,300,200)
await drive_base.straight(-1000) await drive_base.arc(-700,angle=-150)
<<<<<<< HEAD <<<<<<< HEAD
async def Run11(): # Interchangable Mission - Parthiv async def Run11(): # Interchangable Mission - Parthiv
@@ -454,12 +464,18 @@ async def Run6(): # Interchangable Mission - Parthiv
await drive_base.straight(-775) await drive_base.straight(-775)
await drive_base.stop await drive_base.stop
async def Run7(): # Seed Dispersal - Parthiv async def Run7(): # Seed Dispersal and Keystone - Parthiv
set_speed(700,500,400,200) await drive_base.straight(600)
await drive_base.straight(490) await drive_base.arc(400,angle=35)
await left_arm.run_angle(50,100) await drive_base.straight(-40)
await drive_base.straight(-490) await right_arm.run_angle(150,-70)
await drive_base.arc(400,angle=-35)
await drive_base.straight(-540)
await drive_base.turn(-90)
await drive_base.straight(200)
await left_arm.run_angle(100,100)
await drive_base.straight(-350)