فهرست منبع

Изменён модуль PacketAnalyzer4Mosi. Добавлены шины с количеством посылок для DDS и LMX.

Mihail Zaytsev 1 سال پیش
والد
کامیت
3f8e660565

BIN
src/src/PacketAnalyzer4Mosi/PacketAnalyzer4Mosi.docx


+ 9 - 1
src/src/PacketAnalyzer4Mosi/PacketAnalyzer4Mosi.v

@@ -35,6 +35,8 @@ module PacketAnalyzer4Mosi (
 	input BusyMosi1_i,
 
 	output reg [3:0] LmxWordNum_o,
+	output reg [2:0] DdsWordNum_o,
+	output reg ValWordNum_o,
 
 	output reg ValLmxDataToFifo_o,
 	output reg ValDdsDataToFifo_o,
@@ -119,11 +121,16 @@ always @(posedge Clk_i) begin
 		ValShRegDataToFifo_o <= 1'b0;
 		ValMaxDataToFifo_o <= 1'b0;
 		ValGpioDataToFifo_o <= 1'b0;
+		LmxWordNum_o <= 0;
+		DdsWordNum_o <= 0;
+		ValWordNum_o <= 1'b0;
 	end
 	else if (ValDataFromSpi_i) begin
 		if ((dataSpiReg == 0) && (DataFromSpi_i[23] == 1'b1)) begin
 			dataSpiReg[22:1] <= DataFromSpi_i[22:1];
-			LmxWordNum_o <= DataFromSpi_i[16:13];
+			LmxWordNum_o <= DataFromSpi_i[15:12];
+			DdsWordNum_o <= DataFromSpi_i[21:19];
+			ValWordNum_o <= 1'b1;
 		end
 		else begin
 			casez(selector)
@@ -225,6 +232,7 @@ always @(posedge Clk_i) begin
 		ValShRegDataToFifo_o 	<= 1'b0;
 		ValMaxDataToFifo_o 		<= 1'b0;
 		ValGpioDataToFifo_o 	<= 1'b0;
+		ValWordNum_o <= 1'b0;
 	end
 end
 

+ 8 - 8
src/src/PacketAnalyzer4Mosi/PacketAnalyzer4MosiTb.v

@@ -5,12 +5,12 @@ module PacketAnalyzer4MosiTb (
 
 //===============USER DEFINE===================
 localparam [3:0] CNT_LMX_DATA = 1;
-localparam [1:0] CNT_DDS_DATA = 1;
+localparam [2:0] CNT_DDS_DATA = 1;
 localparam [0:0] CNT_POT_DATA = 1;
 localparam [0:0] CNT_DAC_DATA = 1;
 localparam [0:0] CNT_ATT_DATA = 1;
 localparam [1:0] CNT_SH_REG_DATA = 1;
-localparam [2:0] CNT_MAX_DATA = 3;
+localparam [1:0] CNT_MAX_DATA = 3;
 localparam [1:0] CNT_GPIO_DATA = 1;
 //===============USER DEFINE_END===============
 
@@ -21,13 +21,13 @@ localparam MODE_1MOSI = 1'b0;
 localparam MODE_SELECT = MODE_4MOSI;
 //===============USER DEFINE_END===============
 
-localparam CFG_REG = 	{MODE_SELECT, CNT_LMX_DATA, CNT_DDS_DATA, 
-						CNT_POT_DATA, CNT_DAC_DATA, CNT_ATT_DATA,
-						CNT_SH_REG_DATA, CNT_MAX_DATA, CNT_GPIO_DATA, 7'b0};
+localparam CFG_REG = 	{MODE_SELECT, 1'b0, CNT_DDS_DATA, 1'b0, CNT_GPIO_DATA, 
+						CNT_LMX_DATA, 1'b0, CNT_MAX_DATA, 1'b0, CNT_SH_REG_DATA, 1'b0,
+						CNT_POT_DATA, 1'b0, CNT_DAC_DATA, CNT_ATT_DATA, 1'b0};
 
-localparam CNT_DATA_WORDS = CNT_LMX_DATA + CNT_DDS_DATA + CNT_POT_DATA 
-							+ CNT_DAC_DATA + CNT_ATT_DATA + CNT_SH_REG_DATA 
-							+ CNT_MAX_DATA + CNT_GPIO_DATA;
+localparam CNT_DATA_WORDS = CNT_DDS_DATA + CNT_GPIO_DATA + CNT_LMX_DATA
+							+ CNT_MAX_DATA + CNT_SH_REG_DATA + CNT_POT_DATA
+							+ CNT_DAC_DATA + CNT_ATT_DATA;
 
 reg clkMain_tb;
 reg rstMain_tb;