Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

testing git stuff #22

Merged
merged 64 commits into from
Feb 18, 2024
Merged

testing git stuff #22

merged 64 commits into from
Feb 18, 2024

Conversation

lagilfillan69
Copy link
Collaborator

No description provided.

tav38 and others added 30 commits January 13, 2024 16:10
@tav38
Tanvi test
29a3338
@magistroA
Abby testing Github
61c1bf0
@21AQN01
Createcom.txt
7cc90fe
@21AQN01
Anh.txt
aa5ff1c
@21AQN01
Merge pull request #2 from asmithie13/Anh_Branch
654463d 
Anh_test.txt
@20lillianjones
Lilly GitHub Test
1f1cf43
@20lillianjones
Merge pull request #3 from asmithie13/gitTest
03823a8 
Lilly GitHub Test
@asmithie13
Deleted unessesary file
d10640f
@asmithie13
Removed old test files and added empty folders for modules.
7e3510b
@asmithie13
added a test
2d83b70
@asmithie13
Adde folders for all modules with placeholder file.
ac05a83
@asmithie13
Have a pretty-ish UI so that the rest of the team can see.
2f2136e
@asmithie13
Merge pull request #5 from asmithie13/Wayside_Rough
6f65ded 
Have a pretty-ish UI so that the rest of the team can see.
@20lillianjones
Start of UI - Functional PLC file uploading
b4bdde8
@20lillianjones
Delete Train Controller HW/waysideHW_tempcode.py
4aa0ea6
@20lillianjones
functional PLC file upload
c07e97f
@asmithie13
added an option to select a plc file
3f360de
@asmithie13
Updated font for the text of my UI
d358479
@20lillianjones
Delete Train Controller HW/functional PLC file upload
d582e9b
@20lillianjones
UI w/ functional PLC file upload
5d6f04d
@asmithie13
Updated a blue line map to my UI.
3ce291e
@magistroA
Testing Github is actually connected
2c75e6f
@magistroA
Merge pull request #11 from asmithie13/Abby_Branch
8674603 
Testing Github is actually connected
@asmithie13
Added seperation lines to make the UI look cleaner
2fb12f8
@asmithie13
Merge pull request #12 from asmithie13/backend_wayside
5ab9d1f 
Backend wayside
@magistroA
Working through UI tutorial
3970962
@asmithie13
Updated a button to switch manual and automatic.
7c9a564
@magistroA
Merge branch 'main' of https://github.com/asmithie13/ECE-1140 into Ab…
faba613 
…by_Branch
@magistroA
Playing with UI
9726f59
@magistroA
I'm mostly just doing layouts with colored boxed at the moment
d33e1ed
asmithie13 and others added 29 commits February 14, 2024 13:36
@asmithie13
Added a block class to establish special blocks and their states.
e933311
@asmithie13
Set initial conditions making some buttons useless until others are s…
c6fa3f6 
…elected.
@magistroA
testing
9d1cb68
@asmithie13
Removed uneeded Block file
af751f3
@asmithie13
Re-added need uic file
9e47610
@magistroA
Progress on UI
93b287d
@asmithie13
Updated buttons to be enabled only on their function for the current …
692c9a8 
…block.
@asmithie13
Added a simple Block class and have the UI remember prior selections.
4300927
@asmithie13
Added more information to block class and have started defining occup…
f88537a 
…ancies.
@asmithie13
Merge pull request #16 from asmithie13/FinishWaysideSW_UI
2f159e1 
Finish wayside UI
@magistroA
Merge branch 'main' of https://github.com/asmithie13/ECE-1140 into Ab…
01301c0 
…by_Branch
@magistroA
Updated CTC UI
abd154f
@magistroA
Merge pull request #17 from asmithie13/Abby_Branch
60a024b 
Abby branch
@asmithie13
Created initial testbench UI.
c8faa35
@asmithie13
Finished visually what the testbench UI should look like.
07ff936
@asmithie13
Speed, authority, and mode are now sent from input to output in testb…
7dc16bf 
…ench.
@asmithie13
Updated lights initial condition.
e88ef50
@asmithie13
Added block occupancy functionality to my test bench and useful funct…
0e619d9 
…ion for sorting occupied blocks.
@asmithie13
Successfully can communicate and display block occupancy from testben…
87ee766 
…ch to UI
@asmithie13
Finished my testbench for Wayside SW.
001312e
@asmithie13
Added some missing blocks
3e00a4e
@asmithie13
Merge pull request #18 from asmithie13/Block_Occupanancies_and_Time
e62c8b5 
Block occupanancies and time
@asmithie13
Added Track Resources folder to be shared with Wayside SW/HW and Trac…
ef5171f 
…k Model
@asmithie13
Merge pull request #19 from asmithie13/Setup_Track_Resources
8064882 
Added Track Resources folder to be shared with Wayside SW/HW and Trac…
@asmithie13
Created PLC definition
51251dc
@asmithie13
Finished the PLC file and the parser for automatic mode.
74ffec0
@asmithie13
Merge pull request #20 from asmithie13/PLC_Work
21097fb 
Plc work
@asmithie13
Simple block label switch
7ce17f0
@CECollina
ui
e2b3282
@lagilfillan69 lagilfillan69 merged commit 22c658f into Lauren_Branch Feb 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@lagilfillan69 @tav38 @magistroA @21AQN01 @20lillianjones @asmithie13 @CECollina