diff --git a/codes_for_scrimmage/hazmat/mainhazmatUPD.py b/codes_for_scrimmage/hazmat/mainhazmatUPD.py index 0679fc4..df2bab9 100644 --- a/codes_for_scrimmage/hazmat/mainhazmatUPD.py +++ b/codes_for_scrimmage/hazmat/mainhazmatUPD.py @@ -46,8 +46,49 @@ async def monitor_distance(): # New Section async def Run1(): # From M8_5.py right_arm.run_angle(1000,450) +<<<<<<< HEAD left_arm.run_angle(500,80) await drive_base.straight(200) +======= + left_arm.run_angle(500,-80) + await drive_base.straight(200) + + 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) + +>>>>>>> Johannes_Dev await drive_base.turn(-40) await drive_base.straight(325)