Anatoliy Chigirinskiy vor 1 Jahr
Ursprung
Commit
c0953094e2

+ 25 - 31
script/recreate.tcl

@@ -1,32 +1,33 @@
-create_project -name RF_FPGA -dir C:/RF_FPGA_PROJ_Test -pn GW1N-LV9PG256C6/I5 -device_version C -force 
+set DSN_ROOT [file normalize [file join [file dirname [info script]] "."]]
+create_project -name SB_TMSG_FPGA -dir $::DSN_ROOT/SB_TMSG_FPGA_PROJ -pn GW1N-LV9PG256C6/I5 -device_version C -force 
 
 
-add_file -type verilog "/RF_FPGA/src/src/ClkGenGowin/ClkGenGowin.v"
-add_file -type verilog "/RF_FPGA/src/src/ControlUnit/ControlUnit.v"
-add_file -type verilog "/RF_FPGA/src/src/NCO/CordicNco.v"
-add_file -type verilog "/RF_FPGA/src/src/I2C/I2CSM.v"
-add_file -type verilog "/RF_FPGA/src/src/I2C/temp_i2c_master_ver2.v"
-add_file -type verilog "/RF_FPGA/src/src/NCO/CordicRotation.v"
-add_file -type verilog "/RF_FPGA/src/src/QuadSPI/QuadSPIs.v"
-add_file -type verilog "/RF_FPGA/src/src/Top/RFTop.v"
-add_file -type verilog "/RF_FPGA/src/src/SPI/SPIm.v"
-add_file -type verilog "/RF_FPGA/src/src/SPI/SPImDDS.v"
-add_file -type verilog "/RF_FPGA/src/src/SPI/SPIs.v"
-add_file -type verilog "/RF_FPGA/src/src/fifo_top/FifoCtrl.v"
-add_file -type verilog "/RF_FPGA/src/src/fifo_top/DDSFifo/fifo_top/FifoDDS.v"
-add_file -type verilog "/RF_FPGA/src/src/fifo_top/FifoRxRF.v"
-add_file -type verilog "/RF_FPGA/src/src/fifo_top/MAX2870FIFO/fifo_top/FifoMax2870.v"
-add_file -type verilog "/RF_FPGA/src/src/gowin_rpll/gClkGen.v"
-add_file -type verilog "/RF_FPGA/src/src/gowin_rpll/gowin_rpll/ClkGen.v"
-add_file -type verilog "/RF_FPGA/src/src/initRst/InitRst.v"
-add_file -type cst "/RF_FPGA/src/constr/RF_FPGA.cst"
-add_file -type sdc "/RF_FPGA/src/constr/RF_FPGA.sdc"
+add_file -type verilog "$::DSN_ROOT/SB_TMSG_FPGA/src/src/ClkGenGowin/ClkGenGowin.v"
+add_file -type verilog "$::DSN_ROOT/SB_TMSG_FPGA/src/src/ControlUnit/ControlUnit.v"
+add_file -type verilog "$::DSN_ROOT/SB_TMSG_FPGA/src/src/NCO/CordicNco.v"
+add_file -type verilog "$::DSN_ROOT/SB_TMSG_FPGA/src/src/I2C/I2CSM.v"
+add_file -type verilog "$::DSN_ROOT/SB_TMSG_FPGA/src/src/I2C/temp_i2c_master_ver2.v"
+add_file -type verilog "$::DSN_ROOT/SB_TMSG_FPGA/src/src/NCO/CordicRotation.v"
+add_file -type verilog "$::DSN_ROOT/SB_TMSG_FPGA/src/src/QuadSPI/QuadSPIs.v"
+add_file -type verilog "$::DSN_ROOT/SB_TMSG_FPGA/src/src/Top/RFTop.v"
+add_file -type verilog "$::DSN_ROOT/SB_TMSG_FPGA/src/src/SPI/SPIm.v"
+add_file -type verilog "$::DSN_ROOT/SB_TMSG_FPGA/src/src/SPI/SPImDDS.v"
+add_file -type verilog "$::DSN_ROOT/SB_TMSG_FPGA/src/src/SPI/SPIs.v"
+add_file -type verilog "$::DSN_ROOT/SB_TMSG_FPGA/src/src/fifo_top/FifoCtrl.v"
+add_file -type verilog "$::DSN_ROOT/SB_TMSG_FPGA/src/src/fifo_top/DDSFifo/fifo_top/FifoDDS.v"
+add_file -type verilog "$::DSN_ROOT/SB_TMSG_FPGA/src/src/fifo_top/FifoRxRF.v"
+add_file -type verilog "$::DSN_ROOT/SB_TMSG_FPGA/src/src/fifo_top/MAX2870FIFO/fifo_top/FifoMax2870.v"
+add_file -type verilog "$::DSN_ROOT/SB_TMSG_FPGA/src/src/gowin_rpll/gClkGen.v"
+add_file -type verilog "$::DSN_ROOT/SB_TMSG_FPGA/src/src/gowin_rpll/gowin_rpll/ClkGen.v"
+add_file -type verilog "$::DSN_ROOT/SB_TMSG_FPGA/src/src/initRst/InitRst.v"
+add_file -type cst "$::DSN_ROOT/SB_TMSG_FPGA/src/constr/RF_FPGA.cst"
+add_file -type sdc "$::DSN_ROOT/SB_TMSG_FPGA/src/constr/RF_FPGA.sdc"
 
 
 
 
 set_option -synthesis_tool gowinsynthesis
