Fixed conflicts

This commit is contained in:
alkadienePhoton
2025-11-11 19:10:54 -06:00
4 changed files with 394 additions and 11 deletions

View File

@@ -21,20 +21,25 @@ drive_base.use_gyro(True)
async def main():
right_arm.run_angle(1000,450)
left_arm.run_angle(500,-80)
left_arm.run_angle(500,-90)
await drive_base.straight(200)
await drive_base.turn(-40)
await drive_base.straight(325)
await left_arm.run_angle(500,80)
await left_arm.run_angle(500,90)
await drive_base.straight(-100)
await drive_base.straight(50)
await left_arm.run_angle(500,-170)
await left_arm.run_angle(500,-180)
await drive_base.straight(-270)
await drive_base.turn(40)
await drive_base.straight(135)
await drive_base.straight(-90)
left_arm.run_angle(500,180)
await drive_base.turn(-20)
await drive_base.turn(15)
await drive_base.straight(-173)
await drive_base.turn(45)
await drive_base.straight(120)
left_arm.run_angle(1000,-670)
await right_arm.run_angle(5000,-450, Stop.HOLD)
@@ -45,7 +50,7 @@ async def main():
right_arm.run_angle(5000,450, Stop.HOLD)
await drive_base.turn(-35)
await drive_base.straight(300)
await drive_base.straight(297)
await drive_base.turn(63)
await drive_base.straight(170)
@@ -53,10 +58,8 @@ async def main():
await drive_base.straight(87)
await drive_base.turn(-15)
await drive_base.straight(-120)
await drive_base.straight(-90)
await drive_base.turn(-100)
await drive_base.straight(300)
await drive_base.turn(-45)
await drive_base.straight(500)
await drive_base.arc(-500,None,600)
run_task(main())