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

I hate git

Browse Source
This commit is contained in:
sessleral71711 2022-06-14 12:33:29 +02:00
parent 730cc895b1
commit 17f361ea12
1 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Top/Top.sv
View File

@ -1,21 +1,7 @@
`include "../spi_interface.v" `include "../spi_interface.v"
`include "../fsm/Fsm.sv" `include "../fsm/Fsm.sv"
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b8d8341 (Initalized top level design)
=======
`include "../Bus_if/Bus_if.sv"
<<<<<<< HEAD
>>>>>>> c93bdaf (Added bus_if and fsm to top level design)
=======
`include "../timer_port/timer_top.sv"
>>>>>>> 026899b (Added parallelport, timer and ampelsteuerung)
=======
`include "../Bus_if/Bus_if.sv" `include "../Bus_if/Bus_if.sv"
`include "../timer_port/timer_top.sv" `include "../timer_port/timer_top.sv"
>>>>>>> 026899b930835597e8ea85d65177e75bdc2b1a06
module Top( module Top(
input wire clk, input wire clk,
@ -28,14 +14,7 @@ module Top(
// Bus (Interface) // Bus (Interface)
Bus_if bus(.clk(clk)); Bus_if bus(.clk(clk));
// SPI Interface // SPI Interface
// FSM // FSM
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> b8d8341 (Initalized top level design)
=======
=======
>>>>>>> 026899b930835597e8ea85d65177e75bdc2b1a06
Fsm fsm( Fsm fsm(
.clk(clk), .clk(clk),
.inAlarmAmpel(bus.AlarmAmpel), .inAlarmAmpel(bus.AlarmAmpel),
@ -45,10 +24,6 @@ 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)
=======
>>>>>>> 026899b930835597e8ea85d65177e75bdc2b1a06
// Parallelport // Parallelport
parallelport parallelport1 ( parallelport parallelport1 (
.inClk(clk), .inClk(clk),
@ -78,6 +53,5 @@ module Top(
.alarm(bus.AlarmAmpel) .alarm(bus.AlarmAmpel)
); );
assign AlarmAmpel = bus.AlarmAmpel; assign AlarmAmpel = bus.AlarmAmpel;
endmodule endmodule