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

merge konflikt behoben

Browse Source
This commit is contained in:
sessleral71711 2022-06-14 11:52:04 +02:00
parent 4b0451fc63
commit 1be3ce1cea
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Top/Top.sv
View File

@ -1,7 +1,6 @@
`include "../spi_interface.v" `include "../spi_interface.v"
`include "../fsm/Fsm.sv" `include "../fsm/Fsm.sv"
<<<<<<< HEAD <<<<<<< HEAD
`include "../Bus_if/Bus_if.sv"
======= =======
>>>>>>> b8d834144be80086a32a76f1769deccce6eaee15 >>>>>>> b8d834144be80086a32a76f1769deccce6eaee15
@ -10,18 +9,7 @@ module Top(
); );
// Bus (Interface) // Bus (Interface)
<<<<<<< HEAD <<<<<<< HEAD
Bus_if bus(.clk(clk));
// SPI Interface
// FSM
Fsm fsm(
.clk(clk),
.inAlarmAmpel(bus.AlarmAmpel),
.inDataValid(bus.DataValid),
.inTasteAktiv(bus.TasteAktiv),
.outAlarm_R(bus.Alarm_R),
.outSendData(bus.SendData),
.outTimerEN(bus.TimerEN)
);
======= =======
// SPI Interface // SPI Interface
// FSM // FSM