Merging with actual stuff fixed #2

This commit is contained in:
alkadienePhoton
2025-11-08 17:51:13 -06:00
parent c3c875e80e
commit 9cdb70dd80

View File

@@ -142,7 +142,6 @@ async def Run4(): # From Send_Over_Final.py
# Add Rishi's code here # Add Rishi's code here
async def Run5(): async def Run5():
<<<<<<< HEAD
await drive_base.straight(600) await drive_base.straight(600)
await drive_base.straight(-100) await drive_base.straight(-100)
await drive_base.straight(150) await drive_base.straight(150)
@@ -153,18 +152,6 @@ async def Run5():
await drive_base.turn(-45) await drive_base.turn(-45)
await drive_base.straight(-200) await drive_base.straight(-200)
await drive_base.turn(75) await drive_base.turn(75)
=======
await drive_base.straight(700)
await drive_base.turn(-20)
await drive_base.straight(110)
await drive_base.straight(-220)
await drive_base.turn(63)
await drive_base.straight(130)
await right_arm.run_angle(1000, -1200)
await drive_base.straight(84)
await right_arm.run_angle(300, 1200)
await drive_base.straight(-875)
>>>>>>> 2d614c0e381ebefc99efa272a3ec8ee172c5f6ce
# Add - Adi's code here # Add - Adi's code here
async def Run6(): async def Run6():