Code

testing git stuff #22

Code

Merged

lagilfillan69 merged 64 commits intoLauren_Branchasmithie13/ECE-1140:Lauren_Branchfrom mainasmithie13/ECE-1140:mainCopy head branch name to clipboardFeb 18, 2024

+3,642-2

Commits

Commits on Jan 13, 2024

• Tanvi test

  tav38

  committed
  29a3338

  Copy full SHA for 29a3338

Commits on Jan 14, 2024

• Abby testing Github

  magistroA

  authored
  61c1bf0

  Copy full SHA for 61c1bf0

• Createcom.txt

  21AQN01

  authored
  7cc90fe

  Copy full SHA for 7cc90fe

• Anh.txt

  21AQN01

  authored
  aa5ff1c

  Copy full SHA for aa5ff1c

• Merge pull request #2 from asmithie13/Anh_Branch

  Show description for 654463d
  21AQN01

  authored
  654463d

  Copy full SHA for 654463d

Commits on Jan 15, 2024

• Lilly GitHub Test

  20lillianjones

  committed
  1f1cf43

  Copy full SHA for 1f1cf43

• Merge pull request #3 from asmithie13/gitTest

  Show description for 03823a8
  20lillianjones

  authored
  03823a8

  Copy full SHA for 03823a8

Commits on Jan 16, 2024

• Deleted unessesary file

  asmithie13

  committed
  d10640f

  Copy full SHA for d10640f

Commits on Feb 2, 2024

• Removed old test files and added empty folders for modules.

  asmithie13

  committed
  7e3510b

  Copy full SHA for 7e3510b

• added a test

  asmithie13

  committed
  2d83b70

  Copy full SHA for 2d83b70

• Adde folders for all modules with placeholder file.

  asmithie13

  committed
  ac05a83

  Copy full SHA for ac05a83

Commits on Feb 10, 2024

• Have a pretty-ish UI so that the rest of the team can see.

  asmithie13

  committed
  2f2136e

  Copy full SHA for 2f2136e

• Merge pull request #5 from asmithie13/Wayside_Rough

  Show description for 6f65ded
  asmithie13

  authored
  6f65ded

  Copy full SHA for 6f65ded

Commits on Feb 11, 2024

• Start of UI - Functional PLC file uploading

  20lillianjones

  authored
  b4bdde8

  Copy full SHA for b4bdde8

• Delete Train Controller HW/waysideHW_tempcode.py

  20lillianjones

  authored
  4aa0ea6

  Copy full SHA for 4aa0ea6

• functional PLC file upload

  20lillianjones

  authored
  c07e97f

  Copy full SHA for c07e97f

• added an option to select a plc file

  asmithie13

  committed
  3f360de

  Copy full SHA for 3f360de

Commits on Feb 12, 2024

• Updated font for the text of my UI

  asmithie13

  committed
  d358479

  Copy full SHA for d358479

• Delete Train Controller HW/functional PLC file upload

  20lillianjones

  authored
  d582e9b

  Copy full SHA for d582e9b

• UI w/ functional PLC file upload

  20lillianjones

  authored
  5d6f04d

  Copy full SHA for 5d6f04d

• Updated a blue line map to my UI.

  asmithie13

  committed
  3ce291e

  Copy full SHA for 3ce291e

• Testing Github is actually connected

  magistroA

  committed
  2c75e6f

  Copy full SHA for 2c75e6f

• Merge pull request #11 from asmithie13/Abby_Branch

  Show description for 8674603
  magistroA

  authored
  8674603

  Copy full SHA for 8674603

• Added seperation lines to make the UI look cleaner

  asmithie13

  committed
  2fb12f8

  Copy full SHA for 2fb12f8

• Merge pull request #12 from asmithie13/backend_wayside

  Show description for 5ab9d1f
  asmithie13

  authored
  5ab9d1f

  Copy full SHA for 5ab9d1f

• Working through UI tutorial

  magistroA

  committed
  3970962

  Copy full SHA for 3970962

• Updated a button to switch manual and automatic.

  asmithie13

  committed
  7c9a564

  Copy full SHA for 7c9a564

• Merge branch 'main' of https://github.com/asmithie13/ECE-1140 into Abby_Branch

  magistroA

  committed
  faba613

  Copy full SHA for faba613

Commits on Feb 13, 2024

• Playing with UI

  magistroA

  committed
  9726f59

  Copy full SHA for 9726f59

• I'm mostly just doing layouts with colored boxed at the moment

  magistroA

  committed
  d33e1ed

  Copy full SHA for d33e1ed

