kuntzschcl/ESY1_Projekt_2022
kuntzschcl/ESY1_Projekt_2022
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'top_level_design' of https://git.efi.th-nuernberg.de/gitea/kuntzschcl/ESY1_Projekt_2022 into top_level_design

Browse Source
This commit is contained in:
sessleral71711 2022-06-14 12:32:53 +02:00
commit 730cc895b1
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Top/Top.sv
View File

@ -2,6 +2,7 @@
`include "../fsm/Fsm.sv" `include "../fsm/Fsm.sv"
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
======= =======
>>>>>>> b8d8341 (Initalized top level design) >>>>>>> b8d8341 (Initalized top level design)
======= =======
@ -11,6 +12,10 @@
======= =======
`include "../timer_port/timer_top.sv" `include "../timer_port/timer_top.sv"
>>>>>>> 026899b (Added parallelport, timer and ampelsteuerung) >>>>>>> 026899b (Added parallelport, timer and ampelsteuerung)
=======
`include "../Bus_if/Bus_if.sv"
`include "../timer_port/timer_top.sv"
>>>>>>> 026899b930835597e8ea85d65177e75bdc2b1a06
module Top( module Top(
input wire clk, input wire clk,
@ -26,8 +31,11 @@ module Top(
// FSM // FSM
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b8d8341 (Initalized top level design) >>>>>>> b8d8341 (Initalized top level design)
======= =======
=======
>>>>>>> 026899b930835597e8ea85d65177e75bdc2b1a06
Fsm fsm( Fsm fsm(
.clk(clk), .clk(clk),
.inAlarmAmpel(bus.AlarmAmpel), .inAlarmAmpel(bus.AlarmAmpel),
@ -37,7 +45,10 @@ module Top(
.outSendData(bus.SendData), .outSendData(bus.SendData),
.outTimerEN(bus.TimerEN) .outTimerEN(bus.TimerEN)
); );
<<<<<<< HEAD
>>>>>>> c93bdaf (Added bus_if and fsm to top level design) >>>>>>> c93bdaf (Added bus_if and fsm to top level design)
=======
>>>>>>> 026899b930835597e8ea85d65177e75bdc2b1a06
// Parallelport // Parallelport
parallelport parallelport1 ( parallelport parallelport1 (
.inClk(clk), .inClk(clk),