merge konflikt behoben

2022-06-14 12:25:25 +02:00
parent 6a72019f25
commit ecd6f16dbe
1 changed files with 1 additions and 13 deletions
@@ -1,7 +1,6 @@
 `include "../spi_interface.v"
 `include "../fsm/Fsm.sv"
 <<<<<<< HEAD
-`include "../Bus_if/Bus_if.sv"
 =======
 >>>>>>> b8d8341 (Initalized top level design)

@@ -10,18 +9,7 @@ module Top(
 );
    // Bus (Interface)
 <<<<<<< 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
    // FSM