From 4533f952ed19f29bd05bc29f2d8fd1f7935f8753 Mon Sep 17 00:00:00 2001
From: Atharv <30nagava@elmbrookstudents.org>
Date: Tue, 7 Oct 2025 12:32:40 +0000
Subject: [PATCH 1/2] Add stuff from Johannes accidental fork

---
 missions/Lift.py  | 34 ++++++++++++++++++++++++++++++++++
 missions/Lift2.py | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 missions/Lift.py
 create mode 100644 missions/Lift2.py

diff --git a/missions/Lift.py b/missions/Lift.py
new file mode 100644
index 0000000..a5e1773
--- /dev/null
+++ b/missions/Lift.py
@@ -0,0 +1,34 @@
+from pybricks.hubs import PrimeHub
+from pybricks.pupdevices import Motor, ColorSensor, UltrasonicSensor, ForceSensor
+from pybricks.parameters import Button, Color, Direction, Port, Side, Stop
+from pybricks.robotics import DriveBase
+from pybricks.tools import wait, StopWatch
+from pybricks.tools import run_task, multitask
+
+hub = PrimeHub()
+
+left_motor = Motor(Port.A, Direction.COUNTERCLOCKWISE)
+right_motor = Motor(Port.B)
+
+left_arm = Motor(Port.C, Direction.COUNTERCLOCKWISE)
+right_arm = Motor(Port.D)
+drive_base = DriveBase(left_motor, right_motor, wheel_diameter=68.8, axle_track=180)
+drive_base.settings(600,500,300,200)
+drive_base.use_gyro(True)
+
+async def main():
+    await drive_base.straight(200)
+    await drive_base.turn(-20)
+    await drive_base.straight(525)
+    await drive_base.turn(60)
+
+    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)
+
+    await drive_base.turn(-100)
+    await drive_base.straight(-600)
+run_task(main())
\ No newline at end of file
diff --git a/missions/Lift2.py b/missions/Lift2.py
new file mode 100644
index 0000000..a5e1773
--- /dev/null
+++ b/missions/Lift2.py
@@ -0,0 +1,34 @@
+from pybricks.hubs import PrimeHub
+from pybricks.pupdevices import Motor, ColorSensor, UltrasonicSensor, ForceSensor
+from pybricks.parameters import Button, Color, Direction, Port, Side, Stop
+from pybricks.robotics import DriveBase
+from pybricks.tools import wait, StopWatch
+from pybricks.tools import run_task, multitask
+
+hub = PrimeHub()
+
+left_motor = Motor(Port.A, Direction.COUNTERCLOCKWISE)
+right_motor = Motor(Port.B)
+
+left_arm = Motor(Port.C, Direction.COUNTERCLOCKWISE)
+right_arm = Motor(Port.D)
+drive_base = DriveBase(left_motor, right_motor, wheel_diameter=68.8, axle_track=180)
+drive_base.settings(600,500,300,200)
+drive_base.use_gyro(True)
+
+async def main():
+    await drive_base.straight(200)
+    await drive_base.turn(-20)
+    await drive_base.straight(525)
+    await drive_base.turn(60)
+
+    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)
+
+    await drive_base.turn(-100)
+    await drive_base.straight(-600)
+run_task(main())
\ No newline at end of file
-- 
2.49.1


From 08e0b9a521b5e6142496c148193099edf5c2d58b Mon Sep 17 00:00:00 2001
From: Atharv <30nagava@elmbrookstudents.org>
Date: Wed, 8 Oct 2025 23:21:43 +0000
Subject: [PATCH 2/2] Delete missions/Lift2.py

---
 missions/Lift2.py | 34 ----------------------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 missions/Lift2.py

diff --git a/missions/Lift2.py b/missions/Lift2.py
deleted file mode 100644
index a5e1773..0000000
--- a/missions/Lift2.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from pybricks.hubs import PrimeHub
-from pybricks.pupdevices import Motor, ColorSensor, UltrasonicSensor, ForceSensor
-from pybricks.parameters import Button, Color, Direction, Port, Side, Stop
-from pybricks.robotics import DriveBase
-from pybricks.tools import wait, StopWatch
-from pybricks.tools import run_task, multitask
-
-hub = PrimeHub()
-
-left_motor = Motor(Port.A, Direction.COUNTERCLOCKWISE)
-right_motor = Motor(Port.B)
-
-left_arm = Motor(Port.C, Direction.COUNTERCLOCKWISE)
-right_arm = Motor(Port.D)
-drive_base = DriveBase(left_motor, right_motor, wheel_diameter=68.8, axle_track=180)
-drive_base.settings(600,500,300,200)
-drive_base.use_gyro(True)
-
-async def main():
-    await drive_base.straight(200)
-    await drive_base.turn(-20)
-    await drive_base.straight(525)
-    await drive_base.turn(60)
-
-    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)
-
-    await drive_base.turn(-100)
-    await drive_base.straight(-600)
-run_task(main())
\ No newline at end of file
-- 
2.49.1