diff --git a/commit-graph.html b/commit-graph.html new file mode 100644 index 0000000..4770fe1 --- /dev/null +++ b/commit-graph.html @@ -0,0 +1,132 @@ + + + + +
+ ++* d3294bc (HEAD -> main, tag: TwistScrimmageRelease, origin/main) SCRIMMAGE MERGE!!! +|\ +| * d66aecd (origin/dev, origin/HEAD, dev) Update README.md +| * bbdf0d0 Shortened fun sounds +| * a2ed2c4 Merge pull request 'arcmyx-dev' (#14) from arcmyx-dev into dev +| |\ +| | * dd0070d (origin/arcmyx-dev) 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 (tag: Scrimmage-Twist) Updated license information +| * | 4456a5a Merge pull request 'Johannes_Dev' (#9) from Johannes_Dev into dev +| |\ \ +| | * | 08e0b9a (origin/Johannes_Dev) 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 (origin/ayaan_dev) 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 (origin/Rishi_dev) 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 (origin/Vickram_dev_) 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 ++ + diff --git a/commit-graphnew.html b/commit-graphnew.html new file mode 100644 index 0000000..ee955e9 --- /dev/null +++ b/commit-graphnew.html @@ -0,0 +1,136 @@ + + + + + + +
+* d3294bc (HEAD -> main, tag: TwistScrimmageRelease, origin/main) SCRIMMAGE MERGE!!! [Atharv] +|\ +| * d66aecd (origin/dev, origin/HEAD, dev) Update README.md [Atharv] +| * bbdf0d0 Shortened fun sounds [Atharv] +| * a2ed2c4 Merge pull request 'atharv-dev' (#14) from atharv-dev into dev [Atharv] +| |\ +| | * dd0070d (origin/atharv-dev) Update twist_scrimmage.py [Atharv] +| | * 9a06677 Added comments. Good luck for scrimmage y'all!!! [Atharv] +| | * 11e89c6 THE FINAL THINGY [Atharv] +| * | 52214be Update final/4main.py [Ayaan] +| * | 4540269 Update final/4main.py [Johannes] +| * | 785c955 Update final/4main.py [Atharv] +| * | b6cffc6 Update final/4main [Atharv] +| * | 870dce3 Merge pull request 'atharv-dev' (#13) from atharv-dev into dev [Atharv] +| |\| +| | * bb76258 Update final/main4emaj.py [Atharv] +| | * 75e64da Update final/main4emaj.py [Atharv] +| | * 8ea7cd5 Update final/main4emaj.py [Atharv] +* | | 5ba2811 Merge pull request 'Updated LICENSE and README' (#12) from dev into main [Atharv] +|\| | +| * | dd4fb8b Switched to GPLv3 [Atharv] +| * | ee099d9 Switched to GPL v3 [Atharv] +| * | 489add5 Removed emojis [Atharv] +* | | 387e00b Merge branch 'dev' [Coach] +|\| | +| * | 28e5bea Updated README file with some formatting help from AI [Coach] +* | | 3fdd6ae Merge to main for Scrimmage [Coach] +|\| | +| * | 1e612e2 (tag: Scrimmage-Twist) Updated license information [Atharv] +| * | 4456a5a Merge pull request 'Johannes_Dev' (#9) from Johannes_Dev into dev [Atharv] +| |\ \ +| | * | 08e0b9a (origin/Johannes_Dev) Delete missions/Lift2.py [Atharv] +| | * | 4533f95 Add stuff from Johannes accidental fork [Atharv] +| * | | ec74531 Merge pull request 'Vickram_dev_' (#8) from Vickram_dev_ into dev [Atharv] +| |\ \ \ +| * \ \ \ 62b76d4 Merge pull request 'Add missions/tip the scale.py' (#4) from ayaan_dev into dev [Atharv] +| |\ \ \ \ +| | * | | | 8008daf (origin/ayaan_dev) Add missions/tip the scale.py [Ayaan] +| * | | | | cba5cfc Merge pull request 'Update utils/combine_runs.py' (#5) from Vickram_dev_ into dev [Atharv] +| |\ \ \ \ \ +| * \ \ \ \ \ 3349e7f Merge pull request 'Rishi_dev' (#7) from Rishi_dev into dev [Atharv] +| |\ \ \ \ \ \ +| | * | | | | | 4b765b0 (origin/Rishi_dev) Update missions/M8_5.py [Rishikesh Lolapu] +| | * | | | | | 2eca0d7 Initial commit [Rishikesh Lolapu] +| |/ / / / / / +| * | / / / / 8949003 Mission 9 not in use [Atharv] +| | |/ / / / +| |/| | | | +| * | | | | 6931731 Update LINEUPS.md [Atharv] +| * | | | | d172c70 THIS CODE IS OUTDATED!!! DO NOT USE!!! [Atharv] +| * | | | | efcc011 Initial Commit [Vickram] +| * | | | | 28bb3fa Merge pull request 'Pull from Vickram to dev' (#2) from Vickram_dev_ into dev [Atharv] +| |\ \ \ \ \ +| * \ \ \ \ \ 7ba2453 Merge pull request 'Pull from Johannes_Dev to dev' (#3) from Johannes_Dev into dev [Atharv] +| |\ \ \ \ \ \ +| | | |_|_|/ / +| | |/| | | | +| | * | | | | 7eeead7 Sand Mission [Johannes] +| | * | | | | e817650 Send Over [Johannes] +| | * | | | | c4aa954 Boat mission [Johannes] +* | | | | | | ee0b8eb Update README.md [Atharv] +* | | | | | | a745ed8 Merge pull request 'WIP - Test Merge ( dev to main )' (#1) from dev into main [Coach] +|\ \ \ \ \ \ \ +| | | | | | | | * 7e2dc0b (origin/Vickram_dev_) Update final/main5.py [Rishikesh Lolapu] +| | | | | | | | * 29bd9f0 Update final/main5.py [Rishikesh Lolapu] +| | | | | | | | * a3b04d3 Add final/main5.py [Rishikesh Lolapu] +| | | | | | | | * 2d9eb49 Update final/main4.py [Johannes] +| | | | | | | | * 42090ea Update final/main4.py [Johannes] +| | | | | | | | * f7072a6 Update final/main4.py [Johannes] +| | | | | | | |/ +| | | | | | | * 3f37e7e Update final/main4.py [Vickram] +| | | | | | | * a3e7be2 Update final/main4.py [Atharv] +| | | | | | | * c2204e7 Update final/main4.py [Vickram] +| | | | | | | * 0664a61 Add final/main4.py [Vickram] +| | | | | | | * 227619d Add final/3main.py [Vickram] +| | | | | | | * 684447c Add final/2main.py [Vickram] +| | | | | | |/ +| | | | | | * 95d7c0c Add final/1main.py [Vickram] +| | | | | | * 7e0c3d2 Delete Final Combined Codes [Vickram] +| | | | | | * f190d38 Add Final Combined Codes [Vickram] +| | | | | | * cd21a73 Delete missions/main.py [Vickram] +| | | | | | * 0fa1019 Upload files to "missions" [Vickram] +| | | | | |/ +| | | | | * bb89e01 Update utils/combine_runs.py [Vickram] +| | | | |/ +| | | | * c690ae4 Update members/Vickram.txt [Vickram] +| | | |/ +| | |/| +| | * | d309b00 '{Johannes}' [Johannes] +| | * | 37fb0a6 Add members/Ayaan.txt [Ayaan] +| | * | e895fd1 Add members/Vickram.txt [Vickram] +| | * | 70e09fb Add members/Carlos.txt [Carlos] +| | |/ +| | * d017d13 Update members/atharv.txt [Atharv] +| | * 6199a9c Atharv - added my About Me [Atharv] +| | * 72547c5 Fixed grammar [Atharv] +| | * 5d57a3a Initial commit [Atharv] +| | * 5c7e2e9 Uploaded files from Bitbucket [Atharv] +| | * e36e3d0 Delete Send_Over.py [Atharv] +| | * a35d599 Delete M8_5.py [Atharv] +| | * 6dedb0a Uploaded files from Bitbucket [Atharv] +| | * be5350d Update README.md [Atharv] +| | * 2412f2c Uploaded files from Bitbucket [Atharv] +| | * 125f1df Uploaded files from Bitbucket [Atharv] +| | * 3ddaf7e Uploaded files from Bitbucket [Atharv] +| | * 2629845 Test new [Atharv] +| | * fdbc180 Test [Atharv] +| |/ +| * ce4f984 Created new branch [Coach] +| * 7a0d651 Test commit [Coach] +|/ +* 0d0e977 Initial commit [Coach]+ + diff --git a/graph.txt b/graph.txt new file mode 100644 index 0000000..16e345d --- /dev/null +++ b/graph.txt @@ -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 diff --git a/missions/M8_5.py b/missions/M8_5.py index c91d27a..7b81ba5 100644 --- a/missions/M8_5.py +++ b/missions/M8_5.py @@ -21,20 +21,25 @@ drive_base.use_gyro(True) async def main(): right_arm.run_angle(1000,450) - left_arm.run_angle(500,-80) + left_arm.run_angle(500,-90) await drive_base.straight(200) await drive_base.turn(-40) await drive_base.straight(325) - await left_arm.run_angle(500,80) + await left_arm.run_angle(500,90) await drive_base.straight(-100) await drive_base.straight(50) - await left_arm.run_angle(500,-170) + await left_arm.run_angle(500,-180) - await drive_base.straight(-270) - await drive_base.turn(40) - await drive_base.straight(135) + await drive_base.straight(-90) + left_arm.run_angle(500,180) + await drive_base.turn(-20) + await drive_base.turn(15) + + await drive_base.straight(-173) + await drive_base.turn(45) + await drive_base.straight(120) left_arm.run_angle(1000,-670) await right_arm.run_angle(5000,-450, Stop.HOLD) @@ -45,7 +50,7 @@ async def main(): right_arm.run_angle(5000,450, Stop.HOLD) await drive_base.turn(-35) - await drive_base.straight(300) + await drive_base.straight(297) await drive_base.turn(63) await drive_base.straight(170) @@ -53,10 +58,8 @@ async def main(): await drive_base.straight(87) await drive_base.turn(-15) - await drive_base.straight(-120) + await drive_base.straight(-90) await drive_base.turn(-100) - await drive_base.straight(300) - await drive_base.turn(-45) - await drive_base.straight(500) + await drive_base.arc(-500,None,600) run_task(main()) \ No newline at end of file