Code

Lilly branch#193

Code

Merged

CECollina merged 28 commits intomainasmithie13/ECE-1140:mainfrom lilly_branchasmithie13/ECE-1140:lilly_branchCopy head branch name to clipboardApr 3, 2024

+167-30

Commits

Commits on Mar 30, 2024

• assigned wayside to blocks

  20lillianjones

  committed
  e707feb

  Copy full SHA for e707feb

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

  20lillianjones

  committed
  77d0f0e

  Copy full SHA for 77d0f0e

• cache

  20lillianjones

  committed
  c41c3aa

  Copy full SHA for c41c3aa

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

  20lillianjones

  committed
  478384f

  Copy full SHA for 478384f

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

  20lillianjones

  committed
  d1dd7b7

  Copy full SHA for d1dd7b7

• cache

  20lillianjones

  committed
  46d6e0b

  Copy full SHA for 46d6e0b

• edited main sim

  20lillianjones

  committed
  6361099

  Copy full SHA for 6361099

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

  20lillianjones

  committed
  e3618f5

  Copy full SHA for e3618f5

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

  20lillianjones

  committed
  f556a0b

  Copy full SHA for f556a0b

• cache

  20lillianjones

  committed
  26b4b2a

  Copy full SHA for 26b4b2a

• added signals from ctc to wayside hw back to mainsim

  20lillianjones

  committed
  907d0f1

  Copy full SHA for 907d0f1

Commits on Mar 31, 2024

• fixed parser to include missing lights

  20lillianjones

  committed
  4ab33d4

  Copy full SHA for 4ab33d4

• added block-wise authority changes according to lights

  20lillianjones

  committed
  2756ce0

  Copy full SHA for 2756ce0

• changes to parser

  20lillianjones

  committed
  01cb404

  Copy full SHA for 01cb404

Commits on Apr 1, 2024

• began hardware implementation of module

  20lillianjones

  committed
  8e36259

  Copy full SHA for 8e36259

• temporarily commented out serial comm

  20lillianjones

  committed
  0779d01

  Copy full SHA for 0779d01

• created function to update boolean authority within wayside hw class

  20lillianjones

  committed
  a51f372

  Copy full SHA for a51f372

• cache

  20lillianjones

  committed
  1fed1fb

  Copy full SHA for 1fed1fb

• finish hardware plc processing and added vitality

  20lillianjones

  committed
  c68d082

  Copy full SHA for c68d082

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

  20lillianjones

  committed
  cccfc76

  Copy full SHA for cccfc76

• cache

  20lillianjones

  committed
  3ce121c

  Copy full SHA for 3ce121c

• changed read track file to account for overlap

  20lillianjones

  committed
  ece25e0

  Copy full SHA for ece25e0

• uncommented serial comms

  20lillianjones

  committed
  bc17f73

  Copy full SHA for bc17f73

Commits on Apr 3, 2024

• edit block attribute label

  20lillianjones

  committed
  ef352c9

  Copy full SHA for ef352c9

• updated track controller

  20lillianjones

  committed
  3b3ea93

  Copy full SHA for 3b3ea93

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

  20lillianjones

  committed
  5e8e1aa

  Copy full SHA for 5e8e1aa

• cache

  20lillianjones

  committed
  c9d3988

  Copy full SHA for c9d3988

• commented-out hardware portion of code temporarily

  20lillianjones

  committed
  79176a1

  Copy full SHA for 79176a1