Тестовые изменения тестбенча.

src/src/FftDataFiltering/DecimFilterWrapper.v

@@ -22,8 +22,8 @@ module	DecimFilterWrapper
 #(	
 	parameter	AdcDataWidth		=	14,
 	parameter	N	=	8,
-	parameter	M	=	1,
-	parameter	FilteredDataWidth	=	30,
+	parameter	M	=	2,
+	parameter	FilteredDataWidth	=	46,
 	parameter	FirOutDataWidth		=	48,
 	parameter	FirOutCutBit		=	42
 )
@@ -69,13 +69,12 @@ module	DecimFilterWrapper
 	reg		[15:0]	outDataI;
 	reg		[15:0]	outDataQ;
 	
-	localparam	maxWidthForR2	=	5'd18;	//msb for R = 2;
-	localparam	maxWidthForR3	=	5'd21;	//msb for R = 3;
-	// localparam	maxWidthForR4	=	5'd22;	//msb for R = 4;
-	localparam	maxWidthForR4	=	5'd29;	//msb for R = 4;
-	localparam	maxWidthForR5	=	5'd24;	//msb for R = 5;
-	localparam	maxWidthForR6	=	5'd25;	//msb for R = 6;
-	localparam	maxWidthForR7	=	5'd26;	//msb for R = 7;
+	localparam	maxWidthForR2	=	6'd29;	//msb for R = 2;
+	localparam	maxWidthForR3	=	6'd34;	//msb for R = 3;
+	localparam	maxWidthForR4	=	6'd36;	//msb for R = 4;
+	localparam	maxWidthForR5	=	6'd39;	//msb for R = 5;
+	localparam	maxWidthForR6	=	6'd41;	//msb for R = 6;
+	localparam	maxWidthForR7	=	6'd42;	//msb for R = 7;
 	// localparam	maxWidthForR8	=	5'd26;	//msb for R = 8;
 	// localparam	maxWidthForR9	=	5'd27;	//msb for R = 9;
 	// localparam	maxWidthForR10	=	5'd28;	//msb for R = 10;
@@ -169,7 +168,7 @@ cicFilterInstI
 	.Clk_i			(Clk_i),
 	.Rst_i			(Rst_i),
 	.DecimFactor_i	(DecimFactor_i),
-	.Data_i			({{16{AdcData_i[AdcDataWidth-1]}},AdcData_i}),
+	.Data_i			({{32{AdcData_i[AdcDataWidth-1]}},AdcData_i}),
 	.DataNd_i		(OscWind_i),
 	.Data_o			(decimDataI),
 	.DataValid_o	(decimDataValI)

src/src/InternalDsp/CordicNco.v

@@ -90,10 +90,10 @@ module CordicNco
 	assign precompAngle[11] = 32'd333772;
 	assign precompAngle[12] = 32'd166886;
 	assign precompAngle[13] = 32'd83443;
-	assign precompAngle[14] = 32'd41722;
-	assign precompAngle[15] = 32'd20861;
-	assign precompAngle[16] = 32'd10430;
-	assign precompAngle[17] = 32'd5215;
+	// assign precompAngle[14] = 32'd41722;
+	// assign precompAngle[15] = 32'd20861;
+	// assign precompAngle[16] = 32'd10430;
+	// assign precompAngle[17] = 32'd5215;
 	//assign precompAngle[18] = 32'd2608;
 
 	assign	Sin_o	=	WindVal_i	?	sin_o	:	14'h0;

src/src/Sim/DecimFilterWrapperTb.v

@@ -47,13 +47,13 @@ always	#10 Clk50	=	~Clk50;
 
 //==========================================================================================
 
-parameter	N	=	4;
-parameter	M	=	1;
+parameter	N	=	8;
+parameter	M	=	2;
 
 initial begin
 	Clk50		=	1'b1;
 	Rst			=	1'b1;
-	decimFactor	=	3'd4;
+	decimFactor	=	3'd2;
 #100;
 	Rst		=	1'b0;
 end	
@@ -137,7 +137,7 @@ DecimFilterWrapper
 	.AdcDataWidth	(14),
 	.N	(N),
 	.M	(M),
-	.FilteredDataWidth	(30),
+	.FilteredDataWidth	(46),
 	.FirOutDataWidth	(48),
 	.FirOutCutBit		(42)
 )