• Added a loadUI function that negates having to always copy and paste UI code.

  asmithie13

  committed
  d42333f

  Copy full SHA for d42333f

• Removed unnessesary file.

  asmithie13

  committed
  a75f16a

  Copy full SHA for a75f16a

Commits on Feb 14, 2024

• Added drop down menus.

  asmithie13

  committed
  31bc484

  Copy full SHA for 31bc484

• Button can now change text from saying manual to automatic.

  asmithie13

  committed
  d4a46e2

  Copy full SHA for d4a46e2

• Changed names to be more specefic.

  asmithie13

  committed
  0087d78

  Copy full SHA for 0087d78

• Added a block class to establish special blocks and their states.

  asmithie13

  committed
  e933311

  Copy full SHA for e933311

• Set initial conditions making some buttons useless until others are selected.

  asmithie13

  committed
  c6fa3f6

  Copy full SHA for c6fa3f6

• testing

  magistroA

  committed
  9d1cb68

  Copy full SHA for 9d1cb68

• Removed uneeded Block file

  asmithie13

  committed
  af751f3

  Copy full SHA for af751f3

• Re-added need uic file

  asmithie13

  committed
  9e47610

  Copy full SHA for 9e47610

• Progress on UI

  magistroA

  committed
  93b287d

  Copy full SHA for 93b287d

Commits on Feb 15, 2024

• Updated buttons to be enabled only on their function for the current block.

  asmithie13

  committed
  692c9a8

  Copy full SHA for 692c9a8

• Added a simple Block class and have the UI remember prior selections.

  asmithie13

  committed
  4300927

  Copy full SHA for 4300927

• Added more information to block class and have started defining occupancies.

  asmithie13

  committed
  f88537a

  Copy full SHA for f88537a

• Merge pull request #16 from asmithie13/FinishWaysideSW_UI

  Show description for 2f159e1
  asmithie13

  authored
  2f159e1

  Copy full SHA for 2f159e1

• Merge branch 'main' of https://github.com/asmithie13/ECE-1140 into Abby_Branch

  magistroA

  committed
  01301c0

  Copy full SHA for 01301c0

• Updated CTC UI

  magistroA

  committed
  abd154f

  Copy full SHA for abd154f

• Merge pull request #17 from asmithie13/Abby_Branch

  Show description for 60a024b
  magistroA

  authored
  60a024b

  Copy full SHA for 60a024b

• Created initial testbench UI.

  asmithie13

  committed
  c8faa35

  Copy full SHA for c8faa35

• Finished visually what the testbench UI should look like.

  asmithie13

  committed
  07ff936

  Copy full SHA for 07ff936

• Speed, authority, and mode are now sent from input to output in testbench.

  asmithie13

  committed
  7dc16bf

  Copy full SHA for 7dc16bf

• Updated lights initial condition.

  asmithie13

  committed
  e88ef50

  Copy full SHA for e88ef50

Commits on Feb 16, 2024

• Added block occupancy functionality to my test bench and useful function for sorting occupied blocks.

  asmithie13

  committed
  0e619d9

  Copy full SHA for 0e619d9

• Successfully can communicate and display block occupancy from testbench to UI

  asmithie13

  committed
  87ee766

  Copy full SHA for 87ee766

• Finished my testbench for Wayside SW.

  asmithie13

  committed
  001312e

  Copy full SHA for 001312e

• Added some missing blocks

  asmithie13

  committed
  3e00a4e

  Copy full SHA for 3e00a4e

• Merge pull request #18 from asmithie13/Block_Occupanancies_and_Time

  Show description for e62c8b5
  asmithie13

  authored
  e62c8b5

  Copy full SHA for e62c8b5

• Added Track Resources folder to be shared with Wayside SW/HW and Track Model

  asmithie13

  committed
  ef5171f

  Copy full SHA for ef5171f

• Merge pull request #19 from asmithie13/Setup_Track_Resources

  Show description for 8064882
  asmithie13

  authored
  8064882

  Copy full SHA for 8064882

• Created PLC definition

  asmithie13

  committed
  51251dc

  Copy full SHA for 51251dc

Commits on Feb 17, 2024

• Finished the PLC file and the parser for automatic mode.

  asmithie13

  committed
  74ffec0

  Copy full SHA for 74ffec0

• Merge pull request #20 from asmithie13/PLC_Work

  Show description for 21097fb
  asmithie13

  authored
  21097fb

  Copy full SHA for 21097fb

• Simple block label switch

  asmithie13

  committed
  7ce17f0

  Copy full SHA for 7ce17f0

Commits on Feb 18, 2024

• ui

  CECollina

  authored
  e2b3282

  Copy full SHA for e2b3282