-set_option -output_base_name RF_FPGA
+set_option -output_base_name SB_TMSG_FPGA
 set_option -top_module RFTop
 set_option -gen_verilog_sim_netlist 1
 
@@ -77,7 +78,7 @@ set_option -route_maxfan 23
 set_option -use_jtag_as_gpio 0
 set_option -use_sspi_as_gpio 1
 set_option -use_mspi_as_gpio 0
-set_option -use_ready_as_gpio 0
+set_option -use_ready_as_gpio 1
 set_option -use_done_as_gpio 0
 set_option -use_reconfign_as_gpio 0
 set_option -use_mode_as_gpio 0
@@ -115,11 +116,4 @@ set_option -error_detection_correction false
 set_option -stop_seu_handler false
 set_option -error_injection false
 set_option -ext_cclk false
-set_option -ext_cclk_div 
-
-
-
-
-
-
-
+set_option -ext_cclk_div 

+ 9 - 1
src/constr/RF_FPGA.cst

@@ -4,8 +4,16 @@
 //Tool Version: V1.9.9.01 (64-bit)
 //Part Number: GW1N-LV9PG256C6/I5
 //Device: GW1N-9
-//Created Time: Wed 03 20 12:43:13 2024
+//Created Time: Tue 04 09 09:51:32 2024
 
+IO_LOC "GPIO_o[21]" E1;
+IO_PORT "GPIO_o[21]" IO_TYPE=LVCMOS33 PULL_MODE=UP DRIVE=8 BANK_VCCIO=3.3;
+IO_LOC "GPIO_o[20]" C16;
+IO_PORT "GPIO_o[20]" IO_TYPE=LVCMOS33 PULL_MODE=UP DRIVE=8 BANK_VCCIO=3.3;
+IO_LOC "GPIO_o[19]" D15;
+IO_PORT "GPIO_o[19]" IO_TYPE=LVCMOS33 PULL_MODE=UP DRIVE=8 BANK_VCCIO=3.3;
+IO_LOC "GPIO_o[18]" P1;
+IO_PORT "GPIO_o[18]" IO_TYPE=LVCMOS33 PULL_MODE=UP DRIVE=8 BANK_VCCIO=3.3;
 IO_LOC "GPIO_o[17]" D1;
 IO_PORT "GPIO_o[17]" IO_TYPE=LVCMOS33 PULL_MODE=UP DRIVE=8 BANK_VCCIO=3.3;
 IO_LOC "GPIO_o[16]" R1;

+ 72 - 291
src/src/Top/RFTop.v

@@ -35,7 +35,7 @@ output [FifoNum-1:0] Ss_o,
 output [FifoNum-1:0] Sck_o,
 output [FifoNum-1:0] Mosi0_o,
 
-output [17:0] GPIO_o
+output [21:0] GPIO_o
 
 
 
@@ -133,6 +133,19 @@ wire [15:0] tempI2CData;
 
 
 
+//sums
+
+wire [6:0] sumForLmx = numOfConfigCmds+packetNum1;
+wire [6:0] sumForDDS = numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 ;
+wire [6:0] sumForPot = numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 ;
+wire [6:0] sumForDAC = numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4;
+wire [6:0] sumForATT = numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4 + packetNum5;
+wire [6:0] sumForShiftReg = numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4 + packetNum5 + packetNum6;
+wire [6:0] sumForMAX = numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4 + packetNum5 + packetNum6 + packetNum7;
+wire [6:0] sumForGPIO = numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4 + packetNum5 + packetNum6 + packetNum7 + packetNum8;
+
+
+
 
 reg [15:0] tempi2cCnt;
 reg tempI2CReg;
@@ -241,7 +254,7 @@ assign Mosi1_io = (!modeSel && currState != IDLE) ? misoReg : 1'bz;
 
 assign RstInit_o = rstInit;
 
-assign GPIO_o = GPIOReg[17:0];
+assign GPIO_o = GPIOReg[21:0];
 
 
 
@@ -818,238 +831,6 @@ end
 
 
 
