Merge branch 'dev' of https://codes.fll-65266.org/FLL_65266_LEGO_DYNAMICS/solutions_season_unearthed into dev

Works

LINEUPS.md

@@ -2,12 +2,14 @@
 
 ## These are the line-up positions for the robot game for various missions.
 
-- Mission Run #1 (Run #1) [Right/Blue Home] - The left yellow part of the right arm attachment is positioned with its right edge on the 5th thin line from the left. Note that this is NOT positioned from the back of the robot.
+- Mission Run #1 (Run #1) [Right/Blue Home] - The left yellow part of the right arm attachment is positioned with its right edge on the 5th thin line from the left. Note that this is NOT positioned from the back of the robot. Also, when counting these lines, make sure you count from the inside curve, not the outside.
+
+<img src="https://codes.fll-65266.org/FLL_65266_LEGO_DYNAMICS/solutions_season_unearthed/raw/branch/do-not-merge/r1l.png" alt="Alt text" width="300"/>
 
 - Mission Run #2 (Tip the scales) [Right/Blue Home] - The middle of the left edge of the robot should be positioned on the 2nd thick line from the left.
 
 - Mission Run #3 (Send Over) [Right/Blue Home] - The robot should be lined up on the vertical edge of the right home. The robot's right edge should be positioned on the 1st thin line from the top. Note that the 0th line is the one that is in the inner curve.
 
-- Mission Run #4 (Run #4) [Left/Red Home] - The robot's left edge should be positioned on the 2nd thin line from the left.
+- Mission Run #4 (Run #4) [Left/Red Home] - The robot's left edge should be positioned on the 2nd thick line from the left.
 
-- Mission Run #5 (Boat mission) [Left/Red Home] - There are two alignments for this. When sending off the robot for part 1, the robot should be facing the right home. It's right edge should be positioned at the very bottom edge of the board. Once it completes the pulling part, once it comes back begin part 2. For part 2, the middle of the robot's right side should be positioned in the middle of the 3rd thick and the 3rd thick, 1st thin lines.
+- Mission Run #5 (Boat mission) [Left/Red Home] - There are two alignments for this. When sending off the robot for part 1, the robot should be facing the right home. It's right edge should be positioned at the very bottom edge of the board. Once it completes the pulling part, once it comes back begin part 2. For part 2, the middle of the robot's right side should be positioned in the middle of the 3rd thick and the 3rd thick, 1st thin lines from the top. For both runs the robot should be facing the blue home.

codes_for_scrimmage/hazmat/mainhazmatUPD.py

@@ -45,21 +45,27 @@ async def monitor_distance():
 
 # New Section
 async def Run1():  # From M8_5.py
+    
     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)
@@ -70,7 +76,7 @@ async def Run1():  # From M8_5.py
     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)
 
@@ -78,12 +84,9 @@ async def Run1():  # From M8_5.py
     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)
     
 async def Run2():  # From Heavy_lifting_final.py
     await drive_base.straight(200)

utils/FINAL_STARTER_BLANK_CODE.py

@@ -0,0 +1,29 @@
+from pybricks.pupdevices import Motor, ColorSensor, UltrasonicSensor, ForceSensor
+from pybricks.parameters import Button, Color, Direction, Port, Side, Stop
+from pybricks.tools import run_task, multitask
+from pybricks.tools import wait, StopWatch
+from pybricks.robotics import DriveBase
+from pybricks.hubs import PrimeHub
+
+# Initialize hub and devices
+hub = PrimeHub()
+left_motor = Motor(Port.A, Direction.COUNTERCLOCKWISE)
+right_motor = Motor(Port.B)
+left_arm = Motor(Port.C)
+
+right_arm = Motor(Port.D)
+lazer_ranger = UltrasonicSensor(Port.E)
+color_sensor = ColorSensor(Port.F)
+# DriveBase configuration
+WHEEL_DIAMETER = 68.8  # mm
+AXLE_TRACK = 180  # mm
+drive_base = DriveBase(left_motor, right_motor, WHEEL_DIAMETER, AXLE_TRACK)
+drive_base.settings(600, 500, 300, 200)
+drive_base.use_gyro(True)
+
+WALL_DISTANCE = 200  # mm
+
+async def main():
+    # Your code goes here
+
+run_task(main())