codes_for_scrimmage/hazmat/hazmat_main.py

@@ -232,22 +232,19 @@ async def Run1(): #From M8_5.py
     await drive_base.straight(-600)
 
 async def Run2(): #From Heavy_lifting_final.py
-     #Get to mission
     await drive_base.straight(200)
     await drive_base.turn(-20)
-    await drive_base.straight(525)
-    await drive_base.turn(60)
-    #Solve mission
-    await drive_base.straight(50)
-    await right_arm.run_angle(2000,1000)
-    await drive_base.straight(-50)
-    await drive_base.turn(45)
-    await drive_base.straight(50)
-    await right_arm.run_angle(350,-1000)
-    #Return home
-    await drive_base.straight(-100)
-    await drive_base.turn(-100)
-    await drive_base.straight(-600)
+    await drive_base.straight(536)
+    await drive_base.turn(60, Stop.HOLD)
+    await drive_base.straight(30)
+
+    await right_arm.run_angle(5000,2900)
+    await drive_base.straight(40)
+    await right_arm.run_angle(5000,-4000)
+    await drive_base.straight(-60)
+
+    await drive_base.turn(-60)
+    await drive_base.straight(-670)
 
 
 async def Run3(): #tip the scale.py