-// always @(*) begin 
-//     if (Rst_i || rstInit) begin 
-//         nextState = IDLE;
-//     end
-//     else begin 
-//         case(currState)
-//         IDLE : begin 
-//             if (modeSel) begin 
-//                 if (trCnt == 1 ) begin
-//                     nextState = LMX2594;
-//                 end
-//                 else begin 
-//                     nextState = IDLE;
-//                 end
-//             end
-//             else begin 
-//                 if (trCnt == 15'h1) begin 
-//                     nextState = deviceID + 1;
-//                 end
-//                 else begin 
-//                     nextState = IDLE;
-//                 end
-//             end
-//         end
-//         LMX2594 : begin 
-//             if (modeSel) begin 
-//                 if (trCnt == packetNum1 + 1 ) begin 
-//                     nextState = DDS;
-//                 end
-//                 else begin 
-//                     if (trCnt < packetNum1) begin 
-//                         nextState = LMX2594;
-//                     end
-//                 end
-//             end
-//             else begin
-//                 if (trCnt1Spi != 0) begin  
-//                     if (trCnt1Spi == wordNum && trCnt1Spi) begin 
-//                         nextState = DDS;
-//                     end
-//                 end
-//             end
-//         end
-//         DDS : begin 
-//             if (modeSel) begin
-//                 if (trCnt != 0) begin  
-//                     if (trCnt == packetNum1 + packetNum2 + 1 ) begin 
-//                         nextState = POT;
-//                     end
-//                     else begin 
-//                         if (trCnt < packetNum1 + packetNum2) begin 
-//                             nextState = DDS;
-//                         end
-//                     end
-//                 end
-//             end
-//             else begin
-//                 if (trCnt1Spi != 0) begin  
-//                     if (trCnt1Spi == wordNum ) begin 
-//                         nextState = POT;
-//                     end
-//                     else begin 
-//                         if (trCnt1Spi < wordNum) begin 
-//                             nextState = DDS;
-//                         end
-//                     end
-//                 end
-//             end
-//         end
-//         POT : begin 
-//             if (modeSel) begin
-//                 if (trCnt != 0) begin  
-//                     if (trCnt == packetNum1 + packetNum2 + packetNum3 + 1 ) begin 
-//                         nextState = DAC;
-//                     end
-//                     else begin 
-//                         if (trCnt < packetNum1 + packetNum2 + packetNum3) begin 
-//                             nextState = POT;
-//                         end
-//                     end
-//                 end
-//             end
-//             else begin
-//                 if (trCnt1Spi != 0) begin  
-//                     if (trCnt1Spi == wordNum ) begin 
-//                         nextState = DAC;
-//                     end
-//                     else begin 
-//                         if (trCnt1Spi < wordNum) begin 
-//                             nextState = POT;
-//                         end
-//                     end
-//                 end
-//             end
-//         end
-//         DAC : begin 
-//             if (modeSel) begin
-//                 if (trCnt != 0) begin  
-//                     if (trCnt == packetNum1 + packetNum2 + packetNum3 + packetNum4 + 1 ) begin 
-//                         nextState = ATTENUATOR;
-//                     end
-//                     else begin 
-//                         if (trCnt < packetNum1 + packetNum2 + packetNum3 + packetNum4) begin 
-//                             nextState = DAC;
-//                         end
-//                     end
-//                 end
-//             end
-//             else begin
-//                 if (trCnt1Spi != 0) begin  
-//                     if (trCnt1Spi == wordNum ) begin 
-//                         nextState = ATTENUATOR;
-//                     end
-//                     else begin 
-//                         if (trCnt1Spi < wordNum) begin 
-//                             nextState = DAC;
-//                         end
-//                     end
-//                 end
-//             end
-//         end
-//         ATTENUATOR : begin 
-//             if (modeSel) begin
-//                 if (trCnt != 0) begin  
-//                     if (trCnt == packetNum1 + packetNum2 + packetNum3 + packetNum4 + packetNum5 + 1 ) begin 
-//                         nextState = SHIFTREG;
-//                     end
-//                     else begin 
-//                         if (trCnt < packetNum1 + packetNum2 + packetNum3 + packetNum4 + packetNum5) begin 
-//                             nextState = ATTENUATOR;
-//                         end
-//                     end
-//                 end
-//             end
-//             else begin
-//                 if (trCnt1Spi != 0) begin  
-//                     if (trCnt1Spi == wordNum ) begin 
-//                         nextState = SHIFTREG;
-//                     end
-//                     else begin 
-//                         if (trCnt1Spi < wordNum) begin 
-//                             nextState = ATTENUATOR;
-//                         end
-//                     end
-//                 end
-//             end
-//         end
-//         SHIFTREG : begin 
-//             if (modeSel) begin
-//                 if (trCnt != 0) begin  
-//                     if (trCnt == packetNum1 + packetNum2 + packetNum3 + packetNum4 + packetNum5 + packetNum6 + 1 ) begin 
-//                         nextState = MAX2870;
-//                     end
-//                     else begin 
-//                         if (trCnt < packetNum1 + packetNum2 + packetNum3 + packetNum4 + packetNum5 + packetNum6) begin 
-//                             nextState = SHIFTREG;
-//                         end
-//                     end
-//                 end
-//             end
-//             else begin
-//                 if (trCnt1Spi != 0) begin  
-//                     if (trCnt1Spi == wordNum ) begin 
-//                         nextState = MAX2870;
-//                     end
-//                     else begin 
-//                         if (trCnt1Spi < wordNum) begin 
-//                             nextState = SHIFTREG;
-//                         end
-//                     end
-//                 end
-//             end
-//         end
-//         MAX2870 : begin 
-//             if (modeSel) begin
-//                 if (trCnt != 0) begin  
-//                     if (trCnt == packetNum1 + packetNum2 + packetNum3 + packetNum4 + packetNum5 + packetNum6 + packetNum7 + 1 ) begin 
-//                         nextState = GPIO;
-//                     end
-//                     else begin 
-//                         if (trCnt < packetNum1 + packetNum2 + packetNum3 + packetNum4 + packetNum5 + packetNum6 + packetNum7) begin 
-//                             nextState = MAX2870;
-//                         end
-//                     end
-//                 end
-//             end
-//             else begin
-//                 if (trCnt1Spi != 0) begin  
-//                     if (trCnt1Spi == wordNum ) begin 
-//                         nextState = GPIO;
-//                     end
-//                     else begin 
-//                         if (trCnt1Spi < wordNum) begin 
-//                             nextState = MAX2870;
-//                         end
-//                     end
-//                 end
-//             end
-//         end
-//         GPIO : begin 
-//             if (modeSel) begin
-//                 if (trCnt != 0) begin  
-//                     if (trCnt == packetNum1 + packetNum2 + packetNum3 + packetNum4 + packetNum5 + packetNum6 + packetNum7 + packetNum8 + 1 ) begin 
-//                         nextState = IDLE;
-//                     end
-//                     else begin 
-//                         if (trCnt < packetNum1 + packetNum2 + packetNum3 + packetNum4 + packetNum5 + packetNum6 + packetNum7 + packetNum8) begin 
-//                             nextState = GPIO;
-//                         end
-//                     end
-//                 end
-//             end
-//             else begin
-//                 if (trCnt1Spi != 0) begin  
-//                     if (trCnt1Spi == wordNum ) begin 
-//                         nextState = IDLE;
-//                     end
-//                     else begin 
-//                         if (trCnt1Spi < wordNum) begin 
-//                             nextState = GPIO;
-//                         end
-//                     end
-//                 end
-//             end
-//         end
-//         default : begin 
-//             nextState = IDLE;
-//         end
-//     endcase
-// end
-// end
-
 
 
 
