Browse Source

merge konflikt behoben

top_level_design
sessleral71711 2 years ago
parent
commit
1be3ce1cea
1 changed files with 1 additions and 13 deletions
  1. 1
    13
      Top/Top.sv

+ 1
- 13
Top/Top.sv View File

`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


); );
// 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

Loading…
Cancel
Save