Merging
This commit is contained in:
@@ -86,11 +86,19 @@ async def Run2():
|
||||
await drive_base.straight(-600)
|
||||
async def Run3():
|
||||
await drive_base.straight(920)
|
||||
<<<<<<< HEAD:final/4main.py
|
||||
await drive_base.turn(-90)
|
||||
await drive_base.straight(60)
|
||||
drive_base.turn(-10)
|
||||
await left_arm.run_angle(10000,-4000)
|
||||
await drive_base.straight(-110)
|
||||
=======
|
||||
await drive_base.turn(-90,Stop.HOLD)
|
||||
await drive_base.straight(65)
|
||||
drive_base.turn(-10)
|
||||
await left_arm.run_angle(10000,-4000)
|
||||
await drive_base.straight(-100)
|
||||
>>>>>>> Vickram_dev_:final/main4.py
|
||||
await drive_base.turn(90)
|
||||
await drive_base.straight(2000)
|
||||
async def Run5():
|
||||
|
||||
Reference in New Issue
Block a user