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

merging dev

LINEUPS.md

@@ -2,14 +2,12 @@
 
 ## These are the line-up positions for the robot game for various missions.
 
-- Mission Run #1 (Mission #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.
 
-- Mission Run #2 (Send Over) [Right/Blue Home] - The robot should be lined up on the vertical edge of the left home. The robot's right side should be positioned on the 1st thin line from the top. Note that the 0th line is the one that is not part of the curve.
+- 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 (Sand mission) [Right/Blue Home] - The robot should be lined up on the vertical edge of the left home. The robot's left side should be positioned on the 1/2th thin line from the bottom.
+- 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 (Boat mission) [Left/Red Home] - The robot should be lined up on the vertical edge of the left home. The robot's right side should be positioned on the 2nd thick line from the bottom.
+- 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 #5 (Bautism) [Left/Red Home] - The robot's left edge should be positioned at the 1st thick, 2nd thin 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 #6 (Not-so-heavy Lifting) [Right/Blue Home] - The robot's right edge should be positioned at the 1st thick from the right.

codes_for_scrimmage/hazmat/mainhazmatUPD.py

@@ -142,16 +142,29 @@ async def Run4():  # From Send_Over_Final.py
 
 # Add Rishi's code here
 async def Run5(): 
-    await drive_base.straight(700)
+<<<<<<< HEAD
-    await drive_base.turn(-18)
+    await drive_base.straight(600)
+    await drive_base.straight(-100)
+    await drive_base.straight(150)
+    await drive_base.turn(60)
     await drive_base.straight(100)
-    await drive_base.straight(-205)
+    await drive_base.turn(-86)
+    await drive_base.straight(120)
+    await drive_base.turn(-45)
+    await drive_base.straight(-200)
+    await drive_base.turn(75)
+=======
+    await drive_base.straight(700)
+    await drive_base.turn(-20)
+    await drive_base.straight(110)
+    await drive_base.straight(-220)
     await drive_base.turn(63)
-    await drive_base.straight(125)
+    await drive_base.straight(130)
-    await arm_motor.run_angle(1000, -1200)
+    await right_arm.run_angle(1000, -1200)
     await drive_base.straight(84)
-    await arm_motor.run_angle(300, 1200)
+    await right_arm.run_angle(300, 1200)
     await drive_base.straight(-875)
+>>>>>>> 2d614c0e381ebefc99efa272a3ec8ee172c5f6ce
 
 # Add - Adi's code here
 async def Run6():

missions/New_MapReveal/New_MapReveal_Mineshaft.py

@@ -0,0 +1,38 @@
+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 (adjust for your wheels)
+AXLE_TRACK = 180  # mm (distance between wheels)
+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():
+    await drive_base.straight(700)
+    await drive_base.turn(-20)
+    await drive_base.straight(110)
+    await drive_base.straight(-220)
+    await drive_base.turn(63)
+    await drive_base.straight(130)
+    await right_arm.run_angle(1000, -1200)
+    await drive_base.straight(84)
+    await right_arm.run_angle(300, 1200)
+    await drive_base.straight(-875)
+
+run_task(main())