@@ -151,8 +151,8 @@ DecimFilter
 	.IfFtwL_i		(24'h51eb85),
 	.IfFtwH_i		(24'h23),
 	
-	.AdcData_i		(singlePulse),
-	// .AdcData_i		(sinAdd),
+	// .AdcData_i		(singlePulse),
+	.AdcData_i		(sinAdd),
 	// .AdcData_i		(adcDataMixedCut),
 	
 	.FilteredAdcDataI_o	(resultI),
@@ -220,12 +220,12 @@ parameter	PNum	=	5000;
 
 always	@(posedge	Clk50)	begin
 	if	(Rst)	begin
-		inSignal = $fopen("C:/S5243_FFT_REPO/src/src/Sim/InputSignal.txt'","w");
+		inSignal = $fopen("C:/S5243_FFT_REPO/src/src/Sim/InputSignal.txt","w");
 	end	else	begin
 		if	(oscWind)	begin
 			// $display("AdcData is %d", sinAdd);
-			// $fwrite(inSignal,"%d\n",   sinAdd);
-			$fwrite(inSignal,"%d\n",   singlePulse);
+			$fwrite(inSignal,"%d\n",   sinAdd);
+			// $fwrite(inSignal,"%d\n",   singlePulse);
 		end	
 	end	
 end

src/src/Sim/FilteredData.txt

@@ -0,0 +1,250 @@
+    -1
+   -15
+   -47
+   -42
+   -32
+   -38
+   -14
+   -16
+    -1
+    15
+    13
+    37
+    31
+    41
+    47
+    34
+    46
+    28
+    25
+    20
+    -3
+     2
+   -21
+   -26
+   -29
+   -47
+   -35
+   -49
+   -42
+   -32
+   -38
+   -14
+   -16
+    -1
+    15
+    13
+    37
+    31
+    41
+    47
+    34
+    46
+    28
+    25
+    20
+    -3
+     2
+   -21
+   -26
+   -29
+   -47
+   -35
+   -49
+   -42
+   -32
+   -38
+   -14
+   -16
+    -1
+    15
+    13
+    37
+    31
+    41
+    47
+    34
+    46
+    28
+    25
+    20
+    -3
+     2
+   -21
+   -26
+   -29
+   -47
+   -35
+   -49
+   -42
+   -32
+   -38
+   -14
+   -16
+    -1
+    15
+    13
+    37
+    31
+    41
+    47
+    34
+    46
+    28
+    25
+    20
+    -3
+     2
+   -21
+   -26
+   -29
+   -47
+   -35
+   -49
+   -42
+   -32
+   -38
+   -14
+   -16
+    -1
+    15
+    13
+    37
+    31
+    41
+    47
+    34
+    46
+    28
+    25
+    20
+    -3
+     2
+   -21
+   -26
+   -29
+   -47
+   -35
+   -49
+   -42
+   -32
+   -38
+   -14
+   -16
+    -1
+    15
+    13
+    37
+    31
+    41
+    47
+    34
+    46
+    28
+    25
+    20
+    -3
+     2
+   -21
+   -26
+   -29
+   -47
+   -35
+   -49
+   -42
+   -32
+   -38
+   -14
+   -16
+    -1
+    15
+    13
+    37
+    31
+    41
+    47
+    34
+    46
+    28
+    25
+    20
+    -3
+     2
+   -21
+   -26
+   -29
+   -47
+   -35
+   -49
+   -42
+   -32
+   -38
+   -14
+   -16
+    -1
+    15
+    13
+    37
+    31
+    41
+    47
+    34
+    46
+    28
+    25
+    20
+    -3
+     2
+   -21
+   -26
+   -29
+   -47
+   -35
+   -49
+   -42
+   -32
+   -38
+   -14
+   -16
+    -1
+    15
+    13
+    37
+    31
+    41
+    47
+    34
+    46
+    28
+    25
+    20
+    -3
+     2
+   -21
+   -26
+   -29
+   -47
+   -35
+   -49
+   -42
+   -32
+   -38
+   -14
+   -16
+    -1
+    15
+    13
+    37
+    31
+    41
+    47
+    34
+    46
+    28
+    25
+    20
+    -3
+     2
+   -21
+   -26
+   -29

src/src/Sim/InputSignal.txt

@@ -0,0 +1,500 @@
+ -1157
+ -4468
+ -5448
+ -2680
+   130
+  -722
+ -3827
+ -4610
+ -1656
+  1323
+   617
+ -2356
+ -3034
+     0
+  3033
+  2355
+  -619
+ -1324
+  1655
+  4609
+  3826
+   720
+  -131
+  2679
+  5446
+  4467
+  1156
+    87
+  2679
+  5228
+  4031
+   515
+  -750
+  1655
+  4035
+  2692
+  -956
+ -2326
+    -1
+  2325
+   955
+ -2694
+ -4036
+ -1656
+   749
+  -516
+ -4033
+ -5229
+ -2680
+   -89
+ -1157
+ -4468
+ -5448
+ -2680
+   130
+  -722
+ -3827
+ -4610
+ -1656
+  1323
+   617
+ -2356
+ -3034
+     0
+  3033
+  2355
+  -619
+ -1324
+  1655
+  4609
+  3826
+   720
+  -131
+  2679
+  5446
+  4467
+  1156
+    87
+  2679
+  5228
+  4031
+   515
+  -750
+  1655
+  4035
+  2692
+  -956
+ -2326
+    -1
+  2325
+   955
+ -2694
+ -4036
+ -1656
+   749
+  -516
+ -4033
+ -5229
+ -2680
+   -89
+ -1157
+ -4468
+ -5448
+ -2680
+   130
+  -722
+ -3827
+ -4610
+ -1656
+  1323
+   617
+ -2356
+ -3034
+     0
+  3033
+  2355
+  -619
+ -1324
+  1655
+  4609
+  3826
+   720
+  -131
+  2679
+  5446
+  4467
+  1156
+    87
+  2679
+  5228
+  4031
+   515
+  -750
+  1655
+  4035
+  2692
+  -956
+ -2326
+    -1
+  2325
+   955
+ -2694
+ -4036
+ -1656
+   749
+  -516
+ -4033
+ -5229
+ -2680
+   -89
+ -1157
+ -4468
+ -5448
+ -2680
+   130
+  -722
+ -3827
+ -4610
+ -1656
+  1323
+   617
+ -2356
+ -3034
+     0
+  3033
+  2355
+  -619
+ -1324
+  1655
+  4609
+  3826
+   720
+  -131
+  2679
+  5446
+  4467
+  1156
+    87
+  2679
+  5228
+  4031
+   515
+  -750
+  1655
+  4035
+  2692
+  -956
+ -2326
+    -1
+  2325
+   955
+ -2694
+ -4036
+ -1656
+   749
+  -516
+ -4033
+ -5229
+ -2680
+   -89
+ -1157
+ -4468
+ -5448
+ -2680
+   130
+  -722
+ -3827
+ -4610
+ -1656
+  1323
+   617
+ -2356
+ -3034
+     0
+  3033
+  2355
+  -619
+ -1324
+  1655
+  4609
+  3826
+   720
+  -131
+  2679
+  5446
+  4467
+  1156
+    87
+  2679
+  5228
+  4031
+   515
+  -750
+  1655
+  4035
+  2692
+  -956
+ -2326
+    -1
+  2325
+   955
+ -2694
+ -4036
+ -1656
+   749
+  -516
+ -4033
+ -5229
+ -2680
+   -89
+ -1157
+ -4468
+ -5448
+ -2680
+   130
+  -722
+ -3827
+ -4610
+ -1656
+  1323
+   617
+ -2356
+ -3034
+     0
+  3033
+  2355
+  -619
+ -1324
+  1655
+  4609
+  3826
+   720
+  -131
+  2679
+  5446
+  4467
+  1156
+    87
+  2679
+  5228
+  4031
+   515
+  -750
+  1655
+  4035
+  2692
+  -956
+ -2326
+    -1
+  2325
+   955
+ -2694
+ -4036
+ -1656
+   749
+  -516
+ -4033
+ -5229
+ -2680
+   -89
+ -1157
+ -4468
+ -5448
+ -2680
+   130
+  -722
+ -3827
+ -4610
+ -1656
+  1323
+   617
+ -2356
+ -3034
+     0
+  3033
+  2355
+  -619
+ -1324
+  1655
+  4609
+  3826
+   720
+  -131
+  2679
+  5446
+  4467
+  1156
+    87
+  2679
+  5228
+  4031
+   515
+  -750
+  1655
+  4035
+  2692
+  -956
+ -2326
+    -1
+  2325
+   955
+ -2694
+ -4036
+ -1656
+   749
+  -516
+ -4033
+ -5229
+ -2680
+   -89
+ -1157
+ -4468
+ -5448
+ -2680
+   130
+  -722
+ -3827
+ -4610
+ -1656
+  1323
+   617
+ -2356
+ -3034
+     0
+  3033
+  2355
+  -619
+ -1324
+  1655
+  4609
+  3826
+   720
+  -131
+  2679
+  5446
+  4467
+  1156
+    87
+  2679
+  5228
+  4031
+   515
+  -750
+  1655
+  4035
+  2692
+  -956
+ -2326
+    -1
+  2325
+   955
+ -2694
+ -4036
+ -1656
+   749
+  -516
+ -4033
+ -5229
+ -2680
+   -89
+ -1157
+ -4468
+ -5448
+ -2680
+   130
+  -722
+ -3827
+ -4610
+ -1656
+  1323
+   617
+ -2356
+ -3034
+     0
+  3033
+  2355
+  -619
+ -1324
+  1655
+  4609
+  3826
+   720
+  -131
+  2679
+  5446
+  4467
+  1156
+    87
+  2679
+  5228
+  4031
+   515
+  -750
+  1655
+  4035
+  2692
+  -956
+ -2326
+    -1
+  2325
+   955
+ -2694
+ -4036
+ -1656
+   749
+  -516
+ -4033
+ -5229
+ -2680
+   -89
+ -1157
+ -4468
+ -5448
+ -2680
+   130
+  -722
+ -3827
+ -4610
+ -1656
+  1323
+   617
+ -2356
+ -3034
+     0
+  3033
+  2355
+  -619
+ -1324
+  1655
+  4609
+  3826
+   720
+  -131
+  2679
+  5446
+  4467
+  1156
+    87
+  2679
+  5228
+  4031
+   515
+  -750
+  1655
+  4035
+  2692
+  -956
+ -2326
+    -1
+  2325
+   955
+ -2694
+ -4036
+ -1656
+   749
+  -516
+ -4033
+ -5229
+ -2680
+   -89

src/src/Top/S5243Top.v

@@ -679,20 +679,20 @@ ExternalDspInterface
 	
 	.OscDataRdFlag_o	(oscDataRdFlag),
 	
-	.Adc1ChT1Data_i		(adc1ChT1Data),	
-	.Adc1ChR1Data_i		(adc1ChR1Data),	
-	.Adc2ChR2Data_i		(adc2ChT2Data),	
-	.Adc2ChT2Data_i		(adc2ChR2Data),	
+	// .Adc1ChT1Data_i		(adc1ChT1Data),	
+	// .Adc1ChR1Data_i		(adc1ChR1Data),	
+	// .Adc2ChR2Data_i		(adc2ChT2Data),	
+	// .Adc2ChT2Data_i		(adc2ChR2Data),	
 
 	// .Adc1ChT1Data_i		(AdcData_i),	
 	// .Adc1ChR1Data_i		(AdcData_i),	
 	// .Adc2ChR2Data_i		(AdcData_i),	
 	// .Adc2ChT2Data_i		(AdcData_i),	
 	
-	// .Adc1ChT1Data_i		(14'h1fff),	
-	// .Adc1ChR1Data_i		(14'h257f),	
-	// .Adc2ChR2Data_i		(14'h1001),	
-	// .Adc2ChT2Data_i		(14'h25f8),	
+	.Adc1ChT1Data_i		(ncoCos[NcoWidth-1-:14]),	
+	.Adc1ChR1Data_i		(ncoCos[NcoWidth-1-:14]),	
+	.Adc2ChR2Data_i		(ncoCos[NcoWidth-1-:14]),	
+	.Adc2ChT2Data_i		(ncoCos[NcoWidth-1-:14]),	
 	
 	.Mosi_o				(adcInitMosi),
 	.Sck_o				(adcInitSck),