Исправлено инстанцирование модулей. Добавлен сигнал FifoFull_i в FifoCtrl. Параметры для модулей обёртки теперь передаются из top-модуля. Обновлён do-файл.

src/src/FifoCtrl/FifoCtrl.v

@@ -124,7 +124,7 @@ always @(posedge WrClk_i) begin
         WriteEn_o <= 1'b0;
     end
     else begin  
-        if (Val_i && wrCnt == WR_NUM-1) begin
+        if (Val_i && wrCnt == WR_NUM-1 && !FifoFull_i) begin
             WriteEn_o <= 1'b1;
         end
         else begin 
@@ -147,20 +147,6 @@ always @(posedge RdClk_i) begin
     end
 end
 
-// always @(posedge RdClk_i) begin 
-//     if (Rst_i) begin 
-//         ValRdData_o <= 1'b0;
-//     end
-//     else begin 
-//         if (ReadEn_o) begin 
-//             ValRdData_o <= 1'b1;
-//         end
-//         else begin 
-//             ValRdData_o <= 1'b0;
-//         end
-//     end
-// end
-
 always @(posedge RdClk_i) begin 
     if (Rst_i) begin 
         ValRdData_o <= 1'b0;

src/src/Top/TopSbTmsg.v

@@ -189,7 +189,7 @@ LmxWrapper #(
 	.WR_NUM			(1),
 	.OUT_WIDTH		(24),
 	.DATA_WIDTH		(24)
