浏览代码

Добавлен тестовый паттерн.

ChStepan 1 年之前
父节点
当前提交
b47b94c028

二进制
S5444_M/XC5445_GrDelMeas_plus_port_sel_reg_.xlsx


文件差异内容过多而无法显示
+ 19 - 46
S5444_M/src/constrs/S5443Top.xdc


+ 8 - 8
S5444_M/src/src/InternalDsp/InternalDsp.v

@@ -208,16 +208,16 @@ always	@(posedge	Clk_i)	begin
 	end	else	begin
 		if (grDelayMeasFlag) begin
 			adc1ChT1DataR	<= Adc1ChT1Data_i;
-			adc1ChR1DataR	<= Adc1ChT1Data_i;
-			adc2ChR2DataR	<= Adc2ChT2Data_i;
-			adc2ChT2DataR	<= Adc2ChT2Data_i;
+			adc1ChR1DataR	<= Adc1ChR1Data_i;
+			adc2ChR2DataR	<= Adc1ChR1Data_i;
+			adc2ChT2DataR	<= Adc1ChT1Data_i;
 			currNcoSinTone [0] <= ncoSinFirstTone;
-			currNcoSinTone [1] <= ncoSinSecondTone;
-			currNcoSinTone [2] <= ncoCosFirstTone;
-			currNcoSinTone [3] <= ncoCosSecondTone;
+			currNcoSinTone [1] <= ncoSinFirstTone;
+			currNcoSinTone [2] <= ncoSinSecondTone;
+			currNcoSinTone [3] <= ncoSinSecondTone;
 			currNcoCosTone [0] <= ncoCosFirstTone;
-			currNcoCosTone [1] <= ncoCosSecondTone;
-			currNcoCosTone [2] <= ncoCosFirstTone;
+			currNcoCosTone [1] <= ncoCosFirstTone;
+			currNcoCosTone [2] <= ncoCosSecondTone;
 			currNcoCosTone [3] <= ncoCosSecondTone;
 		end else begin
 			adc1ChT1DataR	<= Adc1ChT1Data_i;

+ 4 - 4
S5444_M/src/src/Sim/S5443TopPulseProfileTb.v

