dev #33

Merged
Atharv merged 146 commits from dev into Johannes_Dev 2025-10-31 11:57:10 +00:00

146 Commits

Author SHA1 Message Date
e785a8ad05 Delete HEAVY_LIFTING_UPD
we dont need it it is alr in missions/
2025-10-30 15:42:53 +00:00
a6bbba9419 Update README.md 2025-10-30 15:42:31 +00:00
8ccf8b9a5a Update README.md 2025-10-30 12:21:46 +00:00
bb95852bf1 Update README.md 2025-10-28 18:22:25 +00:00
9ca160a8c7 Update README.md 2025-10-28 18:11:19 +00:00
882ba3e13a Delete Screenshot 2025-10-28 1.06.30 PM.png 2025-10-28 18:07:08 +00:00
33b926cb1f Upload files to "/" 2025-10-28 18:06:44 +00:00
4ff5de480d Update README.md 2025-10-28 18:06:09 +00:00
aa062122de Merge pull request 'main' (#29) from main into dev
Reviewed-on: #29
2025-10-28 12:23:07 +00:00
0fbb38baeb Merge pull request 'dev' (#28) from dev into main
Reviewed-on: #28
2025-10-27 12:23:13 +00:00
3e1928fcad Merge pull request 'Update missions/tip the scale.py' (#27) from ayaan_dev into dev
Reviewed-on: #27
2025-10-27 12:22:25 +00:00
ef0ff44f2b HazmatCodeChanges
This is the code we changed at the scrimmage.
2025-10-25 02:06:49 +00:00
7b539b45d0 Update codes_for_scrimmage/hazmat/mainhazmatUPD.py
CVC
2025-10-25 02:05:16 +00:00
9a320589ab Update codes_for_scrimmage/hazmat/mainhazmatUPD.py
67
2025-10-25 01:38:57 +00:00
4d1bd8abe3 Update codes_for_scrimmage/hazmat/mainhazmatUPD.py 2025-10-25 01:26:41 +00:00
1317c8e8ce Update codes_for_scrimmage/hazmat/mainhazmatUPD.py
Minor Changes
2025-10-25 01:15:49 +00:00
54e8c9eba5 Update codes_for_scrimmage/hazmat/mainhazmatUPD.py 2025-10-24 01:16:19 +00:00
9d3d8b48e4 Update codes_for_scrimmage/hazmat/mainhazmatUPD.py 2025-10-24 01:15:43 +00:00
702e05e7f7 Update codes_for_scrimmage/hazmat/mainhazmatUPD.py 2025-10-24 01:13:45 +00:00
5427c73f1c Update codes_for_scrimmage/hazmat/mainhazmatUPD.py
I am not a monkey
2025-10-24 01:09:49 +00:00
b41f833c5e Update codes_for_scrimmage/hazmat/mainhazmatUPD.py 2025-10-24 01:07:23 +00:00
3765db3001 Update codes_for_scrimmage/hazmat/mainhazmatUPD.py
MINOR CHANGES AGAIN
2025-10-24 01:01:04 +00:00
94bae3c140 Update codes_for_scrimmage/hazmat/mainhazmatUPD.py 2025-10-24 00:52:40 +00:00
dbb0749ff3 Update codes_for_scrimmage/hazmat/mainhazmatUPD.py
Minor Changes AGAIN!!
2025-10-24 00:49:24 +00:00
831b75025d Update codes_for_scrimmage/hazmat/mainhazmatUPD.py
Minor changes.
2025-10-24 00:45:10 +00:00
249071f5c3 Update codes_for_scrimmage/hazmat/mainhazmatUPD.py 2025-10-24 00:42:21 +00:00
32a695e9ca Update codes_for_scrimmage/hazmat/hazmat_main.py 2025-10-24 00:38:26 +00:00
2d2863726b Update codes_for_scrimmage/hazmat/mainhazmatUPD.py 2025-10-24 00:35:06 +00:00
1dec912abb Update missions/tip the scale.py 2025-10-24 00:11:38 +00:00
12f3d97a9e Merge pull request 'Update missions/tip the scale.py' (#25) from ayaan_dev into dev
Reviewed-on: #25
2025-10-23 15:49:51 +00:00
99aa81a68c Merge pull request 'arcmyx-dev' (#26) from arcmyx-dev into dev
Reviewed-on: #26
2025-10-23 15:49:44 +00:00
acfe0e622e Update codes_for_scrimmage/hazmat/mainhazmatUPD.py
This is the new version of Hazmat Code with the colors. Check to see if your color is different. Only Run2 is different, it was white, now violet.
2025-10-23 02:30:26 +00:00
4ad60502b9 Add codes_for_scrimmage/hazmat/mainhazmatUPD.py 2025-10-23 02:14:42 +00:00
9e0c82b26b Update missions/tip the scale.py 2025-10-23 00:52:26 +00:00
819b222610 Update codes_for_scrimmage/hazmat/hazmat_main.py 2025-10-23 00:38:23 +00:00
a16d5deb92 Update codes_for_scrimmage/hazmat/hazmat_main.py 2025-10-23 00:35:38 +00:00
30bc22a457 Delete codes_for_scrimmage/hazmat/hazmat_main.py 2025-10-23 00:34:40 +00:00
1cb08a0c32 Update codes_for_scrimmage/hazmat/hazmat_main.py
Adding Rishi/Vickram + Adi Mission's
2025-10-23 00:34:14 +00:00
11acca0744 Add codes_for_scrimmage/hazmat/hazmat_main.py 2025-10-23 00:33:01 +00:00
68aff887da Update codes_for_scrimmage/hazmat/hazmat_main.py 2025-10-23 00:29:22 +00:00
1f2a467b9b Update codes_for_scrimmage/hazmat/Heavy_lifting_final.py 2025-10-23 00:28:52 +00:00
b3b0590bb9 Merge pull request 'Organize mission codes for scrimmage. Fixed some coolor detection issues' (#22) from add-folder-structure-for-scrimmage into dev
Reviewed-on: #22
2025-10-22 18:55:29 +00:00
d8f1d47882 Organize mission codes for scrimmage. Fixed some coolor detection issues 2025-10-22 12:37:05 -05:00
e0061dc672 Merge pull request 'dev' (#21) from Johannes/Johannes-dev:dev into dev
Reviewed-on: #21
2025-10-22 00:15:37 +00:00
4496396d0b Update missions/M8_5.py 2025-10-22 00:15:11 +00:00
3ec1aafbeb Update missions/M8_5.py 2025-10-22 00:07:04 +00:00
6c9efe26f9 Update missions/Heavy_lifting_final.py 2025-10-22 00:05:00 +00:00
cf1f8a1995 Update missions/Send_Over_Final.py 2025-10-22 00:04:16 +00:00
2567e8b8d7 Add missions/Send_Over_Final.py 2025-10-21 23:57:13 +00:00
cb79ecbb95 Add missions/Heavy_lifting_final.py 2025-10-21 23:54:55 +00:00
59213ae3f6 Update final/main5.py
Just adjusted my code!!
2025-10-21 00:24:33 +00:00
97963488eb Update test_10_17_2025.py
Rishi, A.K.A me replaced my outdated code with the new one.
2025-10-21 00:21:53 +00:00
b263687c3b dis id vewwy impotent codes
AAAGGGHHHHHHHHHHHHH COLOR SENSORS CAUSE ME PAIN!!!!!!!!!!!
2025-10-20 16:13:13 +00:00
e32c773d58 Merge pull request 'Changed Johannes values' (#20) from johannes-fork-merge into dev
Reviewed-on: #20
2025-10-20 15:49:05 +00:00
50dd00cba6 Changed Johannes values
Old code was:
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(915)
    await drive_base.turn(-90)
    await drive_base.straight(60)
    await left_arm.run_angle(10000,-15000)
    await drive_base.straight(-60)
    await drive_base.turn(85)
    await drive_base.straight(2000)
    
run_task(main())
2025-10-20 15:48:22 +00:00
f3f99f4e94 Merge pull request 'johannes-fork-merge' (#19) from johannes-fork-merge into dev
Reviewed-on: #19
2025-10-20 15:44:54 +00:00
ce4435e7eb Changed line 23 from 420 to 500
johannes did it idk
2025-10-20 15:44:31 +00:00
b8476d4bfc Upload files to "missions" 2025-10-20 15:43:35 +00:00
8bd76e5692 afniawemhcfj8ewa hjciuawefn awenfuiearhi nofuahweof e2q 2025-10-20 15:39:58 +00:00
9c2b3a2ad9 Upload files to "/" 2025-10-20 15:35:14 +00:00
639588e253 Merge pull request 'Add missions/Heavy lifting.py' (#17) from Johannes_Dev into dev
Reviewed-on: #17
2025-10-20 15:34:41 +00:00
48f504cbda Merge pull request 'arcmyx-dev' (#18) from arcmyx-dev into dev
Reviewed-on: #18
2025-10-20 15:34:27 +00:00
51d7255cd0 Add HEAVY_LIFTING_UPD 2025-10-20 00:48:18 +00:00
c6783889b7 Add missions/Set2.py
Please add the backward part of the code.
2025-10-19 01:51:03 +00:00
9eada9f151 Update RoshoDaGoat.py 2025-10-18 14:53:08 +00:00
79baeca507 Update RoshoDaGoat 2025-10-18 14:52:58 +00:00
8667a66ab1 Add sechs-sieben.py 2025-10-18 14:51:46 +00:00
alkadienePhoton
bcc47c1d1b Merge branch 'dev' of https://codes.fll-65266.org/FLL_65266_LEGO_DYNAMICS/solutions_season_unearthed into dev 2025-10-17 19:36:33 -05:00
alkadienePhoton
e9e40896f2 Merging 2025-10-17 17:25:12 -05:00
bbbfe0078c Add test_10_17_2025.py
um so i was testing the colors and IMMA GO insane so lemme check my lego bin for something that will work.
2025-10-17 21:58:44 +00:00
f69c61e796 Add missions/Sand_mission.py 2025-10-17 20:52:24 +00:00
8061eb71d5 Add missions/Boat_mission.py 2025-10-17 20:51:55 +00:00
5e1f3098f9 Changes after scrimmage run 3 2025-10-11 19:08:38 +00:00
19afacd87b Scrimmage update after run 2
well at least yellow works now.
2025-10-11 18:47:09 +00:00
9b04c18889 Update for contest 2025-10-11 18:22:21 +00:00
1a3abbb4d1 Update twist_scrimmage.py 2025-10-11 18:03:55 +00:00
ae114667f1 Update members/Rishi.txt 2025-10-11 15:27:44 +00:00
8391619c71 Add members/Rishi.txt 2025-10-11 15:24:59 +00:00
d3294bcb0b SCRIMMAGE MERGE!!!
Reviewed-on: #15
yayyyyyyyyyy
2025-10-11 02:30:26 +00:00
d66aecd5eb Update README.md 2025-10-11 02:29:50 +00:00
bbdf0d0e3a Shortened fun sounds 2025-10-11 02:25:18 +00:00
a2ed2c4d26 Merge pull request 'arcmyx-dev' (#14) from arcmyx-dev into dev
Reviewed-on: #14
2025-10-11 02:22:18 +00:00
dd0070d8e2 Update twist_scrimmage.py 2025-10-11 02:16:06 +00:00
9a06677dcc Added comments. Good luck for scrimmage y'all!!! 2025-10-11 01:57:37 +00:00
11e89c6662 THE FINAL THINGY 2025-10-11 01:47:25 +00:00
7e2dc0b7c9 Update final/main5.py 2025-10-10 21:44:03 +00:00
52214be68e Update final/4main.py 2025-10-10 21:35:56 +00:00
29bd9f0e23 Update final/main5.py 2025-10-10 21:27:24 +00:00
a3b04d3e00 Add final/main5.py 2025-10-10 21:25:32 +00:00
45402694bd Update final/4main.py 2025-10-10 21:19:30 +00:00
785c955524 Update final/4main.py 2025-10-10 21:16:29 +00:00
b6cffc6760 Update final/4main 2025-10-10 21:16:17 +00:00
2d9eb496a3 Update final/main4.py 2025-10-10 21:03:57 +00:00
42090eae56 Update final/main4.py 2025-10-10 21:02:03 +00:00
870dce3e4f Merge pull request 'arcmyx-dev' (#13) from arcmyx-dev into dev
Reviewed-on: #13
2025-10-10 20:58:16 +00:00
bb76258f58 Update final/main4emaj.py 2025-10-10 20:56:52 +00:00
f7072a6207 Update final/main4.py 2025-10-10 20:56:17 +00:00
75e64da4b0 Update final/main4emaj.py 2025-10-10 20:27:18 +00:00
8ea7cd55f3 Update final/main4emaj.py 2025-10-10 20:23:39 +00:00
3f37e7e2ff Update final/main4.py 2025-10-10 20:05:31 +00:00
a3e7be20d1 Update final/main4.py 2025-10-10 20:03:09 +00:00
c2204e71ab Update final/main4.py 2025-10-09 22:57:18 +00:00
0664a619b3 Add final/main4.py 2025-10-09 22:04:39 +00:00
5ba2811af3 Merge pull request 'Updated LICENSE and README' (#12) from dev into main
Reviewed-on: #12
2025-10-09 21:16:08 +00:00
dd4fb8bda2 Switched to GPLv3 2025-10-09 21:15:27 +00:00
ee099d91b3 Switched to GPL v3 2025-10-09 21:14:56 +00:00
489add5722 Removed emojis 2025-10-09 21:13:36 +00:00
387e00b5c3 Merge branch 'dev' 2025-10-09 13:00:26 -05:00
28e5bea6f5 Updated README file with some formatting help from AI 2025-10-09 12:17:59 -05:00
3fdd6ae9d1 Merge to main for Scrimmage 2025-10-09 12:01:36 -05:00
227619df49 Add final/3main.py 2025-10-09 12:32:51 +00:00
1e612e2325 Updated license information 2025-10-09 12:23:15 +00:00
684447c01a Add final/2main.py 2025-10-09 00:19:33 +00:00
4456a5aab4 Merge pull request 'Johannes_Dev' (#9) from Johannes_Dev into dev
Reviewed-on: #9
2025-10-08 23:23:13 +00:00
ec745316e1 Merge pull request 'Vickram_dev_' (#8) from Vickram_dev_ into dev
Reviewed-on: #8
2025-10-08 23:23:08 +00:00
95d7c0c2a3 Add final/1main.py 2025-10-08 23:18:23 +00:00
7e0c3d24c1 Delete Final Combined Codes 2025-10-08 23:14:29 +00:00
f190d38426 Add Final Combined Codes 2025-10-08 23:14:05 +00:00
cd21a73f82 Delete missions/main.py 2025-10-08 23:11:07 +00:00
0fa10194c2 Upload files to "missions"
This is the commit for all code excpet for Rishi's
2025-10-08 22:58:48 +00:00
62b76d44bc Merge pull request 'Add missions/tip the scale.py' (#4) from ayaan_dev into dev
Reviewed-on: #4
2025-10-07 14:23:38 +00:00
cba5cfc368 Merge pull request 'Update utils/combine_runs.py' (#5) from Vickram_dev_ into dev
Reviewed-on: #5
2025-10-07 14:23:26 +00:00
3349e7f20c Merge pull request 'Rishi_dev' (#7) from Rishi_dev into dev
Reviewed-on: #7
2025-10-07 14:18:58 +00:00
4b765b0e9d Update missions/M8_5.py 2025-10-07 14:18:07 +00:00
2eca0d7d24 Initial commit
Mission Run #5
2025-10-07 14:18:07 +00:00
8949003351 Mission 9 not in use 2025-10-06 18:10:02 +00:00
8008dafccf Add missions/tip the scale.py 2025-10-04 01:18:31 +00:00
95c3491b44 Update missions/M8_5.py 2025-10-04 00:53:13 +00:00
bb89e01aa1 Update utils/combine_runs.py 2025-10-04 00:32:41 +00:00
6931731ae1 Update LINEUPS.md 2025-10-04 00:09:55 +00:00
d172c70fe2 THIS CODE IS OUTDATED!!! DO NOT USE!!! 2025-10-03 23:28:16 +00:00
efcc011733 Initial Commit 2025-10-03 23:16:03 +00:00
47c89cba0a Add missions/Lift2.py 2025-10-03 21:26:35 +00:00
28bb3fa48c Merge pull request 'Pull from Vickram to dev' (#2) from Vickram_dev_ into dev
Reviewed-on: #2
2025-10-03 21:26:08 +00:00
7ba2453152 Merge pull request 'Pull from Johannes_Dev to dev' (#3) from Johannes_Dev into dev
Reviewed-on: #3
2025-10-03 21:25:54 +00:00
c690ae451b Update members/Vickram.txt 2025-09-29 02:15:06 +00:00
b8620e37aa Update missions/Lift.py 2025-09-26 21:46:12 +00:00
3527ee5600 Add missions/Lift
Parthicc made this originally.
2025-09-26 21:45:42 +00:00
a20bf2255b Update missions/Send_Over.py 2025-09-20 22:52:04 +00:00
9cff4d8626 Update missions/Send_Over.py 2025-09-19 22:00:28 +00:00
d309b0098f '{Johannes}' 2025-09-12 20:32:12 +00:00
37fb0a647e Add members/Ayaan.txt 2025-09-12 20:29:44 +00:00
e895fd1d2c Add members/Vickram.txt 2025-09-12 20:28:02 +00:00
70e09fb42b Add members/Carlos.txt 2025-09-12 20:27:44 +00:00
ee0b8eb6a0 Update README.md 2025-09-10 13:28:54 +00:00
a745ed8c79 Merge pull request 'WIP - Test Merge ( dev to main )' (#1) from dev into main
Reviewed-on: #1
2025-09-02 02:32:19 +00:00