-) LmxWrapper_inst(
+) LmxWrapper(
 	.WrClk_i		(gclk100),
 	.RdClk_i		(clk60),
 	.Rst_i			(Rst_i),
@@ -205,7 +205,7 @@ DDSWrapper #(
 	.WR_NUM			(3),
 	.OUT_WIDTH		(64),
 	.DATA_WIDTH		(64)
-) DDSWrapper_inst(
+) DDSWrapper(
 	.WrClk_i		(gclk100),
 	.RdClk_i		(clk50),
 	.Rst_i			(Rst_i),
@@ -221,7 +221,7 @@ PotWrapper #(
 	.WR_NUM			(1),
 	.OUT_WIDTH		(16),
 	.DATA_WIDTH		(16)
-) PotWrapper_inst(
+) PotWrapper(
 	.WrClk_i		(gclk100),
 	.RdClk_i		(clk5),
 	.Rst_i			(Rst_i),
@@ -237,7 +237,7 @@ DacWrapper #(
 	.WR_NUM			(1),
 	.OUT_WIDTH		(16),
 	.DATA_WIDTH		(16)
-) DacWrapper_inst(
+) DacWrapper(
 	.WrClk_i		(gclk100),
 	.RdClk_i		(clk50),
 	.Rst_i			(Rst_i),
@@ -253,7 +253,7 @@ AttenuatorWrapper #(
 	.WR_NUM			(1),
 	.OUT_WIDTH		(16),
 	.DATA_WIDTH		(16)
-) AttenuatorWrapper_inst(
+) AttenuatorWrapper(
 	.WrClk_i		(gclk100),
 	.RdClk_i		(clk50),
 	.Rst_i			(Rst_i),
@@ -269,7 +269,7 @@ ShiftRegWrapper #(
 	.WR_NUM			(1),
 	.OUT_WIDTH		(8),
 	.DATA_WIDTH		(8)
-) ShRegWrapper_inst(
+) ShiftRegWrapper(
 	.WrClk_i		(gclk100),
 	.RdClk_i		(clk26dot25),
 	.Rst_i			(Rst_i),
@@ -285,7 +285,7 @@ Max2870Wrapper #(
 	.WR_NUM			(2),
 	.OUT_WIDTH		(32),
 	.DATA_WIDTH		(32)
-) Max2870Wrapper_inst(
+) Max2870Wrapper(
 	.WrClk_i		(gclk100),
 	.RdClk_i		(clk20),
 	.Rst_i			(Rst_i),

src/src/Top/TopSbTmsgTb_fifos.do

@@ -1,83 +0,0 @@
-onerror {resume}
-quietly WaveActivateNextPane {} 0
-add wave -noupdate -divider Lmx_Wrapper
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/LmxWrapper_inst/IN_WIDTH
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/LmxWrapper_inst/WR_NUM
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/LmxWrapper_inst/OUT_WIDTH
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/LmxWrapper_inst/DATA_WIDTH
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/LmxWrapper_inst/WrClk_i
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/LmxWrapper_inst/RdClk_i
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/LmxWrapper_inst/Rst_i
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/LmxWrapper_inst/Data_i
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/LmxWrapper_inst/Val_i
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/LmxWrapper_inst/Ss_o
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/LmxWrapper_inst/Sck_o
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/LmxWrapper_inst/Mosi_o
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/LmxWrapper_inst/dataFromLmxFifoCtrl
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/LmxWrapper_inst/dataFromLmxFifo
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/LmxWrapper_inst/readEnLmx
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/LmxWrapper_inst/writeEnLmx
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/LmxWrapper_inst/valRdDataLMX
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/LmxWrapper_inst/busySpiMLmx
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/LmxWrapper_inst/lmxFifoFull
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/LmxWrapper_inst/lmxFifoEmpty
-add wave -noupdate -divider DDS_Wrapper
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/DDSWrapper_inst/IN_WIDTH
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/DDSWrapper_inst/WR_NUM
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/DDSWrapper_inst/OUT_WIDTH
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/DDSWrapper_inst/DATA_WIDTH
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/DDSWrapper_inst/WrClk_i
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/DDSWrapper_inst/RdClk_i
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/DDSWrapper_inst/Rst_i
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/DDSWrapper_inst/Data_i
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/DDSWrapper_inst/Val_i
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/DDSWrapper_inst/Ss_o
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/DDSWrapper_inst/Sck_o
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/DDSWrapper_inst/Mosi_o
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/DDSWrapper_inst/dataFromDdsFifoCtrl
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/DDSWrapper_inst/dataFromDdsFifo
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/DDSWrapper_inst/readEnDds
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/DDSWrapper_inst/writeEnDds
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/DDSWrapper_inst/valRdDataDDS
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/DDSWrapper_inst/busySpiMDds
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/DDSWrapper_inst/ddsFifoFull
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/DDSWrapper_inst/ddsFifoEmpty
-add wave -noupdate -divider Pot_Wrapper
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/PotWrapper_inst/IN_WIDTH
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/PotWrapper_inst/WR_NUM
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/PotWrapper_inst/OUT_WIDTH
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/PotWrapper_inst/DATA_WIDTH
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/PotWrapper_inst/WrClk_i
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/PotWrapper_inst/RdClk_i
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/PotWrapper_inst/Rst_i
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/PotWrapper_inst/Data_i
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/PotWrapper_inst/Val_i
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/PotWrapper_inst/Ss_o
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/PotWrapper_inst/Sck_o
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/PotWrapper_inst/Mosi_o
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/PotWrapper_inst/dataFromPotFifoCtrl
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/PotWrapper_inst/dataFromPotFifo
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/PotWrapper_inst/readEnPot
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/PotWrapper_inst/writeEnPot
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/PotWrapper_inst/valRdDataPOT
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/PotWrapper_inst/busySpiMPot
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/PotWrapper_inst/potFifoFull
-add wave -noupdate /SB_TMSG_tb/TopSbTmsg_inst/PotWrapper_inst/potFifoEmpty
-TreeUpdate [SetDefaultTree]
-WaveRestoreCursors {{Cursor 1} {754550664 ps} 0}
-quietly wave cursor active 1
-configure wave -namecolwidth 150
-configure wave -valuecolwidth 100
-configure wave -justifyvalue left
-configure wave -signalnamewidth 1
-configure wave -snapdistance 10
-configure wave -datasetprefix 0
-configure wave -rowmargin 4
-configure wave -childrowmargin 2
-configure wave -gridoffset 0
-configure wave -gridperiod 1
-configure wave -griddelta 40
-configure wave -timeline 0
-configure wave -timelineunits ps
-update
-WaveRestoreZoom {0 ps} {1050 us}

src/src/Top/TopSbTmsg_Fifos.do

@@ -0,0 +1,167 @@
+onerror {resume}
+quietly WaveActivateNextPane {} 0
+add wave -noupdate -divider Lmx_Wrapper
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/LmxWrapper/IN_WIDTH
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/LmxWrapper/WR_NUM
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/LmxWrapper/OUT_WIDTH
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/LmxWrapper/DATA_WIDTH
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/LmxWrapper/WrClk_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/LmxWrapper/RdClk_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/LmxWrapper/Rst_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/LmxWrapper/Data_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/LmxWrapper/Val_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/LmxWrapper/Ss_o
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/LmxWrapper/Sck_o
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/LmxWrapper/Mosi_o
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/LmxWrapper/dataFromLmxFifoCtrl
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/LmxWrapper/dataFromLmxFifo
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/LmxWrapper/readEnLmx
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/LmxWrapper/writeEnLmx
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/LmxWrapper/valRdDataLMX
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/LmxWrapper/busySpiMLmx
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/LmxWrapper/lmxFifoFull
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/LmxWrapper/lmxFifoEmpty
+add wave -noupdate -divider DDS_Wrapper
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DDSWrapper/IN_WIDTH
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DDSWrapper/WR_NUM
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DDSWrapper/OUT_WIDTH
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DDSWrapper/DATA_WIDTH
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DDSWrapper/WrClk_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DDSWrapper/RdClk_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DDSWrapper/Rst_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DDSWrapper/Data_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DDSWrapper/Val_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DDSWrapper/Ss_o
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DDSWrapper/Sck_o
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DDSWrapper/Mosi_o
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DDSWrapper/dataFromDdsFifoCtrl
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DDSWrapper/dataFromDdsFifo
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DDSWrapper/readEnDds
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DDSWrapper/writeEnDds
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DDSWrapper/valRdDataDDS
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DDSWrapper/busySpiMDds
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DDSWrapper/ddsFifoFull
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DDSWrapper/ddsFifoEmpty
+add wave -noupdate -divider Pot_Wrapper
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/PotWrapper/IN_WIDTH
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/PotWrapper/WR_NUM
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/PotWrapper/OUT_WIDTH
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/PotWrapper/DATA_WIDTH
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/PotWrapper/WrClk_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/PotWrapper/RdClk_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/PotWrapper/Rst_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/PotWrapper/Data_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/PotWrapper/Val_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/PotWrapper/Ss_o
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/PotWrapper/Sck_o
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/PotWrapper/Mosi_o
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/PotWrapper/dataFromPotFifoCtrl
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/PotWrapper/dataFromPotFifo
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/PotWrapper/readEnPot
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/PotWrapper/writeEnPot
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/PotWrapper/valRdDataPOT
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/PotWrapper/busySpiMPot
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/PotWrapper/potFifoFull
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/PotWrapper/potFifoEmpty
+add wave -noupdate -divider Dac_Wrapper
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DacWrapper/IN_WIDTH
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DacWrapper/WR_NUM
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DacWrapper/OUT_WIDTH
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DacWrapper/DATA_WIDTH
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DacWrapper/WrClk_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DacWrapper/RdClk_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DacWrapper/Rst_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DacWrapper/Data_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DacWrapper/Val_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DacWrapper/Ss_o
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DacWrapper/Sck_o
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DacWrapper/Mosi_o
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DacWrapper/dataFromDacFifoCtrl
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DacWrapper/dataFromDacFifo
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DacWrapper/readEnDac
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DacWrapper/writeEnDac
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DacWrapper/valRdDataDAC
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DacWrapper/busySpiMDac
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DacWrapper/dacFifoFull
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/DacWrapper/dacFifoEmpty
+add wave -noupdate -divider AttenuatorWrapper
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/AttenuatorWrapper/IN_WIDTH
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/AttenuatorWrapper/WR_NUM
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/AttenuatorWrapper/OUT_WIDTH
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/AttenuatorWrapper/DATA_WIDTH
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/AttenuatorWrapper/WrClk_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/AttenuatorWrapper/RdClk_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/AttenuatorWrapper/Rst_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/AttenuatorWrapper/Data_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/AttenuatorWrapper/Val_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/AttenuatorWrapper/Ss_o
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/AttenuatorWrapper/Sck_o
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/AttenuatorWrapper/Mosi_o
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/AttenuatorWrapper/dataFromAttFifoCtrl
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/AttenuatorWrapper/dataFromAttFifo
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/AttenuatorWrapper/readEnAtt
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/AttenuatorWrapper/writeEnAtt
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/AttenuatorWrapper/valRdDataATT
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/AttenuatorWrapper/busySpiMAtt
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/AttenuatorWrapper/attFifoFull
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/AttenuatorWrapper/attFifoEmpty
+add wave -noupdate -divider ShiftRegWrapper
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/ShiftRegWrapper/IN_WIDTH
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/ShiftRegWrapper/WR_NUM
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/ShiftRegWrapper/OUT_WIDTH
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/ShiftRegWrapper/DATA_WIDTH
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/ShiftRegWrapper/WrClk_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/ShiftRegWrapper/RdClk_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/ShiftRegWrapper/Rst_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/ShiftRegWrapper/Data_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/ShiftRegWrapper/Val_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/ShiftRegWrapper/Ss_o
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/ShiftRegWrapper/Sck_o
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/ShiftRegWrapper/Mosi_o
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/ShiftRegWrapper/dataFromShRegFifoCtrl
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/ShiftRegWrapper/dataFromShRegFifo
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/ShiftRegWrapper/readEnShReg
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/ShiftRegWrapper/writeEnShReg
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/ShiftRegWrapper/valRdDataShReg
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/ShiftRegWrapper/busySpiMShReg
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/ShiftRegWrapper/shRegFifoFull
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/ShiftRegWrapper/shRegFifoEmpty
+add wave -noupdate -divider Max2870Wrapper
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/Max2870Wrapper/IN_WIDTH
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/Max2870Wrapper/WR_NUM
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/Max2870Wrapper/OUT_WIDTH
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/Max2870Wrapper/DATA_WIDTH
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/Max2870Wrapper/WrClk_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/Max2870Wrapper/RdClk_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/Max2870Wrapper/Rst_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/Max2870Wrapper/Data_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/Max2870Wrapper/Val_i
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/Max2870Wrapper/Ss_o
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/Max2870Wrapper/Sck_o
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/Max2870Wrapper/Mosi_o
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/Max2870Wrapper/dataFromMaxFifoCtrl
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/Max2870Wrapper/dataFromMaxFifo
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/Max2870Wrapper/readEnMax
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/Max2870Wrapper/writeEnMax
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/Max2870Wrapper/valRdDataMAX
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/Max2870Wrapper/busySpiMMax
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/Max2870Wrapper/maxFifoFull
+add wave -noupdate /TopSbTmsgTb/TopSbTmsg_inst/Max2870Wrapper/maxFifoEmpty
+TreeUpdate [SetDefaultTree]
+WaveRestoreCursors {{Cursor 1} {840629685 ps} 0}
+quietly wave cursor active 1
+configure wave -namecolwidth 150
+configure wave -valuecolwidth 100
+configure wave -justifyvalue left
+configure wave -signalnamewidth 1
+configure wave -snapdistance 10
+configure wave -datasetprefix 0
+configure wave -rowmargin 4
+configure wave -childrowmargin 2
+configure wave -gridoffset 0
+configure wave -gridperiod 1
+configure wave -griddelta 40
+configure wave -timeline 0
+configure wave -timelineunits ps
+update
+WaveRestoreZoom {753643129 ps} {755703694 ps}

src/src/WrapFifoChain/AttenuatorWrapper.v

@@ -48,9 +48,9 @@ wire attFifoEmpty;
 //									CODING									//
 //==========================================================================//
 FifoCtrl #(
-	.IN_WIDTH		(24),
-	.WR_NUM			(1),
-	.OUT_WIDTH		(16)
+	.IN_WIDTH		(IN_WIDTH),
+	.WR_NUM			(WR_NUM),
+	.OUT_WIDTH		(OUT_WIDTH)
 ) FifoCtrlAtt
 (
 	.WrClk_i		(WrClk_i),
@@ -80,7 +80,7 @@ Fifo16x3 FifoAtt_inst (
 );
 
 SpiM #(
-	.DATA_WIDTH	(16)
+	.DATA_WIDTH	(DATA_WIDTH)
 )SpiMAtt(
 	.Clk_i		(RdClk_i),
 	.Rst_i		(Rst_i),

src/src/WrapFifoChain/DDSWrapper.v

@@ -48,9 +48,9 @@ wire ddsFifoEmpty;
 //									CODING									//
 //==========================================================================//
 FifoCtrl #(
-	.IN_WIDTH		(24),
-	.WR_NUM			(3),
-	.OUT_WIDTH		(64)
+	.IN_WIDTH		(IN_WIDTH),
+	.WR_NUM			(WR_NUM),
+	.OUT_WIDTH		(OUT_WIDTH)
 ) FifoCtrlDDS
 (
 	.WrClk_i		(WrClk_i),
@@ -80,7 +80,7 @@ FifoDDS FifoDDS_inst (
 );
 
 SpiM #(
-	.DATA_WIDTH	(64)
+	.DATA_WIDTH	(DATA_WIDTH)
 )SpiMDDS(
 	.Clk_i		(RdClk_i),
 	.Rst_i		(Rst_i),

src/src/WrapFifoChain/DacWrapper.v

@@ -48,9 +48,9 @@ wire dacFifoEmpty;
 //									CODING									//
 //==========================================================================//
 FifoCtrl #(
-	.IN_WIDTH		(24),
-	.WR_NUM			(1),
-	.OUT_WIDTH		(16)
+	.IN_WIDTH		(IN_WIDTH),
+	.WR_NUM			(WR_NUM),
+	.OUT_WIDTH		(OUT_WIDTH)
 ) FifoCtrlDac
 (
 	.WrClk_i		(WrClk_i),
@@ -80,7 +80,7 @@ Fifo16x3 FifoDAC_inst (
 );
 
 SpiM #(
-	.DATA_WIDTH	(16)
+	.DATA_WIDTH	(DATA_WIDTH)
 )SpiMDac(
 	.Clk_i		(RdClk_i),
 	.Rst_i		(Rst_i),

src/src/WrapFifoChain/LmxWrapper.v

@@ -48,9 +48,9 @@ wire lmxFifoEmpty;
 //									CODING									//
 //==========================================================================//
 FifoCtrl #(
-	.IN_WIDTH		(24),
-	.WR_NUM			(1),
-	.OUT_WIDTH		(24)
+	.IN_WIDTH		(IN_WIDTH),
+	.WR_NUM			(WR_NUM),
+	.OUT_WIDTH		(OUT_WIDTH)
 ) FifoCtrlLmx
 (
 	.WrClk_i		(WrClk_i),
@@ -80,7 +80,7 @@ FifoLMX FifoLMX_inst (
 );
 
 SpiM #(
-	.DATA_WIDTH	(24)
+	.DATA_WIDTH	(DATA_WIDTH)
 )SpiMLmx(
 	.Clk_i		(RdClk_i),
 	.Rst_i		(Rst_i),

src/src/WrapFifoChain/Max2870Wrapper.v

@@ -48,9 +48,9 @@ wire maxFifoEmpty;
 //									CODING									//
 //==========================================================================//
 FifoCtrl #(
-	.IN_WIDTH		(24),
-	.WR_NUM			(2),
-	.OUT_WIDTH		(32)
+	.IN_WIDTH		(IN_WIDTH),
+	.WR_NUM			(WR_NUM),
+	.OUT_WIDTH		(OUT_WIDTH)
 ) FifoCtrlMax
 (
 	.WrClk_i		(WrClk_i),
@@ -80,7 +80,7 @@ FifoMax2870 FifoMax2870_inst (
 );
 
 SpiM #(
-	.DATA_WIDTH	(32)
+	.DATA_WIDTH	(DATA_WIDTH)
 )SpiMMax(
 	.Clk_i		(RdClk_i),
 	.Rst_i		(Rst_i),

src/src/WrapFifoChain/PotWrapper.v

@@ -48,9 +48,9 @@ wire potFifoEmpty;
 //									CODING									//
 //==========================================================================//
 FifoCtrl #(
-	.IN_WIDTH		(24),
-	.WR_NUM			(1),
-	.OUT_WIDTH		(16)
+	.IN_WIDTH		(IN_WIDTH),
+	.WR_NUM			(WR_NUM),
+	.OUT_WIDTH		(OUT_WIDTH)
 ) FifoCtrlPot
 (
 	.WrClk_i		(WrClk_i),
@@ -80,7 +80,7 @@ Fifo16x3 FifoPot_inst (
 );
 
 SpiM #(
-	.DATA_WIDTH	(16)
+	.DATA_WIDTH	(DATA_WIDTH)
 )SpiMPot(
 	.Clk_i		(RdClk_i),
 	.Rst_i		(Rst_i),

src/src/WrapFifoChain/ShifRegWrapper.v

@@ -47,9 +47,9 @@ wire shRegFifoEmpty;
 //									CODING									//
 //==========================================================================//
 FifoCtrl #(
-	.IN_WIDTH		(24),
-	.WR_NUM			(1),
-	.OUT_WIDTH		(8)
+	.IN_WIDTH		(IN_WIDTH),
+	.WR_NUM			(WR_NUM),
+	.OUT_WIDTH		(OUT_WIDTH)
 ) FifoCtrlShReg
 (
 	.WrClk_i		(WrClk_i),
@@ -79,7 +79,7 @@ FifoShiftReg FifoShReg_inst (
 );
 
 SpiM #(
-	.DATA_WIDTH	(8)
+	.DATA_WIDTH	(DATA_WIDTH)
 )SpiMShReg(
 	.Clk_i		(RdClk_i),
 	.Rst_i		(Rst_i),