@@ -1064,34 +845,34 @@ always @(*) begin
         case(currState)
         IDLE: begin 
             if (modeSel) begin 
-                if (trCnt == numOfConfigCmds && packetNum1 != 0 ) begin
+                if ((trCnt == numOfConfigCmds) && (packetNum1 != 0) ) begin
                     nextState = LMX2594;
                 end
-                else if (trCnt == numOfConfigCmds && packetNum1 == 0 && packetNum2 != 0 ) begin 
+                else if ((trCnt == numOfConfigCmds) && (packetNum1 == 0) && (packetNum2 != 0) ) begin 
                     nextState = DDS;
                 end
-                else if (trCnt == numOfConfigCmds && packetNum1 == 0 && packetNum2 == 0 && packetNum3 != 0) begin 
+                else if ((trCnt == numOfConfigCmds) && (packetNum1 == 0) && (packetNum2 == 0) && (packetNum3 != 0)) begin 
                     nextState = POT; 
                 end
-                else if (trCnt == numOfConfigCmds && packetNum1 == 0 && packetNum2 == 0 && packetNum3 == 0 && packetNum4 != 0) begin 
+                else if ((trCnt == numOfConfigCmds) && (packetNum1 == 0) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 != 0)) begin 
                     nextState = DAC;
                 end
-                else if (trCnt == numOfConfigCmds && packetNum1 == 0 && packetNum2 == 0 && packetNum3 == 0 && packetNum4 == 0 && packetNum5 != 0 ) begin 
+                else if ((trCnt == numOfConfigCmds) && (packetNum1 == 0) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 != 0) ) begin 
                     nextState = ATTENUATOR;
                 end
-                else if (trCnt == numOfConfigCmds && packetNum1 == 0 && packetNum2 == 0 && packetNum3 == 0 && packetNum4 == 0 && packetNum5 == 0) begin
+                else if ((trCnt == numOfConfigCmds) && (packetNum1 == 0) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 == 0)) begin
                     nextState = SHIFTREG;
                 end
-                else if (trCnt == numOfConfigCmds && packetNum1 == 0 && packetNum2 == 0 && packetNum3 == 0 && packetNum4 == 0 && packetNum5 == 0 && packetNum6 != 0) begin 
+                else if ((trCnt == numOfConfigCmds)  && (packetNum1 == 0) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 != 0)) begin 
                     nextState = SHIFTREG;
                 end
-                else if (trCnt == numOfConfigCmds && packetNum1 == 0 && packetNum2 == 0 && packetNum3 == 0 && packetNum4 == 0 && packetNum5 == 0 && packetNum6 == 0 && packetNum7 != 0) begin 
+                else if ((trCnt == numOfConfigCmds) && (packetNum1 == 0) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 != 0)) begin 
                     nextState = MAX2870;
                 end
-                else if (trCnt == numOfConfigCmds && packetNum1 == 0 && packetNum2 == 0 && packetNum3 == 0 && packetNum4 == 0 && packetNum5 == 0 && packetNum6 == 0 && packetNum7 == 0 && packetNum8 != 0) begin 
+                else if ((trCnt == numOfConfigCmds) && (packetNum1 == 0) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 != 0)) begin 
                     nextState = GPIO;
                 end
-                else if (trCnt == numOfConfigCmds && packetNum1 == 0 && packetNum2 == 0 && packetNum3 == 0 && packetNum4 == 0 && packetNum5 == 0 && packetNum6 == 0 && packetNum7 == 0 && packetNum8 == 0) begin 
+                else if ((trCnt == numOfConfigCmds) && (packetNum1 == 0) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0 ) && (packetNum8 == 0)) begin 
                     nextState = IDLE;
                 end
                 else begin 
