Compare commits
56 Commits
Vickram_de
...
9f5a41eace
| Author | SHA1 | Date | |
|---|---|---|---|
|
9f5a41eace | ||
|
|
686875a066 | ||
|
|
6d54f9c2d7 | ||
| 19f79b91d1 | |||
| 1c0896cbeb | |||
| d2738e2615 | |||
| 1ee90ac2e1 | |||
| 31f482f576 | |||
| 30a5392e56 | |||
| 3b22d28e98 | |||
|
|
9cdb70dd80 | ||
|
|
c3c875e80e | ||
|
|
809789837d | ||
| 39bfe7b307 | |||
|
|
80d6300fc0 | ||
|
|
b25a2a5feb | ||
| 2d614c0e38 | |||
| c7801d17c0 | |||
| 0c4335993a | |||
| ff6100a964 | |||
| 974f87c4c4 | |||
| a50b0cd1d7 | |||
| 16e96693cc | |||
| acc44dac22 | |||
| 411f46d55e | |||
| 69745c053f | |||
| 214ea1c22e | |||
| 074703af1a | |||
| 9061eef311 | |||
| e924043945 | |||
| 94043eb522 | |||
| a690350d1d | |||
| 8d4b296331 | |||
| 73553b0964 | |||
| b1f378eae7 | |||
| 439aca673f | |||
| 4b7491637d | |||
| 9ca07a36a8 | |||
| 6c6b7f1f02 | |||
| b97dcf6837 | |||
| eea26150f9 | |||
| d056255994 | |||
| 5f0ffea7bc | |||
| 9a573c4eb2 | |||
| a0a4fa4792 | |||
| 14bc8d291a | |||
| b91e701f4c | |||
| debbc4e4d0 | |||
| 0c7633d92d | |||
| 3b81a3ff2b | |||
| 401033b185 | |||
| 9cdd9886e3 | |||
| 3a45721812 | |||
| a65ad1470c | |||
| b36a9f3355 | |||
| 21e8bd68c2 |
12
LINEUPS.md
12
LINEUPS.md
@@ -2,14 +2,14 @@
|
||||
|
||||
## 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. Also, when counting these lines, make sure you count from the inside curve, not the outside.
|
||||
|
||||
- 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.
|
||||
<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 #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 #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 #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 #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 #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 #4 (Run #4) [Left/Red Home] - The robot's left edge should be positioned on the 2nd thick line from the left.
|
||||
|
||||
- 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.
|
||||
- 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.
|
||||
12
README.md
12
README.md
@@ -94,12 +94,12 @@ Repository
|
||||
### Color Start System
|
||||
| Color | Mission |
|
||||
|-------|-----------|
|
||||
| Green 🟩 | Run 1 |
|
||||
| Purple 🟪 | Run 2 |
|
||||
| Red 🟥| Run 3 |
|
||||
| Yellow 🟨| Run 4 |
|
||||
| Blue 🟦| Run 5 |
|
||||
| Orange 🟧| Run 6 |
|
||||
| ```Green 🟩 ```| Run 1 |
|
||||
| ```Purple 🟪 ```| Run 2 |
|
||||
| ```Red 🟥 ```| Run 3 |
|
||||
| ```Yellow 🟨 ```| Run 4 |
|
||||
| ```Blue 🟦 ```| Run 5 |
|
||||
| ```Orange 🟧 ```| Run 6 |
|
||||
|
||||
---
|
||||
|
||||
|
||||
@@ -140,40 +140,41 @@ async def Run4(): # From Send_Over_Final.py
|
||||
|
||||
# Add Rishi's code here
|
||||
async def Run5():
|
||||
await drive_base.straight(519)
|
||||
await left_arm.run_angle(-10000, 300)
|
||||
await left_arm.run_angle(10000, 600)
|
||||
await drive_base.straight(160)
|
||||
await drive_base.turn(-30)
|
||||
await drive_base.straight(50)
|
||||
await right_arm.run_angle(3000, 3000)
|
||||
await drive_base.straight(-150)
|
||||
await drive_base.turn(120)
|
||||
await drive_base.straight(25)
|
||||
await right_arm.run_angle(10000, -3000)
|
||||
await drive_base.straight(-110)
|
||||
await drive_base.turn(-43)
|
||||
await right_arm.run_angle(10000, -3000)
|
||||
await drive_base.straight(295)
|
||||
await right_arm.run_angle(10000, 9000)
|
||||
await drive_base.straight(-65)
|
||||
await drive_base.turn(45)
|
||||
await drive_base.straight(175)
|
||||
await drive_base.turn(24.5)
|
||||
await drive_base.straight(-100)
|
||||
await right_arm.run_angle(10000, -8500)
|
||||
await drive_base.straight(700)
|
||||
await drive_base.turn(-18)
|
||||
await drive_base.straight(100)
|
||||
await right_arm.run_angle(10000, 3500)
|
||||
await drive_base.turn(-30)
|
||||
await drive_base.straight(-300)
|
||||
await drive_base.turn(-80)
|
||||
await drive_base.straight(-700)
|
||||
await drive_base.straight(-205)
|
||||
await drive_base.turn(63)
|
||||
await drive_base.straight(125)
|
||||
await arm_motor.run_angle(1000, -1200)
|
||||
await drive_base.straight(84)
|
||||
await arm_motor.run_angle(300, 1200)
|
||||
await drive_base.straight(-875)
|
||||
|
||||
|
||||
# Add - Adi's code here
|
||||
async def Run6():
|
||||
await drive_base.straight(750)
|
||||
await drive_base.straight(-650)
|
||||
await drive_base.straight(500)
|
||||
await right_arm.run_angle(300,500)
|
||||
await drive_base.straight(-75)
|
||||
await right_arm.run_angle(300, -900)
|
||||
await drive_base.straight(-350)
|
||||
await wait(1000)
|
||||
await drive_base.straight(800)
|
||||
await drive_base.straight(-200)
|
||||
await drive_base.turn(-15)
|
||||
await drive_base.straight(350)
|
||||
await drive_base.turn(-94)
|
||||
await drive_base.straight(-80)
|
||||
await left_arm.run_angle(500, 900)
|
||||
await drive_base.straight(50)
|
||||
await drive_base.turn(-10)
|
||||
await drive_base.straight(50)
|
||||
await left_arm.run_angle(700, -200)
|
||||
await drive_base.turn(30)
|
||||
await drive_base.straight(-60)
|
||||
await drive_base.turn(80)
|
||||
await drive_base.straight(-900)
|
||||
|
||||
|
||||
# Function to classify color based on HSV
|
||||
|
||||
@@ -21,7 +21,7 @@ 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 = 300 # mm
|
||||
WALL_DISTANCE = 200 # mm
|
||||
|
||||
async def drive_forward():
|
||||
"""Drive forward continuously using DriveBase."""
|
||||
@@ -45,31 +45,49 @@ 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)
|
||||
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 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)
|
||||
await drive_base.turn(45)
|
||||
await drive_base.straight(-145)
|
||||
await drive_base.turn(-60)
|
||||
await drive_base.straight(90)
|
||||
await left_arm.run_angle(1000, 450)
|
||||
await drive_base.straight(-145)
|
||||
await left_arm.run_angle(1000, -450)
|
||||
await drive_base.straight(10)
|
||||
await drive_base.turn(35)
|
||||
await drive_base.straight(-600)
|
||||
|
||||
right_arm.run_angle(1000,450)
|
||||
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,90)
|
||||
|
||||
await drive_base.straight(-100)
|
||||
await drive_base.straight(50)
|
||||
await left_arm.run_angle(500,-180)
|
||||
|
||||
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)
|
||||
await right_arm.run_angle(5000,450, Stop.HOLD)
|
||||
await right_arm.run_angle(5000,-450, Stop.HOLD)
|
||||
await right_arm.run_angle(5000,450, Stop.HOLD)
|
||||
await right_arm.run_angle(5000,-450, Stop.HOLD)
|
||||
right_arm.run_angle(5000,450, Stop.HOLD)
|
||||
|
||||
await drive_base.turn(-35)
|
||||
await drive_base.straight(297)
|
||||
await drive_base.turn(63)
|
||||
await drive_base.straight(170)
|
||||
|
||||
await drive_base.turn(-80)
|
||||
await drive_base.straight(87)
|
||||
await drive_base.turn(-15)
|
||||
|
||||
await drive_base.straight(-90)
|
||||
await drive_base.turn(-100)
|
||||
await drive_base.arc(-500,None,600)
|
||||
|
||||
async def Run2(): # From Heavy_lifting_final.py
|
||||
await drive_base.straight(200)
|
||||
await drive_base.turn(-20)
|
||||
@@ -105,39 +123,26 @@ async def Run3(): # tip the scale.py
|
||||
await drive_base.turn(40) # turning right
|
||||
await left_arm.run_angle(410,-400) #lift a little bit
|
||||
await drive_base.straight(80)
|
||||
await drive_base.turn(-41) #ma din din din dun 67 41 21 69
|
||||
await drive_base.turn(-41) #ma din din din dun 67 41 21
|
||||
await drive_base.straight(900)
|
||||
|
||||
|
||||
async def Run4(): # From Send_Over_Final.py
|
||||
#Get to mission
|
||||
|
||||
await drive_base.straight(920)
|
||||
await drive_base.turn(-90,Stop.HOLD)
|
||||
await drive_base.straight(65)
|
||||
#Solve mission
|
||||
#Solve
|
||||
drive_base.turn(-10)
|
||||
await left_arm.run_angle(10000, 4000)
|
||||
#Get to Red Start
|
||||
await left_arm.run_angle(10000,-4000)
|
||||
await drive_base.straight(-110)
|
||||
await drive_base.turn(90)
|
||||
# while True:
|
||||
# distance_mm = await lazer_ranger.distance()
|
||||
# print('distancing...',distance_mm)
|
||||
|
||||
# if distance_mm < 300:
|
||||
# drive_base.stop
|
||||
# break
|
||||
# else:
|
||||
# drive_base.straight(300)
|
||||
# print('running...')
|
||||
# await wait(10)
|
||||
await multitask(
|
||||
drive_forward(),
|
||||
monitor_distance()
|
||||
)
|
||||
|
||||
|
||||
|
||||
# Add Rishi's code here
|
||||
async def Run5():
|
||||
await drive_base.straight(600)
|
||||
@@ -153,10 +158,27 @@ async def Run5():
|
||||
|
||||
# Add - Adi's code here
|
||||
async def Run6():
|
||||
await drive_base.straight(750)
|
||||
await drive_base.straight(-650)
|
||||
|
||||
|
||||
await drive_base.straight(500)
|
||||
await right_arm.run_angle(300,500)
|
||||
await drive_base.straight(-75)
|
||||
await right_arm.run_angle(300, -900)
|
||||
await drive_base.straight(-350)
|
||||
await wait(1000)
|
||||
await drive_base.straight(800)
|
||||
await drive_base.straight(-200)
|
||||
await drive_base.turn(-15)
|
||||
await drive_base.straight(350)
|
||||
await drive_base.turn(-94)
|
||||
await drive_base.straight(-80)
|
||||
await left_arm.run_angle(500, 900)
|
||||
await drive_base.straight(50)
|
||||
await drive_base.turn(-10)
|
||||
await drive_base.straight(50)
|
||||
await left_arm.run_angle(700, -200)
|
||||
await drive_base.turn(30)
|
||||
await drive_base.straight(-60)
|
||||
await drive_base.turn(80)
|
||||
await drive_base.straight(-900)
|
||||
# Function to classify color based on HSV
|
||||
def detect_color(h, s, v, reflected):
|
||||
if reflected > 4:
|
||||
|
||||
132
commit-graph.html
Normal file
132
commit-graph.html
Normal file
@@ -0,0 +1,132 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
<!-- This file was created with the aha Ansi HTML Adapter. https://github.com/theZiz/aha -->
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="application/xml+xhtml; charset=UTF-8"/>
|
||||
<title>stdin</title>
|
||||
<link href="https://fonts.googleapis.com/css2?family=Roboto&display=swap" rel="stylesheet">
|
||||
<style>
|
||||
span {
|
||||
font-family: 'Roboto', sans-serif;
|
||||
}
|
||||
</style>
|
||||
|
||||
</head>
|
||||
<body>
|
||||
<pre>
|
||||
* <span style="color:olive;">d3294bc</span><span style="color:olive;"> (</span><span style="font-weight:bold;color:teal;">HEAD</span><span style="color:olive;"> -> </span><span style="font-weight:bold;color:green;">main</span><span style="color:olive;">, </span><span style="font-weight:bold;color:olive;">tag: </span><span style="font-weight:bold;color:olive;">TwistScrimmageRelease</span><span style="color:olive;">, </span><span style="font-weight:bold;color:red;">origin/main</span><span style="color:olive;">)</span> SCRIMMAGE MERGE!!!
|
||||
<span style="color:red;">|</span><span style="color:green;">\</span>
|
||||
<span style="color:red;">|</span> * <span style="color:olive;">d66aecd</span><span style="color:olive;"> (</span><span style="font-weight:bold;color:red;">origin/dev</span><span style="color:olive;">, </span><span style="font-weight:bold;color:red;">origin/HEAD</span><span style="color:olive;">, </span><span style="font-weight:bold;color:green;">dev</span><span style="color:olive;">)</span> Update README.md
|
||||
<span style="color:red;">|</span> * <span style="color:olive;">bbdf0d0</span> Shortened fun sounds
|
||||
<span style="color:red;">|</span> * <span style="color:olive;">a2ed2c4</span> Merge pull request 'arcmyx-dev' (#14) from arcmyx-dev into dev
|
||||
<span style="color:red;">|</span> <span style="color:olive;">|</span><span style="color:blue;">\</span>
|
||||
<span style="color:red;">|</span> <span style="color:olive;">|</span> * <span style="color:olive;">dd0070d</span><span style="color:olive;"> (</span><span style="font-weight:bold;color:red;">origin/arcmyx-dev</span><span style="color:olive;">)</span> Update twist_scrimmage.py
|
||||
<span style="color:red;">|</span> <span style="color:olive;">|</span> * <span style="color:olive;">9a06677</span> Added comments. Good luck for scrimmage y'all!!!
|
||||
<span style="color:red;">|</span> <span style="color:olive;">|</span> * <span style="color:olive;">11e89c6</span> THE FINAL THINGY
|
||||
<span style="color:red;">|</span> * <span style="color:blue;">|</span> <span style="color:olive;">52214be</span> Update final/4main.py
|
||||
<span style="color:red;">|</span> * <span style="color:blue;">|</span> <span style="color:olive;">4540269</span> Update final/4main.py
|
||||
<span style="color:red;">|</span> * <span style="color:blue;">|</span> <span style="color:olive;">785c955</span> Update final/4main.py
|
||||
<span style="color:red;">|</span> * <span style="color:blue;">|</span> <span style="color:olive;">b6cffc6</span> Update final/4main
|
||||
<span style="color:red;">|</span> * <span style="color:blue;">|</span> <span style="color:olive;">870dce3</span> Merge pull request 'arcmyx-dev' (#13) from arcmyx-dev into dev
|
||||
<span style="color:red;">|</span> <span style="color:purple;">|</span><span style="color:blue;">\</span><span style="color:blue;">|</span>
|
||||
<span style="color:red;">|</span> <span style="color:purple;">|</span> * <span style="color:olive;">bb76258</span> Update final/main4emaj.py
|
||||
<span style="color:red;">|</span> <span style="color:purple;">|</span> * <span style="color:olive;">75e64da</span> Update final/main4emaj.py
|
||||
<span style="color:red;">|</span> <span style="color:purple;">|</span> * <span style="color:olive;">8ea7cd5</span> Update final/main4emaj.py
|
||||
* <span style="color:purple;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">5ba2811</span> Merge pull request 'Updated LICENSE and README' (#12) from dev into main
|
||||
<span style="font-weight:bold;color:red;">|</span><span style="color:purple;">\</span><span style="color:purple;">|</span> <span style="color:teal;">|</span>
|
||||
<span style="font-weight:bold;color:red;">|</span> * <span style="color:teal;">|</span> <span style="color:olive;">dd4fb8b</span> Switched to GPLv3
|
||||
<span style="font-weight:bold;color:red;">|</span> * <span style="color:teal;">|</span> <span style="color:olive;">ee099d9</span> Switched to GPL v3
|
||||
<span style="font-weight:bold;color:red;">|</span> * <span style="color:teal;">|</span> <span style="color:olive;">489add5</span> Removed emojis
|
||||
* <span style="font-weight:bold;color:green;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">387e00b</span> Merge branch 'dev'
|
||||
<span style="font-weight:bold;color:olive;">|</span><span style="font-weight:bold;color:green;">\</span><span style="font-weight:bold;color:green;">|</span> <span style="color:teal;">|</span>
|
||||
<span style="font-weight:bold;color:olive;">|</span> * <span style="color:teal;">|</span> <span style="color:olive;">28e5bea</span> Updated README file with some formatting help from AI
|
||||
* <span style="font-weight:bold;color:blue;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">3fdd6ae</span> Merge to main for Scrimmage
|
||||
<span style="font-weight:bold;color:purple;">|</span><span style="font-weight:bold;color:blue;">\</span><span style="font-weight:bold;color:blue;">|</span> <span style="color:teal;">|</span>
|
||||
<span style="font-weight:bold;color:purple;">|</span> * <span style="color:teal;">|</span> <span style="color:olive;">1e612e2</span><span style="color:olive;"> (</span><span style="font-weight:bold;color:olive;">tag: </span><span style="font-weight:bold;color:olive;">Scrimmage-Twist</span><span style="color:olive;">)</span> Updated license information
|
||||
<span style="font-weight:bold;color:purple;">|</span> * <span style="color:teal;">|</span> <span style="color:olive;">4456a5a</span> Merge pull request 'Johannes_Dev' (#9) from Johannes_Dev into dev
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span><span style="color:green;">\</span> <span style="color:teal;">\</span>
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span> * <span style="color:teal;">|</span> <span style="color:olive;">08e0b9a</span><span style="color:olive;"> (</span><span style="font-weight:bold;color:red;">origin/Johannes_Dev</span><span style="color:olive;">)</span> Delete missions/Lift2.py
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span> * <span style="color:teal;">|</span> <span style="color:olive;">4533f95</span> Add stuff from Johannes accidental fork
|
||||
<span style="font-weight:bold;color:purple;">|</span> * <span style="color:green;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">ec74531</span> Merge pull request 'Vickram_dev_' (#8) from Vickram_dev_ into dev
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="color:olive;">|</span><span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span>
|
||||
<span style="font-weight:bold;color:purple;">|</span> * <span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span> <span style="color:olive;">62b76d4</span> Merge pull request 'Add missions/tip the scale.py' (#4) from ayaan_dev into dev
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="color:purple;">|</span><span style="color:teal;">\</span> <span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span>
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="color:purple;">|</span> * <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">8008daf</span><span style="color:olive;"> (</span><span style="font-weight:bold;color:red;">origin/ayaan_dev</span><span style="color:olive;">)</span> Add missions/tip the scale.py
|
||||
<span style="font-weight:bold;color:purple;">|</span> * <span style="color:teal;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">cba5cfc</span> Merge pull request 'Update utils/combine_runs.py' (#5) from Vickram_dev_ into dev
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="font-weight:bold;color:red;">|</span><span style="font-weight:bold;color:green;">\</span> <span style="color:teal;">\</span> <span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span>
|
||||
<span style="font-weight:bold;color:purple;">|</span> * <span style="font-weight:bold;color:green;">\</span> <span style="color:teal;">\</span> <span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span> <span style="color:olive;">3349e7f</span> Merge pull request 'Rishi_dev' (#7) from Rishi_dev into dev
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="font-weight:bold;color:olive;">|</span><span style="font-weight:bold;color:blue;">\</span> <span style="font-weight:bold;color:green;">\</span> <span style="color:teal;">\</span> <span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span>
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="font-weight:bold;color:olive;">|</span> * <span style="font-weight:bold;color:green;">|</span> <span style="color:teal;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">4b765b0</span><span style="color:olive;"> (</span><span style="font-weight:bold;color:red;">origin/Rishi_dev</span><span style="color:olive;">)</span> Update missions/M8_5.py
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="font-weight:bold;color:olive;">|</span> * <span style="font-weight:bold;color:green;">|</span> <span style="color:teal;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">2eca0d7</span> Initial commit
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="font-weight:bold;color:olive;">|</span><span style="font-weight:bold;color:olive;">/</span> <span style="font-weight:bold;color:green;">/</span> <span style="color:teal;">/</span> <span style="color:blue;">/</span> <span style="color:green;">/</span> <span style="color:teal;">/</span>
|
||||
<span style="font-weight:bold;color:purple;">|</span> * <span style="font-weight:bold;color:green;">|</span> <span style="color:teal;">/</span> <span style="color:blue;">/</span> <span style="color:green;">/</span> <span style="color:teal;">/</span> <span style="color:olive;">8949003</span> Mission 9 not in use
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span><span style="color:teal;">/</span> <span style="color:blue;">/</span> <span style="color:green;">/</span> <span style="color:teal;">/</span>
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="color:teal;">|</span><span style="color:teal;">/</span><span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span>
|
||||
<span style="font-weight:bold;color:purple;">|</span> * <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">6931731</span> Update LINEUPS.md
|
||||
<span style="font-weight:bold;color:purple;">|</span> * <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">d172c70</span> THIS CODE IS OUTDATED!!! DO NOT USE!!!
|
||||
<span style="font-weight:bold;color:purple;">|</span> * <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">efcc011</span> Initial Commit
|
||||
<span style="font-weight:bold;color:purple;">|</span> * <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">28bb3fa</span> Merge pull request 'Pull from Vickram to dev' (#2) from Vickram_dev_ into dev
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="font-weight:bold;color:purple;">|</span><span style="font-weight:bold;color:teal;">\</span> <span style="font-weight:bold;color:green;">\</span> <span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span>
|
||||
<span style="font-weight:bold;color:purple;">|</span> * <span style="font-weight:bold;color:teal;">\</span> <span style="font-weight:bold;color:green;">\</span> <span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span> <span style="color:olive;">7ba2453</span> Merge pull request 'Pull from Johannes_Dev to dev' (#3) from Johannes_Dev into dev
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span><span style="color:green;">\</span> <span style="font-weight:bold;color:teal;">\</span> <span style="font-weight:bold;color:green;">\</span> <span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span>
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span><span style="color:green;">_</span><span style="font-weight:bold;color:green;">|</span><span style="color:green;">_</span><span style="color:blue;">|</span><span style="color:green;">/</span> <span style="color:teal;">/</span>
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span><span style="color:green;">/</span><span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span>
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span> * <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">7eeead7</span> Sand Mission
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span> * <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">e817650</span> Send Over
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span> * <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">c4aa954</span> Boat mission
|
||||
* <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">ee0b8eb</span> Update README.md
|
||||
* <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> <span style="color:olive;">a745ed8</span> Merge pull request 'WIP - Test Merge ( dev to main )' (#1) from dev into main
|
||||
<span style="color:olive;">|</span><span style="color:blue;">\</span> <span style="color:red;">\</span> <span style="color:green;">\</span> <span style="font-weight:bold;color:teal;">\</span> <span style="font-weight:bold;color:green;">\</span> <span style="color:blue;">\</span> <span style="color:teal;">\</span>
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> * <span style="color:olive;">7e2dc0b</span><span style="color:olive;"> (</span><span style="font-weight:bold;color:red;">origin/Vickram_dev_</span><span style="color:olive;">)</span> Update final/main5.py
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> * <span style="color:olive;">29bd9f0</span> Update final/main5.py
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> * <span style="color:olive;">a3b04d3</span> Add final/main5.py
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> * <span style="color:olive;">2d9eb49</span> Update final/main4.py
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> * <span style="color:olive;">42090ea</span> Update final/main4.py
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> * <span style="color:olive;">f7072a6</span> Update final/main4.py
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span><span style="color:teal;">/</span>
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">3f37e7e</span> Update final/main4.py
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">a3e7be2</span> Update final/main4.py
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">c2204e7</span> Update final/main4.py
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">0664a61</span> Add final/main4.py
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">227619d</span> Add final/3main.py
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">684447c</span> Add final/2main.py
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span><span style="color:blue;">/</span>
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> * <span style="color:olive;">95d7c0c</span> Add final/1main.py
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> * <span style="color:olive;">7e0c3d2</span> Delete Final Combined Codes
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> * <span style="color:olive;">f190d38</span> Add Final Combined Codes
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> * <span style="color:olive;">cd21a73</span> Delete missions/main.py
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> * <span style="color:olive;">0fa1019</span> Upload files to "missions"
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span><span style="font-weight:bold;color:green;">/</span>
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> * <span style="color:olive;">bb89e01</span> Update utils/combine_runs.py
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span><span style="font-weight:bold;color:teal;">/</span>
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> * <span style="color:olive;">c690ae4</span> Update members/Vickram.txt
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span><span style="color:red;">/</span>
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span><span style="color:red;">/</span><span style="color:green;">|</span>
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:green;">|</span> <span style="color:olive;">d309b00</span> '{Johannes}'
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:green;">|</span> <span style="color:olive;">37fb0a6</span> Add members/Ayaan.txt
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:green;">|</span> <span style="color:olive;">e895fd1</span> Add members/Vickram.txt
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:green;">|</span> <span style="color:olive;">70e09fb</span> Add members/Carlos.txt
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span><span style="color:green;">/</span>
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">d017d13</span> Update members/atharv.txt
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">6199a9c</span> Atharv - added my About Me
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">72547c5</span> Fixed grammar
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">5d57a3a</span> Initial commit
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">5c7e2e9</span> Uploaded files from Bitbucket
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">e36e3d0</span> Delete Send_Over.py
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">a35d599</span> Delete M8_5.py
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">6dedb0a</span> Uploaded files from Bitbucket
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">be5350d</span> Update README.md
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">2412f2c</span> Uploaded files from Bitbucket
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">125f1df</span> Uploaded files from Bitbucket
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">3ddaf7e</span> Uploaded files from Bitbucket
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">2629845</span> Test new
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:olive;">fdbc180</span> Test
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span><span style="color:blue;">/</span>
|
||||
<span style="color:olive;">|</span> * <span style="color:olive;">ce4f984</span> Created new branch
|
||||
<span style="color:olive;">|</span> * <span style="color:olive;">7a0d651</span> Test commit
|
||||
<span style="color:olive;">|</span><span style="color:olive;">/</span>
|
||||
* <span style="color:olive;">0d0e977</span> Initial commit
|
||||
</pre>
|
||||
</body>
|
||||
</html>
|
||||
136
commit-graphnew.html
Normal file
136
commit-graphnew.html
Normal file
@@ -0,0 +1,136 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
||||
<!-- This file was created with the aha Ansi HTML Adapter. https://github.com/theZiz/aha -->
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta
|
||||
http-equiv="Content-Type"
|
||||
content="application/xml+xhtml; charset=UTF-8"
|
||||
/>
|
||||
<title>COMMIT GRAPH</title>
|
||||
<link
|
||||
href="https://fonts.googleapis.com/css2?family=Roboto&display=swap"
|
||||
rel="stylesheet"
|
||||
/>
|
||||
<style>
|
||||
span {
|
||||
font-family: "Roboto", sans-serif;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<pre>
|
||||
* d3294bc (HEAD -> main, tag: TwistScrimmageRelease, origin/main) SCRIMMAGE MERGE!!! [Atharv]
|
||||
<span style="color:red;">|</span><span style="color:green;">\</span>
|
||||
<span style="color:red;">|</span> * d66aecd (origin/dev, origin/HEAD, dev) Update README.md [Atharv]
|
||||
<span style="color:red;">|</span> * bbdf0d0 Shortened fun sounds [Atharv]
|
||||
<span style="color:red;">|</span> * a2ed2c4 Merge pull request 'atharv-dev' (#14) from atharv-dev into dev [Atharv]
|
||||
<span style="color:red;">|</span> <span style="color:olive;">|</span><span style="color:blue;">\</span>
|
||||
<span style="color:red;">|</span> <span style="color:olive;">|</span> * dd0070d (origin/atharv-dev) Update twist_scrimmage.py [Atharv]
|
||||
<span style="color:red;">|</span> <span style="color:olive;">|</span> * 9a06677 Added comments. Good luck for scrimmage y'all!!! [Atharv]
|
||||
<span style="color:red;">|</span> <span style="color:olive;">|</span> * 11e89c6 THE FINAL THINGY [Atharv]
|
||||
<span style="color:red;">|</span> * <span style="color:blue;">|</span> 52214be Update final/4main.py [Ayaan]
|
||||
<span style="color:red;">|</span> * <span style="color:blue;">|</span> 4540269 Update final/4main.py [Johannes]
|
||||
<span style="color:red;">|</span> * <span style="color:blue;">|</span> 785c955 Update final/4main.py [Atharv]
|
||||
<span style="color:red;">|</span> * <span style="color:blue;">|</span> b6cffc6 Update final/4main [Atharv]
|
||||
<span style="color:red;">|</span> * <span style="color:blue;">|</span> 870dce3 Merge pull request 'atharv-dev' (#13) from atharv-dev into dev [Atharv]
|
||||
<span style="color:red;">|</span> <span style="color:purple;">|</span><span style="color:blue;">\</span><span style="color:blue;">|</span>
|
||||
<span style="color:red;">|</span> <span style="color:purple;">|</span> * bb76258 Update final/main4emaj.py [Atharv]
|
||||
<span style="color:red;">|</span> <span style="color:purple;">|</span> * 75e64da Update final/main4emaj.py [Atharv]
|
||||
<span style="color:red;">|</span> <span style="color:purple;">|</span> * 8ea7cd5 Update final/main4emaj.py [Atharv]
|
||||
* <span style="color:purple;">|</span> <span style="color:teal;">|</span> 5ba2811 Merge pull request 'Updated LICENSE and README' (#12) from dev into main [Atharv]
|
||||
<span style="font-weight:bold;color:red;">|</span><span style="color:purple;">\</span><span style="color:purple;">|</span> <span style="color:teal;">|</span>
|
||||
<span style="font-weight:bold;color:red;">|</span> * <span style="color:teal;">|</span> dd4fb8b Switched to GPLv3 [Atharv]
|
||||
<span style="font-weight:bold;color:red;">|</span> * <span style="color:teal;">|</span> ee099d9 Switched to GPL v3 [Atharv]
|
||||
<span style="font-weight:bold;color:red;">|</span> * <span style="color:teal;">|</span> 489add5 Removed emojis [Atharv]
|
||||
* <span style="font-weight:bold;color:green;">|</span> <span style="color:teal;">|</span> 387e00b Merge branch 'dev' [Coach]
|
||||
<span style="font-weight:bold;color:olive;">|</span><span style="font-weight:bold;color:green;">\</span><span style="font-weight:bold;color:green;">|</span> <span style="color:teal;">|</span>
|
||||
<span style="font-weight:bold;color:olive;">|</span> * <span style="color:teal;">|</span> 28e5bea Updated README file with some formatting help from AI [Coach]
|
||||
* <span style="font-weight:bold;color:blue;">|</span> <span style="color:teal;">|</span> 3fdd6ae Merge to main for Scrimmage [Coach]
|
||||
<span style="font-weight:bold;color:purple;">|</span><span style="font-weight:bold;color:blue;">\</span><span style="font-weight:bold;color:blue;">|</span> <span style="color:teal;">|</span>
|
||||
<span style="font-weight:bold;color:purple;">|</span> * <span style="color:teal;">|</span> 1e612e2 (tag: Scrimmage-Twist) Updated license information [Atharv]
|
||||
<span style="font-weight:bold;color:purple;">|</span> * <span style="color:teal;">|</span> 4456a5a Merge pull request 'Johannes_Dev' (#9) from Johannes_Dev into dev [Atharv]
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span><span style="color:green;">\</span> <span style="color:teal;">\</span>
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span> * <span style="color:teal;">|</span> 08e0b9a (origin/Johannes_Dev) Delete missions/Lift2.py [Atharv]
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span> * <span style="color:teal;">|</span> 4533f95 Add stuff from Johannes accidental fork [Atharv]
|
||||
<span style="font-weight:bold;color:purple;">|</span> * <span style="color:green;">|</span> <span style="color:teal;">|</span> ec74531 Merge pull request 'Vickram_dev_' (#8) from Vickram_dev_ into dev [Atharv]
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="color:olive;">|</span><span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span>
|
||||
<span style="font-weight:bold;color:purple;">|</span> * <span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span> 62b76d4 Merge pull request 'Add missions/tip the scale.py' (#4) from ayaan_dev into dev [Atharv]
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="color:purple;">|</span><span style="color:teal;">\</span> <span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span>
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="color:purple;">|</span> * <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span> 8008daf (origin/ayaan_dev) Add missions/tip the scale.py [Ayaan]
|
||||
<span style="font-weight:bold;color:purple;">|</span> * <span style="color:teal;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span> cba5cfc Merge pull request 'Update utils/combine_runs.py' (#5) from Vickram_dev_ into dev [Atharv]
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="font-weight:bold;color:red;">|</span><span style="font-weight:bold;color:green;">\</span> <span style="color:teal;">\</span> <span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span>
|
||||
<span style="font-weight:bold;color:purple;">|</span> * <span style="font-weight:bold;color:green;">\</span> <span style="color:teal;">\</span> <span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span> 3349e7f Merge pull request 'Rishi_dev' (#7) from Rishi_dev into dev [Atharv]
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="font-weight:bold;color:olive;">|</span><span style="font-weight:bold;color:blue;">\</span> <span style="font-weight:bold;color:green;">\</span> <span style="color:teal;">\</span> <span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span>
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="font-weight:bold;color:olive;">|</span> * <span style="font-weight:bold;color:green;">|</span> <span style="color:teal;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span> 4b765b0 (origin/Rishi_dev) Update missions/M8_5.py [Rishikesh Lolapu]
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="font-weight:bold;color:olive;">|</span> * <span style="font-weight:bold;color:green;">|</span> <span style="color:teal;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span> 2eca0d7 Initial commit [Rishikesh Lolapu]
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="font-weight:bold;color:olive;">|</span><span style="font-weight:bold;color:olive;">/</span> <span style="font-weight:bold;color:green;">/</span> <span style="color:teal;">/</span> <span style="color:blue;">/</span> <span style="color:green;">/</span> <span style="color:teal;">/</span>
|
||||
<span style="font-weight:bold;color:purple;">|</span> * <span style="font-weight:bold;color:green;">|</span> <span style="color:teal;">/</span> <span style="color:blue;">/</span> <span style="color:green;">/</span> <span style="color:teal;">/</span> 8949003 Mission 9 not in use [Atharv]
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span><span style="color:teal;">/</span> <span style="color:blue;">/</span> <span style="color:green;">/</span> <span style="color:teal;">/</span>
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="color:teal;">|</span><span style="color:teal;">/</span><span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span>
|
||||
<span style="font-weight:bold;color:purple;">|</span> * <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span> 6931731 Update LINEUPS.md [Atharv]
|
||||
<span style="font-weight:bold;color:purple;">|</span> * <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span> d172c70 THIS CODE IS OUTDATED!!! DO NOT USE!!! [Atharv]
|
||||
<span style="font-weight:bold;color:purple;">|</span> * <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span> efcc011 Initial Commit [Vickram]
|
||||
<span style="font-weight:bold;color:purple;">|</span> * <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span> <span style="color:teal;">|</span> 28bb3fa Merge pull request 'Pull from Vickram to dev' (#2) from Vickram_dev_ into dev [Atharv]
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="font-weight:bold;color:purple;">|</span><span style="font-weight:bold;color:teal;">\</span> <span style="font-weight:bold;color:green;">\</span> <span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span>
|
||||
<span style="font-weight:bold;color:purple;">|</span> * <span style="font-weight:bold;color:teal;">\</span> <span style="font-weight:bold;color:green;">\</span> <span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span> 7ba2453 Merge pull request 'Pull from Johannes_Dev to dev' (#3) from Johannes_Dev into dev [Atharv]
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span><span style="color:green;">\</span> <span style="font-weight:bold;color:teal;">\</span> <span style="font-weight:bold;color:green;">\</span> <span style="color:blue;">\</span> <span style="color:green;">\</span> <span style="color:teal;">\</span>
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span><span style="color:green;">_</span><span style="font-weight:bold;color:green;">|</span><span style="color:green;">_</span><span style="color:blue;">|</span><span style="color:green;">/</span> <span style="color:teal;">/</span>
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span><span style="color:green;">/</span><span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span>
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span> * <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> 7eeead7 Sand Mission [Johannes]
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span> * <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> e817650 Send Over [Johannes]
|
||||
<span style="font-weight:bold;color:purple;">|</span> <span style="color:red;">|</span> * <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> c4aa954 Boat mission [Johannes]
|
||||
* <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> ee0b8eb Update README.md [Atharv]
|
||||
* <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> a745ed8 Merge pull request 'WIP - Test Merge ( dev to main )' (#1) from dev into main [Coach]
|
||||
<span style="color:olive;">|</span><span style="color:blue;">\</span> <span style="color:red;">\</span> <span style="color:green;">\</span> <span style="font-weight:bold;color:teal;">\</span> <span style="font-weight:bold;color:green;">\</span> <span style="color:blue;">\</span> <span style="color:teal;">\</span>
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> * 7e2dc0b (origin/Vickram_dev_) Update final/main5.py [Rishikesh Lolapu]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> * 29bd9f0 Update final/main5.py [Rishikesh Lolapu]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> * a3b04d3 Add final/main5.py [Rishikesh Lolapu]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> * 2d9eb49 Update final/main4.py [Johannes]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> * 42090ea Update final/main4.py [Johannes]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span> * f7072a6 Update final/main4.py [Johannes]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> <span style="color:teal;">|</span><span style="color:teal;">/</span>
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> * 3f37e7e Update final/main4.py [Vickram]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> * a3e7be2 Update final/main4.py [Atharv]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> * c2204e7 Update final/main4.py [Vickram]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> * 0664a61 Add final/main4.py [Vickram]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> * 227619d Add final/3main.py [Vickram]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span> * 684447c Add final/2main.py [Vickram]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> <span style="color:blue;">|</span><span style="color:blue;">/</span>
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> * 95d7c0c Add final/1main.py [Vickram]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> * 7e0c3d2 Delete Final Combined Codes [Vickram]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> * f190d38 Add Final Combined Codes [Vickram]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> * cd21a73 Delete missions/main.py [Vickram]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span> * 0fa1019 Upload files to "missions" [Vickram]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> <span style="font-weight:bold;color:green;">|</span><span style="font-weight:bold;color:green;">/</span>
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span> * bb89e01 Update utils/combine_runs.py [Vickram]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> <span style="font-weight:bold;color:teal;">|</span><span style="font-weight:bold;color:teal;">/</span>
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span> * c690ae4 Update members/Vickram.txt [Vickram]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span> <span style="color:green;">|</span><span style="color:red;">/</span>
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:red;">|</span><span style="color:red;">/</span><span style="color:green;">|</span>
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:green;">|</span> d309b00 '{Johannes}' [Johannes]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:green;">|</span> 37fb0a6 Add members/Ayaan.txt [Ayaan]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:green;">|</span> e895fd1 Add members/Vickram.txt [Vickram]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * <span style="color:green;">|</span> 70e09fb Add members/Carlos.txt [Carlos]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> <span style="color:green;">|</span><span style="color:green;">/</span>
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * d017d13 Update members/atharv.txt [Atharv]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * 6199a9c Atharv - added my About Me [Atharv]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * 72547c5 Fixed grammar [Atharv]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * 5d57a3a Initial commit [Atharv]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * 5c7e2e9 Uploaded files from Bitbucket [Atharv]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * e36e3d0 Delete Send_Over.py [Atharv]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * a35d599 Delete M8_5.py [Atharv]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * 6dedb0a Uploaded files from Bitbucket [Atharv]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * be5350d Update README.md [Atharv]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * 2412f2c Uploaded files from Bitbucket [Atharv]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * 125f1df Uploaded files from Bitbucket [Atharv]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * 3ddaf7e Uploaded files from Bitbucket [Atharv]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * 2629845 Test new [Atharv]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span> * fdbc180 Test [Atharv]
|
||||
<span style="color:olive;">|</span> <span style="color:blue;">|</span><span style="color:blue;">/</span>
|
||||
<span style="color:olive;">|</span> * ce4f984 Created new branch [Coach]
|
||||
<span style="color:olive;">|</span> * 7a0d651 Test commit [Coach]
|
||||
<span style="color:olive;">|</span><span style="color:olive;">/</span>
|
||||
* 0d0e977 Initial commit [Coach]</pre>
|
||||
</body>
|
||||
</html>
|
||||
112
graph.txt
Normal file
112
graph.txt
Normal file
@@ -0,0 +1,112 @@
|
||||
* d3294bc SCRIMMAGE MERGE!!!
|
||||
|\
|
||||
| * d66aecd Update README.md
|
||||
| * bbdf0d0 Shortened fun sounds
|
||||
| * a2ed2c4 Merge pull request 'arcmyx-dev' (#14) from arcmyx-dev into dev
|
||||
| |\
|
||||
| | * dd0070d Update twist_scrimmage.py
|
||||
| | * 9a06677 Added comments. Good luck for scrimmage y'all!!!
|
||||
| | * 11e89c6 THE FINAL THINGY
|
||||
| * | 52214be Update final/4main.py
|
||||
| * | 4540269 Update final/4main.py
|
||||
| * | 785c955 Update final/4main.py
|
||||
| * | b6cffc6 Update final/4main
|
||||
| * | 870dce3 Merge pull request 'arcmyx-dev' (#13) from arcmyx-dev into dev
|
||||
| |\|
|
||||
| | * bb76258 Update final/main4emaj.py
|
||||
| | * 75e64da Update final/main4emaj.py
|
||||
| | * 8ea7cd5 Update final/main4emaj.py
|
||||
* | | 5ba2811 Merge pull request 'Updated LICENSE and README' (#12) from dev into main
|
||||
|\| |
|
||||
| * | dd4fb8b Switched to GPLv3
|
||||
| * | ee099d9 Switched to GPL v3
|
||||
| * | 489add5 Removed emojis
|
||||
* | | 387e00b Merge branch 'dev'
|
||||
|\| |
|
||||
| * | 28e5bea Updated README file with some formatting help from AI
|
||||
* | | 3fdd6ae Merge to main for Scrimmage
|
||||
|\| |
|
||||
| * | 1e612e2 Updated license information
|
||||
| * | 4456a5a Merge pull request 'Johannes_Dev' (#9) from Johannes_Dev into dev
|
||||
| |\ \
|
||||
| | * | 08e0b9a Delete missions/Lift2.py
|
||||
| | * | 4533f95 Add stuff from Johannes accidental fork
|
||||
| * | | ec74531 Merge pull request 'Vickram_dev_' (#8) from Vickram_dev_ into dev
|
||||
| |\ \ \
|
||||
| * \ \ \ 62b76d4 Merge pull request 'Add missions/tip the scale.py' (#4) from ayaan_dev into dev
|
||||
| |\ \ \ \
|
||||
| | * | | | 8008daf Add missions/tip the scale.py
|
||||
| * | | | | cba5cfc Merge pull request 'Update utils/combine_runs.py' (#5) from Vickram_dev_ into dev
|
||||
| |\ \ \ \ \
|
||||
| * \ \ \ \ \ 3349e7f Merge pull request 'Rishi_dev' (#7) from Rishi_dev into dev
|
||||
| |\ \ \ \ \ \
|
||||
| | * | | | | | 4b765b0 Update missions/M8_5.py
|
||||
| | * | | | | | 2eca0d7 Initial commit
|
||||
| |/ / / / / /
|
||||
| * | / / / / 8949003 Mission 9 not in use
|
||||
| | |/ / / /
|
||||
| |/| | | |
|
||||
| * | | | | 6931731 Update LINEUPS.md
|
||||
| * | | | | d172c70 THIS CODE IS OUTDATED!!! DO NOT USE!!!
|
||||
| * | | | | efcc011 Initial Commit
|
||||
| * | | | | 28bb3fa Merge pull request 'Pull from Vickram to dev' (#2) from Vickram_dev_ into dev
|
||||
| |\ \ \ \ \
|
||||
| * \ \ \ \ \ 7ba2453 Merge pull request 'Pull from Johannes_Dev to dev' (#3) from Johannes_Dev into dev
|
||||
| |\ \ \ \ \ \
|
||||
| | | |_|_|/ /
|
||||
| | |/| | | |
|
||||
| | * | | | | 7eeead7 Sand Mission
|
||||
| | * | | | | e817650 Send Over
|
||||
| | * | | | | c4aa954 Boat mission
|
||||
* | | | | | | ee0b8eb Update README.md
|
||||
* | | | | | | a745ed8 Merge pull request 'WIP - Test Merge ( dev to main )' (#1) from dev into main
|
||||
|\ \ \ \ \ \ \
|
||||
| | | | | | | | * 7e2dc0b Update final/main5.py
|
||||
| | | | | | | | * 29bd9f0 Update final/main5.py
|
||||
| | | | | | | | * a3b04d3 Add final/main5.py
|
||||
| | | | | | | | * 2d9eb49 Update final/main4.py
|
||||
| | | | | | | | * 42090ea Update final/main4.py
|
||||
| | | | | | | | * f7072a6 Update final/main4.py
|
||||
| | | | | | | |/
|
||||
| | | | | | | * 3f37e7e Update final/main4.py
|
||||
| | | | | | | * a3e7be2 Update final/main4.py
|
||||
| | | | | | | * c2204e7 Update final/main4.py
|
||||
| | | | | | | * 0664a61 Add final/main4.py
|
||||
| | | | | | | * 227619d Add final/3main.py
|
||||
| | | | | | | * 684447c Add final/2main.py
|
||||
| | | | | | |/
|
||||
| | | | | | * 95d7c0c Add final/1main.py
|
||||
| | | | | | * 7e0c3d2 Delete Final Combined Codes
|
||||
| | | | | | * f190d38 Add Final Combined Codes
|
||||
| | | | | | * cd21a73 Delete missions/main.py
|
||||
| | | | | | * 0fa1019 Upload files to "missions"
|
||||
| | | | | |/
|
||||
| | | | | * bb89e01 Update utils/combine_runs.py
|
||||
| | | | |/
|
||||
| | | | * c690ae4 Update members/Vickram.txt
|
||||
| | | |/
|
||||
| | |/|
|
||||
| | * | d309b00 '{Johannes}'
|
||||
| | * | 37fb0a6 Add members/Ayaan.txt
|
||||
| | * | e895fd1 Add members/Vickram.txt
|
||||
| | * | 70e09fb Add members/Carlos.txt
|
||||
| | |/
|
||||
| | * d017d13 Update members/atharv.txt
|
||||
| | * 6199a9c Atharv - added my About Me
|
||||
| | * 72547c5 Fixed grammar
|
||||
| | * 5d57a3a Initial commit
|
||||
| | * 5c7e2e9 Uploaded files from Bitbucket
|
||||
| | * e36e3d0 Delete Send_Over.py
|
||||
| | * a35d599 Delete M8_5.py
|
||||
| | * 6dedb0a Uploaded files from Bitbucket
|
||||
| | * be5350d Update README.md
|
||||
| | * 2412f2c Uploaded files from Bitbucket
|
||||
| | * 125f1df Uploaded files from Bitbucket
|
||||
| | * 3ddaf7e Uploaded files from Bitbucket
|
||||
| | * 2629845 Test new
|
||||
| | * fdbc180 Test
|
||||
| |/
|
||||
| * ce4f984 Created new branch
|
||||
| * 7a0d651 Test commit
|
||||
|/
|
||||
* 0d0e977 Initial commit
|
||||
@@ -2,26 +2,36 @@ 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
|
||||
from pybricks.tools import wait, StopWatch, run_task, multitask
|
||||
|
||||
hub = PrimeHub()
|
||||
|
||||
# Initialize both motors. In this example, the motor on the
|
||||
# left must turn counterclockwise to make the robot go forward.
|
||||
left_motor = Motor(Port.A, Direction.COUNTERCLOCKWISE)
|
||||
right_motor = Motor(Port.B)
|
||||
left_arm = Motor(Port.C, Direction.COUNTERCLOCKWISE)
|
||||
right_arm = Motor(Port.D)
|
||||
|
||||
arm_motor = Motor(Port.D, Direction.CLOCKWISE)
|
||||
arm_motor_left= Motor(Port.C, Direction.CLOCKWISE)
|
||||
# Initialize the drive base. In this example, the wheel diameter is 56mm.
|
||||
# The distance between the two wheel-ground contact points is 112mm.
|
||||
drive_base = DriveBase(left_motor, right_motor, wheel_diameter=68.8, axle_track=180)
|
||||
|
||||
drive_base.settings(550,700,100,100)
|
||||
|
||||
print('The default settings are: ' + str(drive_base.settings()))
|
||||
drive_base.settings(300,1000,300,750)
|
||||
# Optionally, uncomment the line below to use the gyro for improved accuracy.
|
||||
drive_base.use_gyro(True)
|
||||
|
||||
first_run = False
|
||||
|
||||
async def main():
|
||||
await drive_base.straight(750)
|
||||
await drive_base.straight(-650)
|
||||
|
||||
await drive_base.straight(700)
|
||||
await drive_base.turn(-17)
|
||||
await drive_base.straight(100)
|
||||
await drive_base.straight(-205)
|
||||
await drive_base.turn(62)
|
||||
await drive_base.straight(125)
|
||||
await arm_motor.run_angle(1000, -1200)
|
||||
await drive_base.straight(87)
|
||||
await arm_motor.run_angle(300, 1200)
|
||||
await drive_base.straight(-875)
|
||||
|
||||
run_task(main())
|
||||
@@ -1,27 +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(880,850,700,700)
|
||||
|
||||
drive_base.use_gyro(True)
|
||||
|
||||
first_run = True
|
||||
|
||||
async def main():
|
||||
await drive_base.straight(750)
|
||||
await drive_base.straight(-650)
|
||||
|
||||
run_task(main())
|
||||
@@ -1,37 +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 right_arm.run_angle(2000,1000)
|
||||
|
||||
await drive_base.straight(200)
|
||||
await drive_base.turn(-20)
|
||||
await drive_base.straight(525)
|
||||
await drive_base.turn(60)
|
||||
await drive_base.straight(30)
|
||||
|
||||
await right_arm.run_angle(2000,-1000)
|
||||
await drive_base.straight(30)
|
||||
await right_arm.run_angle(3000,1000)
|
||||
await drive_base.straight(-60)
|
||||
|
||||
await drive_base.turn(-60)
|
||||
await drive_base.straight(-525)
|
||||
await drive_base.turn(20)
|
||||
await drive_base.straight(-200)
|
||||
|
||||
@@ -1,36 +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():
|
||||
#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)
|
||||
run_task(main())
|
||||
@@ -2,7 +2,7 @@ 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, run_task
|
||||
from pybricks.tools import wait, StopWatch, run_task, multitask
|
||||
|
||||
hub = PrimeHub()
|
||||
|
||||
@@ -23,23 +23,15 @@ drive_base.settings(300,1000,300,750)
|
||||
drive_base.use_gyro(True)
|
||||
|
||||
async def main():
|
||||
await drive_base.straight(519)
|
||||
await arm_motor_left.run_angle(300, -100)
|
||||
await arm_motor_left.run_angle(300, 500)
|
||||
await drive_base.straight(180)
|
||||
await drive_base.turn(-37)
|
||||
await drive_base.straight(50)
|
||||
await arm_motor.run_angle(300, -400)
|
||||
await drive_base.straight(-150)
|
||||
await drive_base.turn(135)
|
||||
await drive_base.straight(50)
|
||||
await arm_motor.run_angle(300, 400)
|
||||
await drive_base.straight(-75)
|
||||
await arm_motor.run_angle(300, 300)
|
||||
await drive_base.turn(-50)
|
||||
await drive_base.straight(162)
|
||||
await arm_motor.run_angle(100, -200)
|
||||
await drive_base.straight(30)
|
||||
await arm_motor.run_angle(50,-500)
|
||||
await drive_base.straight(700)
|
||||
await drive_base.turn(-17)
|
||||
await drive_base.straight(100)
|
||||
await drive_base.straight(-205)
|
||||
await drive_base.turn(62)
|
||||
await drive_base.straight(125)
|
||||
await arm_motor.run_angle(1000, -1200)
|
||||
await drive_base.straight(87)
|
||||
await arm_motor.run_angle(300, 1200)
|
||||
await drive_base.straight(-875)
|
||||
|
||||
run_task(main())
|
||||
@@ -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())
|
||||
@@ -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())
|
||||
@@ -19,31 +19,47 @@ drive_base.settings(600,500,300,200)
|
||||
drive_base.use_gyro(True)
|
||||
|
||||
async def main():
|
||||
left_arm.run_angle(1000, 300)
|
||||
right_arm.run_angle(1000,500)
|
||||
await drive_base.straight(320)
|
||||
|
||||
right_arm.run_angle(1000,450)
|
||||
left_arm.run_angle(500,-90)
|
||||
await drive_base.straight(200)
|
||||
|
||||
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(-40)
|
||||
await drive_base.straight(325)
|
||||
await left_arm.run_angle(500,90)
|
||||
|
||||
await drive_base.straight(-100)
|
||||
await drive_base.straight(50)
|
||||
await left_arm.run_angle(500,-180)
|
||||
|
||||
await drive_base.straight(-90)
|
||||
left_arm.run_angle(500,180)
|
||||
await drive_base.turn(-20)
|
||||
await drive_base.straight(277)
|
||||
await drive_base.turn(20)
|
||||
await drive_base.straight(65)
|
||||
await drive_base.turn(15)
|
||||
|
||||
await drive_base.turn(-30)
|
||||
right_arm.run_angle(50,500)
|
||||
await drive_base.straight(-173)
|
||||
await drive_base.turn(45)
|
||||
await drive_base.straight(-145)
|
||||
await drive_base.turn(-60)
|
||||
await drive_base.straight(90)
|
||||
await left_arm.run_angle(1000,-450)
|
||||
await drive_base.straight(-145)
|
||||
await left_arm.run_angle(1000,450)
|
||||
await drive_base.straight(10)
|
||||
await drive_base.turn(35)
|
||||
await drive_base.straight(-600)
|
||||
await drive_base.straight(120)
|
||||
left_arm.run_angle(1000,-670)
|
||||
|
||||
await right_arm.run_angle(5000,-450, Stop.HOLD)
|
||||
await right_arm.run_angle(5000,450, Stop.HOLD)
|
||||
await right_arm.run_angle(5000,-450, Stop.HOLD)
|
||||
await right_arm.run_angle(5000,450, Stop.HOLD)
|
||||
await right_arm.run_angle(5000,-450, Stop.HOLD)
|
||||
right_arm.run_angle(5000,450, Stop.HOLD)
|
||||
|
||||
await drive_base.turn(-35)
|
||||
await drive_base.straight(297)
|
||||
await drive_base.turn(63)
|
||||
await drive_base.straight(170)
|
||||
|
||||
await drive_base.turn(-80)
|
||||
await drive_base.straight(87)
|
||||
await drive_base.turn(-15)
|
||||
|
||||
await drive_base.straight(-90)
|
||||
await drive_base.turn(-100)
|
||||
await drive_base.arc(-500,None,600)
|
||||
|
||||
run_task(main())
|
||||
@@ -37,14 +37,6 @@ async def main():
|
||||
await drive_base.straight(-100)
|
||||
await drive_base.turn(-54)
|
||||
await arm_motor.run_angle(10000, -3000)
|
||||
await drive_base.straight(250)
|
||||
await drive_base.turn(-5)
|
||||
await arm_motor.run_angle(10000, 7000)
|
||||
await drive_base.straight(-50)
|
||||
await drive_base.turn(68)
|
||||
await arm_motor.run_angle(10000, -6000)
|
||||
await drive_base.straight(200)
|
||||
await arm_motor.run_angle(10000, 4000)
|
||||
await drive_base.turn(-40)
|
||||
await arm_motor.run_angle(10000, 7000)
|
||||
await arm_motor.run_angle(10000, 10000)
|
||||
run_task(main())
|
||||
@@ -1,29 +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(400,500,100,100)
|
||||
|
||||
drive_base.use_gyro(True)
|
||||
|
||||
|
||||
async def main():
|
||||
await drive_base.straight(500)
|
||||
await right_arm.run_angle(300,100)
|
||||
await drive_base.straight(-100)
|
||||
await right_arm.run_angle(300,-100)
|
||||
await drive_base.straight(-350)
|
||||
|
||||
run_task(main())
|
||||
@@ -19,28 +19,41 @@ drive_base = DriveBase(left_motor, right_motor, wheel_diameter=68.8, axle_track=
|
||||
drive_base.settings(600,500,300,200)
|
||||
drive_base.use_gyro(True)
|
||||
|
||||
WALL_DISTANCE = 200 # mm
|
||||
|
||||
async def drive_forward():
|
||||
"""Drive forward continuously using DriveBase."""
|
||||
drive_base.drive(400, 0)
|
||||
|
||||
|
||||
async def monitor_distance():
|
||||
"""Monitor ultrasonic sensor and stop when wall is detected."""
|
||||
while True:
|
||||
distance = await lazer_ranger.distance()
|
||||
print('Distancing...',distance)
|
||||
|
||||
if distance < WALL_DISTANCE:
|
||||
# Stop the drivebase
|
||||
await drive_base.stop
|
||||
print(f"Wall detected at {distance}mm!")
|
||||
break
|
||||
|
||||
# Small delay to prevent overwhelming the sensor
|
||||
await wait(50)
|
||||
|
||||
async def main():
|
||||
#Get to mission
|
||||
await drive_base.straight(920)
|
||||
await drive_base.straight(-920)
|
||||
await drive_base.turn(-90,Stop.HOLD)
|
||||
await drive_base.straight(65)
|
||||
#Solve mission
|
||||
#Solve
|
||||
drive_base.turn(-10)
|
||||
await left_arm.run_angle(10000,-4000)
|
||||
#Get to Red Start
|
||||
await drive_base.straight(-110)
|
||||
await drive_base.turn(90)
|
||||
await drive_base.straight(500)
|
||||
while True:
|
||||
distance_mm = await lazer_ranger.distance()
|
||||
print('distancing...',distance_mm)
|
||||
|
||||
if distance_mm < 300:
|
||||
drive_base.stop
|
||||
break
|
||||
else:
|
||||
drive_base.straight(300)
|
||||
print('running...')
|
||||
await wait(10)
|
||||
|
||||
await multitask(
|
||||
drive_forward(),
|
||||
monitor_distance()
|
||||
)
|
||||
|
||||
run_task(main())
|
||||
@@ -1,44 +0,0 @@
|
||||
# ---JOHANNES---
|
||||
# THIS CODE IS NOT USED ANYMORE AND SHOULD NOT BE USED!!!!!!
|
||||
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
|
||||
|
||||
hub = PrimeHub()
|
||||
|
||||
# Initialize both motors. In this example, the motor on the
|
||||
# left must turn counterclockwise to make the robot go forward.
|
||||
left_motor = Motor(Port.A, Direction.COUNTERCLOCKWISE)
|
||||
right_motor = Motor(Port.B)
|
||||
|
||||
arm_motor = Motor(Port.E, Direction.CLOCKWISE)
|
||||
arm_motor.run_angle(299,90, Stop.HOLD)
|
||||
# Initialize the drive base. In this example, the wheel diameter is 56mm.
|
||||
# The distance between the two wheel-ground contact points is 112mm.
|
||||
drive_base = DriveBase(left_motor, right_motor, wheel_diameter=54, axle_track=140)
|
||||
|
||||
print('The default settings are: ' + str(drive_base.settings()))
|
||||
drive_base.settings(100,1000,166,750)
|
||||
# Optionally, uncomment the line below to use the gyro for improved accuracy.
|
||||
drive_base.use_gyro(True)
|
||||
|
||||
async def solveM9():
|
||||
print("Solving Mission 9")
|
||||
await drive_base.turn(45)
|
||||
await drive_base.straight(260)
|
||||
await arm_motor.run_angle(500,-500, Stop.HOLD)
|
||||
await drive_base.straight(-40)
|
||||
await drive_base.turn(92)
|
||||
await drive_base.straight(-120)
|
||||
await drive_base.straight(220)
|
||||
await arm_motor.run_angle(500,100, Stop.HOLD)
|
||||
await drive_base.turn(-50)
|
||||
await drive_base.straight(-600)
|
||||
async def main():
|
||||
await drive_base.straight(50)
|
||||
print("Hello, Robot is starting to run.")
|
||||
await solveM9()
|
||||
|
||||
run_task(main())
|
||||
@@ -26,13 +26,13 @@ async def main():
|
||||
|
||||
await drive_base.turn(-70)
|
||||
await drive_base.straight(900)
|
||||
await drive_base.turn(115)
|
||||
await drive_base.turn(110)
|
||||
|
||||
await drive_base.straight(75)
|
||||
await drive_base.straight(33)
|
||||
await right_arm.run_angle(500,-250)
|
||||
|
||||
await right_arm.run_angle(700,-250)
|
||||
await right_arm.run_angle(500,250)
|
||||
await drive_base.turn(66)
|
||||
await drive_base.turn(54)
|
||||
await drive_base.straight(7)
|
||||
|
||||
await left_arm.run_angle(560,-390) #going down
|
||||
@@ -41,8 +41,8 @@ async def main():
|
||||
await left_arm.run_angle(-410,-400) #lift a little bit
|
||||
|
||||
await drive_base.turn(-46.5) #ma din din din dun
|
||||
await drive_base.turn(-40)
|
||||
await drive_base.turn(25)
|
||||
await drive_base.straight(900)
|
||||
|
||||
run_task(main())
|
||||
|
||||
|
||||
|
||||
@@ -1,31 +1,29 @@
|
||||
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
|
||||
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)
|
||||
|
||||
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)
|
||||
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
|
||||
|
||||
await drive_base.straight(915)
|
||||
await drive_base.turn(-90)
|
||||
await drive_base.straight(60)
|
||||
await left_arm.run_angle(10000,-4000)
|
||||
await drive_base.straight(-90)
|
||||
await drive_base.turn(80)
|
||||
await drive_base.straight(2000)
|
||||
|
||||
run_task(main())
|
||||
run_task(main())
|
||||
69
utils/tests/colorsensortest.py
Normal file
69
utils/tests/colorsensortest.py
Normal file
@@ -0,0 +1,69 @@
|
||||
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()
|
||||
|
||||
color_sensor = ColorSensor(Port.F)
|
||||
|
||||
# Color Settings
|
||||
# https://docs.pybricks.com/en/latest/parameters/color.html
|
||||
print("Default Detected Colors:", color_sensor.detectable_colors())
|
||||
|
||||
# Custom color Hue, Saturation, Brightness value for Lego bricks
|
||||
Color.MAGENTA = Color(315,100,60)
|
||||
Color.BLUE = Color(240,100,100)
|
||||
Color.CYAN = Color(180,100,100)
|
||||
Color.RED = Color(350, 100, 100)
|
||||
LEGO_BRICKS_COLOR = [
|
||||
Color.BLUE,
|
||||
Color.GREEN,
|
||||
Color.WHITE,
|
||||
Color.RED,
|
||||
Color.YELLOW,
|
||||
Color.MAGENTA,
|
||||
Color.NONE
|
||||
]
|
||||
magenta_counter = 0
|
||||
stable_color = None
|
||||
real_color = None
|
||||
#Update Detectable colors
|
||||
color_sensor.detectable_colors(LEGO_BRICKS_COLOR)
|
||||
print(f'Yellow:{Color.YELLOW} : {Color.YELLOW.h}, {Color.YELLOW.s}, {Color.YELLOW.v}')
|
||||
print("Updated Detected Colors:", color_sensor.detectable_colors())
|
||||
async def main():
|
||||
while True:
|
||||
global magenta_counter, stable_color, real_color
|
||||
color_reflected_percent = await color_sensor.reflection()
|
||||
print("Reflection: ", color_reflected_percent)
|
||||
if color_reflected_percent > 15:
|
||||
color_detected = await color_sensor.color()
|
||||
|
||||
if color_detected == Color.MAGENTA:
|
||||
magenta_counter += 1
|
||||
else:
|
||||
magenta_counter = 0
|
||||
stable_color = color_detected
|
||||
|
||||
# Only accept magenta if it's been stable for a while - usually triggers before other colors so we gotta do this :|
|
||||
if magenta_counter > 10:
|
||||
stable_color = Color.MAGENTA
|
||||
if stable_color != Color.MAGENTA:
|
||||
stable_color = await color_sensor.color()
|
||||
|
||||
real_color = stable_color
|
||||
#if(color_detected != Color.NONE):
|
||||
# return
|
||||
|
||||
print("Magenta counter: ", magenta_counter)
|
||||
if real_color is not None:
|
||||
print(f'Detected color: {real_color} : {real_color.h}, {real_color.s}, {real_color.v}')
|
||||
else:
|
||||
print("No valid color detected yet.")
|
||||
await wait(50)
|
||||
|
||||
run_task(main())
|
||||
Reference in New Issue
Block a user