@@ -73,9 +73,9 @@ module S5443TopPulseProfileTb;
 	//COMMANDS	FOR REG_MAP
 	parameter	[31:0]	MeasCmdBypass	=	{8'h11,8'h0,8'h63,8'h1};
 	parameter	[31:0]	MeasCmdFft 		=	{8'h11,8'h0,8'h63,7'h5,1'b1};
-	parameter	[31:0]	MeasCmd 		=	{8'h11,8'h0,8'h63,8'h0};
-	// parameter	[31:0]	MeasCmd =	{8'h11,6'h0,8'h63,4'h0,4'h0,2'h2};
-	parameter	[23:0]	testCmd = {6'h0,8'h63,4'h0,4'h0,2'h2};
+	// parameter	[31:0]	MeasCmd 		=	{8'h11,8'h0,8'h63,8'h0};
+	parameter	[31:0]	MeasCmd =	{8'h11,6'h0,8'h72,4'h0,4'h0,2'h2};
+	// parameter	[23:0]	testCmd = {6'h0,8'h63,4'h0,4'h0,2'h2};
 	parameter	[31:0]	AdcCtrl =	{8'h12,24'h2};
 	parameter	[31:0]	SensCtrlCmd =	{1'b0,27'h0,4'b1};
 	// parameter	[31:0]	DitherCmd 	= {8'h0E,24'h100192};
@@ -155,7 +155,7 @@ module S5443TopPulseProfileTb;
 	parameter	[31:0]	PG6P3WidthRegCmd	=	{8'h56,24'd5};
 	parameter	[31:0]	PG6P123WidthRegCmd	=	{8'h57,24'd0};
 	
-	parameter	[31:0]	MeasNum0RegCmd		=	{8'h58,24'd10};
+	parameter	[31:0]	MeasNum0RegCmd		=	{8'h58,24'd1};
 	parameter	[31:0]	MeasNum1RegCmd		=	{8'h59,MUXSLOWMODCMD,MUXFASTMODCMD,DSPTRIGINCMD,25'd0};
 	parameter	[31:0]	PGMode0RegCmd		=	{8'h0b,3'b0,PG7MODE,PG6MODE,PG5MODE,PG4MODE,PG3MODE,PG2MODE,PG1MODE};
 	parameter	[31:0]	PGMode1RegCmd		=	{8'h1b,7'b0000000,PG7POL,PG6POL,PG5POL,PG4POL,PG3POL,PG2POL,PG1POL,10'h0};

+ 7 - 1
S5444_M/src/src/Top/S5443Top.v

@@ -531,6 +531,12 @@ module	S5443Top
 	assign	adcDataBus	[ChNum-2]	=	(IsSim)?AdcData_i:adc2ChR2Data;
 	assign	adcDataBus	[ChNum-1]	=	(IsSim)?AdcData_i:adc2ChT2Data;
 	
+	// assign	adcDataBus	[ChNum-4]	=	14'h0;
+	// assign	adcDataBus	[ChNum-3]	=	14'h1;
+	// assign	adcDataBus	[ChNum-2]	=	14'h1;
+	// assign	adcDataBus	[ChNum-1]	=	14'h0;
+	
+	
 	assign	gainManual	[ChNum-4]	=	gainCtrl[5];
 	assign	gainManual	[ChNum-3]	=	gainCtrl[4];
 	assign	gainManual	[ChNum-2]	=	gainCtrl[6];
@@ -802,7 +808,7 @@ InternalDsp
 	.Adc1ChR1Data_i			(adcDataBus[ChNum-3]),	//R1
 	.Adc2ChR2Data_i			(adcDataBus[ChNum-2]),	//R2
 	.Adc2ChT2Data_i			(adcDataBus[ChNum-1]),	//T2
-
+	
 	.GatingPulse_i			(gatingPulse),
 
 	.StartMeas_i			(measStart),

+ 8 - 8
S5444_S/src/src/InternalDsp/InternalDsp.v

@@ -208,16 +208,16 @@ always	@(posedge	Clk_i)	begin
 	end	else	begin
 		if (grDelayMeasFlag) begin
 			adc1ChT1DataR	<= Adc1ChT1Data_i;
-			adc1ChR1DataR	<= Adc1ChT1Data_i;
-			adc2ChR2DataR	<= Adc2ChT2Data_i;
-			adc2ChT2DataR	<= Adc2ChT2Data_i;
+			adc1ChR1DataR	<= Adc1ChR1Data_i;
+			adc2ChR2DataR	<= Adc1ChR1Data_i;
+			adc2ChT2DataR	<= Adc1ChT1Data_i;
 			currNcoSinTone [0] <= ncoSinFirstTone;
-			currNcoSinTone [1] <= ncoSinSecondTone;
-			currNcoSinTone [2] <= ncoCosFirstTone;
-			currNcoSinTone [3] <= ncoCosSecondTone;
+			currNcoSinTone [1] <= ncoSinFirstTone;
+			currNcoSinTone [2] <= ncoSinSecondTone;
+			currNcoSinTone [3] <= ncoSinSecondTone;
 			currNcoCosTone [0] <= ncoCosFirstTone;
-			currNcoCosTone [1] <= ncoCosSecondTone;
-			currNcoCosTone [2] <= ncoCosFirstTone;
+			currNcoCosTone [1] <= ncoCosFirstTone;
+			currNcoCosTone [2] <= ncoCosSecondTone;
 			currNcoCosTone [3] <= ncoCosSecondTone;
 		end else begin
 			adc1ChT1DataR	<= Adc1ChT1Data_i;

+ 4 - 4
S5444_S/src/src/Top/S5443Top.v

@@ -482,10 +482,10 @@ module	S5443Top
 	assign	adcDataBus	[ChNum-2]	=	adc2ChR2Data;
 	assign	adcDataBus	[ChNum-1]	=	adc2ChT2Data;
 	
-	// assign	adcDataBus	[ChNum-4]	=	AdcData_i;
-	// assign	adcDataBus	[ChNum-3]	=	AdcData_i;
-	// assign	adcDataBus	[ChNum-2]	=	AdcData_i;
-	// assign	adcDataBus	[ChNum-1]	=	AdcData_i;
+	// assign	adcDataBus	[ChNum-4]	=	14'h1;
+	// assign	adcDataBus	[ChNum-3]	=	14'h0;
+	// assign	adcDataBus	[ChNum-2]	=	14'h0;
+	// assign	adcDataBus	[ChNum-1]	=	14'h1;
 	
 	assign	gainManual	[ChNum-4]	=	gainCtrl[5];
 	assign	gainManual	[ChNum-3]	=	gainCtrl[4];