@@ -1109,34 +890,34 @@ always @(*) begin
         end
         LMX2594: begin
             if (modeSel) begin 
-                if (trCnt == numOfConfigCmds + packetNum1 && packetNum2 != 0) begin 
+                if ((trCnt == (numOfConfigCmds + packetNum1)) && (packetNum2 != 0)) begin 
                     nextState = DDS;
                 end
-                else if (trCnt == numOfConfigCmds + packetNum1 && packetNum1 == 0  && packetNum2 == 0 & packetNum3 != 0) begin 
+                else if ((trCnt == (numOfConfigCmds + packetNum1)) && (packetNum1 == 0)  && (packetNum2 == 0) && (packetNum3 != 0)) begin 
                     nextState = POT;
                 end
-                else if (trCnt == numOfConfigCmds + packetNum1 && packetNum2 == 0 && packetNum3 == 0 && packetNum4 != 0 ) begin 
+                else if ((trCnt == (numOfConfigCmds + packetNum1)) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 != 0)) begin 
                     nextState = DAC;
                 end
-                else if (trCnt == numOfConfigCmds + packetNum1 && packetNum2 == 0 && packetNum3 == 0 && packetNum4 == 0 && packetNum5 != 0) begin 
+                else if ((trCnt == (numOfConfigCmds + packetNum1)) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 != 0)) begin 
                     nextState = ATTENUATOR;
                 end
-                else if (trCnt == numOfConfigCmds + packetNum1 && packetNum2 == 0 && packetNum3 == 0 && packetNum4 == 0  && packetNum5 == 0 ) begin 
+                else if ((trCnt == (numOfConfigCmds + packetNum1)) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 == 0)) begin 
                     nextState = SHIFTREG; 
                 end
-                else if (trCnt == numOfConfigCmds + packetNum1 && packetNum2 == 0 && packetNum3 == 0 && packetNum4 == 0  && packetNum5 == 0 && packetNum6 != 0) begin 
+                else if ((trCnt == (numOfConfigCmds + packetNum1)) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0)  && (packetNum5 == 0) && (packetNum6 != 0)) begin 
                     nextState = SHIFTREG; 
                 end
-                else if (trCnt == numOfConfigCmds + packetNum1 && packetNum2 == 0 && packetNum3 == 0 && packetNum4 == 0  && packetNum5 == 0 && packetNum6 == 0 && packetNum7 != 0) begin 
+                else if ((trCnt == (numOfConfigCmds + packetNum1)) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0)  && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 != 0)) begin 
                     nextState = MAX2870; 
                 end
-                else if (trCnt == numOfConfigCmds + packetNum1 && packetNum2 == 0 && packetNum3 == 0 && packetNum4 == 0  && packetNum5 == 0 && packetNum6 == 0 && packetNum7 == 0 && packetNum8 != 0) begin 
+                else if ((trCnt == (numOfConfigCmds + packetNum1)) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0)  && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 != 0)) begin 
                     nextState = GPIO; 
                 end
-                else if (trCnt == numOfConfigCmds + packetNum1 && packetNum2 == 0 && packetNum3 == 0 && packetNum4 == 0  && packetNum5 == 0 && packetNum6 == 0 && packetNum7 == 0 && packetNum8 == 0) begin 
+                else if ((trCnt == (numOfConfigCmds + packetNum1)) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0)  && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 == 0)) begin 
                     nextState = IDLE; 
                 end
-                else if (trCnt != numOfConfigCmds + packetNum1 ) begin 
+                else if (trCnt != (numOfConfigCmds + packetNum1)) begin 
                     nextState = LMX2594;
                 end
             end
@@ -1151,28 +932,28 @@ always @(*) begin
         end
         DDS: begin
             if (modeSel) begin 
-                if (trCnt == numOfConfigCmds + packetNum1 + packetNum2 && packetNum3 != 0) begin 
+                if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2)) && (packetNum3 != 0)) begin 
                     nextState = POT;
                 end
-                else if (trCnt == numOfConfigCmds + packetNum1 + packetNum2 && packetNum3 == 0 && packetNum4 != 0) begin 
+                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2)) && (packetNum3 == 0) && (packetNum4 != 0)) begin 
                     nextState = DAC;
                 end
-                else if (trCnt == numOfConfigCmds + packetNum1 + packetNum2 && packetNum3 == 0 && packetNum4 == 0 && packetNum5 != 0) begin 
+                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2)) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 != 0) ) begin 
                     nextState = ATTENUATOR;
                 end
-                else if (trCnt == numOfConfigCmds + packetNum1 + packetNum2 && packetNum3 == 0 && packetNum4 == 0 && packetNum5 == 0 && packetNum6 != 0) begin 
+                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2)) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 != 0)) begin 
                     nextState = SHIFTREG;
                 end
-                else if (trCnt == numOfConfigCmds + packetNum1 + packetNum2 && packetNum3 == 0 && packetNum4 == 0 && packetNum5 == 0 && packetNum6 == 0 && packetNum7 != 0) begin 
+                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2)) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 == 0 ) && (packetNum7 != 0)) begin 
                     nextState = MAX2870;
                 end
