Merging with actual stuff fixed
This commit is contained in:
@@ -46,10 +46,6 @@ async def monitor_distance():
|
|||||||
# New Section
|
# New Section
|
||||||
async def Run1(): # From M8_5.py
|
async def Run1(): # From M8_5.py
|
||||||
right_arm.run_angle(1000,450)
|
right_arm.run_angle(1000,450)
|
||||||
<<<<<<< HEAD
|
|
||||||
left_arm.run_angle(500,80)
|
|
||||||
await drive_base.straight(200)
|
|
||||||
=======
|
|
||||||
left_arm.run_angle(500,-80)
|
left_arm.run_angle(500,-80)
|
||||||
await drive_base.straight(200)
|
await drive_base.straight(200)
|
||||||
|
|
||||||
@@ -88,43 +84,6 @@ async def Run1(): # From M8_5.py
|
|||||||
await drive_base.turn(-45)
|
await drive_base.turn(-45)
|
||||||
await drive_base.straight(500)
|
await drive_base.straight(500)
|
||||||
|
|
||||||
>>>>>>> Johannes_Dev
|
|
||||||
|
|
||||||
await drive_base.turn(-40)
|
|
||||||
await drive_base.straight(325)
|
|
||||||
await left_arm.run_angle(500,-80)
|
|
||||||
|
|
||||||
await drive_base.straight(-100)
|
|
||||||
await drive_base.straight(50)
|
|
||||||
await left_arm.run_angle(500,170)
|
|
||||||
|
|
||||||
await drive_base.straight(-270)
|
|
||||||
await drive_base.turn(40)
|
|
||||||
await drive_base.straight(135)
|
|
||||||
left_arm.run_angle(1000,670)
|
|
||||||
|
|
||||||
await right_arm.run_angle(5000,-450, Stop.HOLD)
|
|
||||||
await right_arm.run_angle(5000,450, Stop.HOLD)
|
|
||||||
await right_arm.run_angle(5000,-450, Stop.HOLD)
|
|
||||||
await right_arm.run_angle(5000,450, Stop.HOLD)
|
|
||||||
await right_arm.run_angle(5000,-450, Stop.HOLD)
|
|
||||||
right_arm.run_angle(5000,450, Stop.HOLD)
|
|
||||||
|
|
||||||
await drive_base.turn(-35)
|
|
||||||
await drive_base.straight(300)
|
|
||||||
await drive_base.turn(63)
|
|
||||||
await drive_base.straight(170)
|
|
||||||
|
|
||||||
await drive_base.turn(-80)
|
|
||||||
await drive_base.straight(87)
|
|
||||||
await drive_base.turn(-15)
|
|
||||||
|
|
||||||
await drive_base.straight(-120)
|
|
||||||
await drive_base.turn(-100)
|
|
||||||
await drive_base.straight(300)
|
|
||||||
await drive_base.turn(-45)
|
|
||||||
await drive_base.straight(500)
|
|
||||||
|
|
||||||
|
|
||||||
async def Run2(): # From Heavy_lifting_final.py
|
async def Run2(): # From Heavy_lifting_final.py
|
||||||
await drive_base.straight(200)
|
await drive_base.straight(200)
|
||||||
|
|||||||
Reference in New Issue
Block a user