diff --git a/codes_for_scrimmage/hazmat/mainhazmatUPD.py b/codes_for_scrimmage/hazmat/mainhazmatUPD.py index ae79328..6037463 100644 --- a/codes_for_scrimmage/hazmat/mainhazmatUPD.py +++ b/codes_for_scrimmage/hazmat/mainhazmatUPD.py @@ -45,24 +45,35 @@ async def monitor_distance(): # New Section async def Run1(): # From M8_5.py - left_arm.run_angle(1000, -300) - right_arm.run_angle(1000, 500) + left_arm.run_angle(1000, 300) + right_arm.run_angle(1000,500) await drive_base.straight(320) - await right_arm.run_angle(5000, -500, Stop.HOLD) - await right_arm.run_angle(5000, 500, Stop.HOLD) - await right_arm.run_angle(5000, -500, Stop.HOLD) - await right_arm.run_angle(5000, 500, Stop.HOLD) - await right_arm.run_angle(5000, -500, Stop.HOLD) + + await right_arm.run_angle(5000,-500, Stop.HOLD) + await right_arm.run_angle(5000,500, Stop.HOLD) + await right_arm.run_angle(5000,-500, Stop.HOLD) + await right_arm.run_angle(5000,500, Stop.HOLD) + await right_arm.run_angle(5000,-500, Stop.HOLD) + await drive_base.turn(-20) await drive_base.straight(277) await drive_base.turn(20) await drive_base.straight(65) + await drive_base.turn(-30) - right_arm.run_angle(50, 500) + right_arm.run_angle(70,500) await drive_base.turn(45) await drive_base.straight(-145) - await drive_base.turn(-30) - await drive_base.straight(-700) + await drive_base.turn(-60) + await drive_base.straight(90) + await left_arm.run_angle(1000,-450) + await drive_base.straight(-150) + await left_arm.run_angle(1000,450) + await drive_base.straight(27.67) #turns back to solve market place + await drive_base.turn(90) #Will solve market place + await drive_base.straight(-450) + await drive_base.turn(70) + await drive_base.straight(600) async def Run2(): # From Heavy_lifting_final.py await drive_base.straight(200) @@ -104,27 +115,16 @@ async def Run3(): # tip the scale.py async def Run4(): # From Send_Over_Final.py - right_arm.run_angle(800,800) - await drive_base.straight(170) - await drive_base.turn(-90) - await drive_base.straight(270) - await drive_base.turn(59) - await drive_base.straight(202) - await drive_base.turn(2) - await right_arm.run_angle(350,-800) - await right_arm.run_angle(800,800) - await drive_base.straight(-20) - await drive_base.straight(-35) - await drive_base.turn(-60) - await drive_base.straight(342) - await drive_base.turn(-89) - await drive_base.straight(75) # Tralelo Tralala shark with blue shoes + await drive_base.straight(920) + await drive_base.turn(-90,Stop.HOLD) + await drive_base.straight(65) + #Solve drive_base.turn(-10) - await left_arm.run_angle(1000,-4000) + await left_arm.run_angle(10000,-4000) await drive_base.straight(-110) await drive_base.turn(90) - + await multitask( drive_forward(), monitor_distance()