-                else if (trCnt == numOfConfigCmds + packetNum1 + packetNum2 && packetNum3 == 0 && packetNum4 == 0 && packetNum5 == 0 && packetNum6 == 0 && packetNum7 == 0 && packetNum8 != 0) begin 
+                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2)) && (packetNum3 == 0) && (packetNum4 == 0 ) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 != 0)) begin 
                     nextState = GPIO;
                 end
-                else if (trCnt == numOfConfigCmds + packetNum1 + packetNum2 && packetNum3 == 0 && packetNum4 == 0 && packetNum5 == 0 && packetNum6 == 0 && packetNum7 == 0 && packetNum8 == 0) begin 
+                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2)) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 == 0)) begin 
                     nextState = IDLE;
                 end
-                else if (trCnt != numOfConfigCmds + packetNum1 + packetNum2) begin 
+                else if (trCnt != (numOfConfigCmds + packetNum1 + packetNum2)) begin 
                     nextState = DDS;
                 end
             end
@@ -1192,28 +973,28 @@ always @(*) begin
         end
         POT: begin
             if (modeSel) begin 
-                if (trCnt == numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 && packetNum4 != 0) begin 
+                if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3)) && (packetNum4 != 0)) begin 
                     nextState = DAC;
                 end
-                else if (trCnt == numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 && packetNum4 == 0 && packetNum5 != 0) begin 
+                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3)) && (packetNum4 == 0) && (packetNum5 != 0)) begin 
                     nextState = ATTENUATOR;
                 end
-                else if (trCnt == numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 && packetNum4 == 0 && packetNum5 == 0) begin 
+                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3)) && (packetNum4 == 0) && (packetNum5 == 0)) begin 
                     nextState = SHIFTREG;
                 end
-                else if (trCnt == numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 && packetNum4 == 0 && packetNum5 == 0 && packetNum6 != 0) begin 
+                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3)) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 != 0)) begin 
                     nextState = SHIFTREG;
                 end
-                else if (trCnt == numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 && packetNum4 == 0 && packetNum5 == 0 && packetNum6 == 0 && packetNum7 != 0) begin 
+                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3)) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 != 0)) begin 
                     nextState = MAX2870;
                 end
-                else if (trCnt == numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 && packetNum4 == 0 && packetNum5 == 0 && packetNum6 == 0 && packetNum7 == 0 && packetNum8 != 0) begin 
+                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3)) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 != 0)) begin 
                     nextState = GPIO;
                 end
-                else if (trCnt == numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 && packetNum4 == 0 && packetNum5 == 0 && packetNum6 == 0 && packetNum7 == 0 && packetNum8 == 0) begin 
+                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3)) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 == 0)) begin 
                     nextState = IDLE;
                 end
-                else if (trCnt != numOfConfigCmds + packetNum1 + packetNum2 + packetNum3) begin 
+                else if (trCnt != (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3)) begin 
                     nextState = POT;
                 end
             end
@@ -1228,25 +1009,25 @@ always @(*) begin
         end
         DAC: begin
             if (modeSel) begin 
-                if (trCnt == numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4 && packetNum5 != 0 ) begin 
+                if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4)) && (packetNum5 != 0) ) begin 
                     nextState = ATTENUATOR;
                 end
-                else if (trCnt == numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4 && packetNum5 == 0) begin 
+                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4)) && (packetNum5 == 0)) begin 
                     nextState = SHIFTREG;
                 end
-                else if (trCnt == numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4 && packetNum5 == 0 && packetNum6 != 0) begin 
+                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4)) && (packetNum5 == 0) && (packetNum6 != 0)) begin 
                     nextState = SHIFTREG;
                 end
-                else if (trCnt == numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4 && packetNum5 == 0 && packetNum6 == 0 && packetNum7 != 0) begin 
+                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4)) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 != 0)) begin 
                     nextState = MAX2870;
                 end
-                else if (trCnt == numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4 && packetNum5 == 0 && packetNum6 == 0 && packetNum7 == 0 && packetNum8 != 0) begin 
+                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4)) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 != 0)) begin 
                     nextState = GPIO;
                 end
-                else if (trCnt == numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4 && packetNum5 == 0 && packetNum6 == 0 && packetNum7 == 0 && packetNum8 == 0) begin 
+                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4)) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 == 0)) begin 
                     nextState = IDLE;
                 end
-                else if (trCnt != numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4) begin 
+                else if (trCnt != (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4)) begin 
                     nextState = DAC;
                 end
             end
@@ -1261,19 +1042,19 @@ always @(*) begin
         end
         ATTENUATOR: begin
             if (modeSel) begin 
-                if (trCnt == numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5 && packetNum6 != 0 ) begin 
+                if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5)) && (packetNum6 != 0) ) begin 
                     nextState = SHIFTREG;
                 end
-                else if (trCnt == numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5 && packetNum6 == 0 && packetNum7 != 0) begin 
+                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5)) && (packetNum6 == 0) && (packetNum7 != 0)) begin 
                     nextState = MAX2870;
                 end
-                else if (trCnt == numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5 && packetNum6 == 0 && packetNum7 == 0 && packetNum8 != 0) begin 
+                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5)) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 != 0)) begin 
                     nextState = GPIO;
                 end
-                else if (trCnt == numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5 && packetNum6 == 0 && packetNum7 == 0 && packetNum8 == 0) begin 
+                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5)) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 == 0)) begin 
                     nextState = IDLE;
                 end
-                else if (trCnt != numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5) begin 
+                else if (trCnt != (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5)) begin 
                     nextState = ATTENUATOR;
                 end
             end
@@ -1288,16 +1069,16 @@ always @(*) begin
         end
         SHIFTREG : begin 
             if (modeSel) begin 
-                if (trCnt == numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5+packetNum6 && packetNum7 != 0 ) begin 
+                if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5+packetNum6)) && (packetNum7 != 0) ) begin 
                     nextState = MAX2870;
                 end
-                else if (trCnt == numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5+packetNum6 && packetNum7 == 0 && packetNum8 != 0) begin 
+                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5+packetNum6)) && (packetNum7 == 0) && (packetNum8 != 0)) begin 
                     nextState = GPIO;
                 end
-                else if (trCnt == numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5+packetNum6 && packetNum7 == 0 && packetNum8 == 0) begin 
+                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5+packetNum6)) && (packetNum7 == 0) && (packetNum8 == 0)) begin 
                     nextState = IDLE;
                 end
-                else if (trCnt != numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5+packetNum6) begin 
+                else if (trCnt != (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5+packetNum6)) begin 
                     nextState = SHIFTREG;
                 end
             end
@@ -1312,13 +1093,13 @@ always @(*) begin
         end
         MAX2870 : begin 
             if (modeSel) begin 
-                if (trCnt == numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5+packetNum6+packetNum7 && packetNum8 != 0 ) begin 
+                if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5+packetNum6+packetNum7)) && (packetNum8 != 0))  begin 
                     nextState = GPIO;
                 end
-                else if (trCnt == numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5+packetNum6+packetNum7 && packetNum8 == 0) begin 
+                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5+packetNum6+packetNum7)) && (packetNum8 == 0)) begin 
                     nextState = IDLE;
                 end
-                else if (trCnt != numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5+packetNum6+packetNum7) begin 
+                else if (trCnt != (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5+packetNum6+packetNum7)) begin 
                     nextState = MAX2870;
                 end
             end
@@ -1333,10 +1114,10 @@ always @(*) begin
         end
         GPIO : begin 
             if (modeSel) begin 
-                if (trCnt == numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5+packetNum6+packetNum7+packetNum8) begin 
+                if (trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4 + packetNum5 + packetNum6 + packetNum7 + packetNum8)) begin 
                     nextState = IDLE;
                 end
-                else if (trCnt != numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5+packetNum6+packetNum7+packetNum8) begin 
+                else if (trCnt != (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4 + packetNum5 + packetNum6 + packetNum7 + packetNum8)) begin 
                     nextState = GPIO;
                 end
             end

+ 2 - 2
src/src/fifo_top/DDSFifo/fifo_top/FifoDDS.ipc

@@ -11,8 +11,8 @@ ALEMPTY=0
 ALFULL=0
 COUNT_R=true
 COUNT_W=true
-DEPTH_R=5
-DEPTH_W=5
+DEPTH_R=1
+DEPTH_W=1
 ECC=false
 EN_ALEMPTY=false
 EN_ALFULL=false

Datei-Diff unterdrückt, da er zu groß ist
+ 439 - 1924
src/src/fifo_top/DDSFifo/fifo_top/FifoDDS.v


Datei-Diff unterdrückt, da er zu groß ist
+ 448 - 3597
src/src/fifo_top/DDSFifo/fifo_top/FifoDDS.vo


+ 4 - 4
src/src/fifo_top/DDSFifo/fifo_top/FifoDDS_tmp.v

@@ -1,11 +1,11 @@
-//Copyright (C)2014-2024 Gowin Semiconductor Corporation.
+ //Copyright (C)2014-2024 Gowin Semiconductor Corporation.
 //All rights reserved.
 //File Title: Template file for instantiation
 //Tool Version: V1.9.9.01 (64-bit)
 //Part Number: GW1N-LV9PG256C6/I5
 //Device: GW1N-9
 //Device Version: C
-//Created Time: Thu Mar 21 09:34:24 2024
+//Created Time: Mon Apr  8 15:57:39 2024
 
 //Change the instance name and port connections to the signal names
 //--------Copy here to design--------
@@ -17,8 +17,8 @@
 		.RdClk(RdClk_i), //input RdClk
 		.WrEn(WrEn_i), //input WrEn
 		.RdEn(RdEn_i), //input RdEn
-		.Wnum(Wnum_o), //output [6:0] Wnum
-		.Rnum(Rnum_o), //output [6:0] Rnum
+		.Wnum(Wnum_o), //output [2:0] Wnum
+		.Rnum(Rnum_o), //output [2:0] Rnum
 		.Q(Q_o), //output [71:0] Q
 		.Empty(Empty_o), //output Empty
 		.Full(Full_o) //output Full

Datei-Diff unterdrückt, da er zu groß ist
+ 439 - 1924
src/src/fifo_top/DDSFifo/fifo_top/temp/FIFO/FifoDDS.vg


Datei-Diff unterdrückt, da er zu groß ist
+ 170 - 330
src/src/fifo_top/DDSFifo/fifo_top/temp/FIFO/FifoDDS_syn.rpt.html


+ 4 - 4
src/src/fifo_top/DDSFifo/fifo_top/temp/FIFO/FifoDDS_syn_resource.html

@@ -30,12 +30,12 @@ table td.label { width: 20%; white-space: nowrap; min-width: 20px; background-co
 </tr>
 <tr>
 <td class="label">FifoDDS (C:/Gowin/Gowin_V1.9.9.01_x64/IDE/ipcore/FIFO/data/fifo_top.v)</td>
-<td align = "center">146</td>
-<td align = "center">21</td>
-<td align = "center">206</td>
+<td align = "center">106</td>
+<td align = "center">9</td>
+<td align = "center">25</td>
 <td align = "center">-</td>
 <td align = "center">-</td>
-<td align = "center">72</td>
+<td align = "center">18</td>
 </tr>
 </table>
 </div><!-- content -->

+ 1 - 1
src/src/fifo_top/DDSFifo/fifo_top/temp/FIFO/FifoDDS_syn_rsc.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Module name="FifoDDS" Register="146" Alu="21" Lut="206" Ssram="72" T_Register="146(146)" T_Alu="21(21)" T_Lut="206(206)" T_Ssram="72(72)"/>
+<Module name="FifoDDS" Register="106" Alu="9" Lut="25" Ssram="18" T_Register="106(106)" T_Alu="9(9)" T_Lut="25(25)" T_Ssram="18(18)"/>

+ 3 - 3
src/src/fifo_top/DDSFifo/fifo_top/temp/FIFO/FifoDDS_tmp.v

@@ -5,7 +5,7 @@
 //Part Number: GW1N-LV9PG256C6/I5
 //Device: GW1N-9
 //Device Version: C
-//Created Time: Thu Mar 21 09:34:24 2024
+//Created Time: Mon Apr  8 15:57:39 2024
 
 //Change the instance name and port connections to the signal names
 //--------Copy here to design--------
@@ -17,8 +17,8 @@
 		.RdClk(RdClk_i), //input RdClk
 		.WrEn(WrEn_i), //input WrEn
 		.RdEn(RdEn_i), //input RdEn
-		.Wnum(Wnum_o), //output [6:0] Wnum
-		.Rnum(Rnum_o), //output [6:0] Rnum
+		.Wnum(Wnum_o), //output [2:0] Wnum
+		.Rnum(Rnum_o), //output [2:0] Rnum
 		.Q(Q_o), //output [71:0] Q
 		.Empty(Empty_o), //output Empty
 		.Full(Full_o) //output Full

+ 4 - 4
src/src/fifo_top/DDSFifo/fifo_top/temp/FIFO/fifo_parameter.v

@@ -1,6 +1,6 @@
-parameter WDEPTH = 64;
+parameter WDEPTH = 4;
 parameter WDSIZE = 72;
-parameter RDEPTH = 64;
+parameter RDEPTH = 4;
 parameter RDSIZE = 72;
-parameter ASIZE = 6;
-parameter RASIZE = 6;
+parameter ASIZE = 2;
+parameter RASIZE = 2;

+ 8 - 4
src/src/fifo_top/FifoCtrl.v

@@ -2,7 +2,7 @@ module FifoCtrl#(
     parameter FifoNum = 8
 )(
 input WrClk_i,
-input Rst_i,
+input [FifoNum-1:0] Rst_i,
 input[FifoNum-1:0]  RdClk_i,
 input [4:0] CurrState_i,
 input [2:0] DDSFifoCnt_i,
@@ -47,6 +47,8 @@ reg     [23:0] dataToRxFifoReg22;
 reg     [23:0] dataToRxFifoReg23;
 wire    [71:0] dataToRxFifo2;
 wire    [71:0] dataFromRxFifo2;
+wire    [6:0] wNumDDS;
+wire    [6:0] rNumDDS;
 
 reg     [47:0] dataToFifoMax2870Reg;
 wire    [47:0] dataToFifoMax2870;
@@ -373,7 +375,7 @@ generate for (i = 0; i < FifoNum; i = i + 1 ) begin : fifoGen
     if (i != 1  && i != 6 && i != 7) begin
         FifoRxRF RxFifoRF (
             .Data(dataToRxFifo[i]),
-            .Reset(Rst_i),
+            .Reset(Rst_i[i]),
             .WrClk(WrClk_i),
             .RdClk(RdClk_i[i]),
             .WrEn(rxFifoWrEn[i]),
@@ -389,10 +391,12 @@ endgenerate
 
 FifoDDS DDSFifo (
     .Data(dataToRxFifo2),
-    .Reset(Rst_i),
+    .Reset(Rst_i[1]),
     .WrClk(WrClk_i),
     .RdClk(RdClk_i[1]),
     .WrEn(rxFifoWrEn[1]),
+    .Wnum(wNumDDS),
+    .Rnum(rNumDDS),
     .RdEn(rxFifoReadEn[1]),
     .Empty(emptyFlag[1]),
     .Full(fullFlag[1]),
@@ -403,7 +407,7 @@ FifoDDS DDSFifo (
 
 FifoMax2870 Max2870Fifo (
     .Data(dataToFifoMax2870),
-    .Reset(Rst_i),
+    .Reset(Rst_i[6]),
     .WrClk(WrClk_i),
     .RdClk(RdClk_i[6]),
     .WrEn(rxFifoWrEn[6]),