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

src/src/FftDataFiltering/DecimFilterWrapperTest.v

@@ -22,7 +22,7 @@ module	DecimFilterWrapperTest
 #(	
 	parameter	AdcDataWidth		=	14,
 	parameter	N	=	8,
-	parameter	M	=	2,
+	parameter	M	=	1,
 	parameter	FilteredDataWidth	=	32,
 	parameter	FirOutDataWidth		=	48,
 	parameter	FirOutCutBit		=	42,

src/src/FftDataFiltering/cicFilterTest.v

@@ -55,10 +55,27 @@ generate
 		);
 	end	
 	
+	decimBlock
+	#(	
+		// .R	(R),
+		.inOutDataWidth	(filteredDataWidth),
+		.decimCntWidth	(decimCntWidth)
+	)
+	decimBlockInst
+	(
+		.Clk_i			(Clk_i),
+		.Rst_i			(Rst_i),
+		.DecimFactor_i	(DecimFactor_i),
+		.Data_i			(intFilteredData[N-1]),
+		.DataNd_i		(intFilteredDataValid[N-1]),
+		.Data_o			(decimIntData),
+		.DataValid_o	(decimIntDataValid)
+	);
+	
 	for (j=0; j<N; j=j+1)	begin: CombFilterGen
 	
-		assign	combInData	[j]	=	(j==0)?intFilteredData[N-1]:combFilteredData[j-1];
-		assign	combDataVal	[j]	=	(j==0)?intFilteredDataValid[N-1]:combFilteredDataVal[j-1];
+		assign	combInData	[j]	=	(j==0)?decimIntData:combFilteredData[j-1];
+		assign	combDataVal	[j]	=	(j==0)?decimIntDataValid:combFilteredDataVal[j-1];
 		
 		combFilterWrapper
 		#(
@@ -77,25 +94,11 @@ generate
 		);
 	end
 	
-	decimBlock
-	#(	
-		// .R	(R),
-		.inOutDataWidth	(filteredDataWidth),
-		.decimCntWidth	(decimCntWidth)
-	)
-	decimBlockInst
-	(
-		.Clk_i			(Clk_i),
-		.Rst_i			(Rst_i),
-		.DecimFactor_i	(DecimFactor_i),
-		.Data_i			(combFilteredData[N-1]),
-		.DataNd_i		(combFilteredDataVal[N-1]),
-		.Data_o			(decimIntData),
-		.DataValid_o	(decimIntDataValid)
-	);
+	
 		
 endgenerate
 
-assign	Data_o	=	decimIntData;
-assign	DataValid_o	=	decimIntDataValid;
+assign	Data_o	=	combFilteredData[N-1];
+assign	DataValid_o	=	combFilteredDataVal[N-1];
+
 endmodule

src/src/FftDataFiltering/combFilterBlock.v

@@ -50,7 +50,7 @@ generate
 				dataValid	<=	1'b1;
 			end	else	begin
 				dataValid	<=	1'b0;
-				sumResult	<=	0;
+				// sumResult	<=	0;
 			end
 		end	else	begin
 			sumResult	<=	0;

src/src/Sim/FilteredData.txt

@@ -1,250 +0,0 @@
- 30960
--10368
- 31424
- -9864
- 16808
--23184
- 27528
--30633
- 31651
--30731
- 27401
--23312
- 16680
- -9992
-  1784
-  5696
--13832
- 19672
--25968
- 29129
--31451
- 31251
--29377
- 25712
--19928
- 13576
- -5952
- -2040
-  9736
--16936
- 23056
--27656
- 30503
--31837
- 30405
--27783
- 22928
--17064
-  9608
- -2168
- -6080
- 13448
--20056
- 25584
--29511
- 31125
--31437
- 29247
--25840
- 19800
--13704
-  5824
-  1912
- -9864
- 16808
--23184
- 27528
--30633
- 31651
--30731
- 27401
--23312
- 16680
- -9992
-  1784
-  5696
--13832
- 19672
--25968
- 29129
--31451
- 31251
--29377
- 25712
--19928
- 13576
- -5952
- -2040
-  9736
--16936
- 23056
--27656
- 30503
--31837
- 30405
--27783
- 22928
--17064
-  9608
- -2168
- -6080
- 13448
--20056
- 25584
--29511
- 31125
--31437
- 29247
--25840
- 19800
--13704
-  5824
-  1912
- -9864
- 16808
--23184
- 27528
--30633
- 31651
--30731
- 27401
--23312
- 16680
- -9992
-  1784
-  5696
--13832
- 19672
--25968
- 29129
--31451
- 31251
--29377
- 25712
--19928
- 13576
- -5952
- -2040
-  9736
--16936
- 23056
--27656
- 30503
--31837
- 30405
--27783
- 22928
--17064
-  9608
- -2168
- -6080
- 13448
--20056
- 25584
--29511
- 31125
--31437
- 29247
--25840
- 19800
--13704
-  5824
-  1912
- -9864
- 16808
--23184
- 27528
--30633
- 31651
--30731
- 27401
--23312
- 16680
- -9992
-  1784
-  5696
--13832
- 19672
--25968
- 29129
--31451
- 31251
--29377
- 25712
--19928
- 13576
- -5952
- -2040
-  9736
--16936
- 23056
--27656
- 30503
--31837
- 30405
--27783
- 22928
--17064
-  9608
- -2168
- -6080
- 13448
--20056
- 25584
--29511
- 31125
--31437
- 29247
--25840
- 19800
--13704
-  5824
-  1912
- -9864
- 16808
--23184
- 27528
--30633
- 31651
--30731
- 27401
--23312
- 16680
- -9992
-  1784
-  5696
--13832
- 19672
--25968
- 29129
--31451
- 31251
--29377
- 25712
--19928
- 13576
- -5952
- -2040
-  9736
--16936
- 23056
--27656
- 30503
--31837
- 30405
--27783
- 22928
--17064
-  9608
- -2168
- -6080
- 13448
--20056
- 25584
--29511
- 31125
--31437
- 29247
--25840
- 19800

src/src/Sim/ImpResp.txt

@@ -1,250 +0,0 @@
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-       8191
-     229348
-     573370
-     229348
-       8191
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0
-          0

src/src/Sim/InputSignal.txt

@@ -1,500 +0,0 @@
-  3870
-     0
- -3810
-     0
-  3508
-     0
- -2989
-     0
-  2278
-     0
- -1429
-     0
-   487
-     0
-   487
-    -1
- -1429
-    -1
-  2278
-    -1
- -2989
-    -1
-  3508
-    -1
- -3810
-    -1
-  3870
-    -1
- -3689
-    -1
-  3271
-    -1
- -2657
-    -1
-  1866
-    -1
-  -964
-    -1
-     0
-     0
-   963
-     0
- -1867
-     0
-  2656
-     0
- -3272
-     0
-  3688
-     0
- -3871
-     0
-  3809
-     0
- -3509
-     0
-  2988
-     0
- -2279
-     0
-  1428
-     0
-  -488
-     0
-  -488
-    -1
-  1428
-    -1
- -2279
-    -1
-  2988
-    -1
- -3509
-    -1
-  3809
-    -1
- -3871
-    -1
-  3688
-    -1
- -3272
-    -1
-  2656
-    -1
- -1867
-    -1
-   963
-    -1
-    -1
-     0
-  -964
-     0
-  1866
-     0
- -2657
-     0
-  3271
-     0
- -3689
-     0
-  3870
-     0
- -3810
-     0
-  3508
-     0
- -2989
-     0
-  2278
-     0
- -1429
-     0
-   487
-     0
-   487
-    -1
- -1429
-    -1
-  2278
-    -1
- -2989
-    -1
-  3508
-    -1
- -3810
-    -1
-  3870
-    -1
- -3689
-    -1
-  3271
-    -1
- -2657
-    -1
-  1866
-    -1
-  -964
-    -1
-     0
-     0
-   963
-     0
- -1867
-     0
-  2656
-     0
- -3272
-     0
-  3688
-     0
- -3871
-     0
-  3809
-     0
- -3509
-     0
-  2988
-     0
- -2279
-     0
-  1428
-     0
-  -488
-     0
-  -488
-    -1
-  1428
-    -1
- -2279
-    -1
-  2988
-    -1
- -3509
-    -1
-  3809
-    -1
- -3871
-    -1
-  3688
-    -1
- -3272
-    -1
-  2656
-    -1
- -1867
-    -1
-   963
-    -1
-    -1
-     0
-  -964
-     0
-  1866
-     0
- -2657
-     0
-  3271
-     0
- -3689
-     0
-  3870
-     0
- -3810
-     0
-  3508
-     0
- -2989
-     0
-  2278
-     0
- -1429
-     0
-   487
-     0
-   487
-    -1
- -1429
-    -1
-  2278
-    -1
- -2989
-    -1
-  3508
-    -1
- -3810
-    -1
-  3870
-    -1
- -3689
-    -1
-  3271
-    -1
- -2657
-    -1
-  1866
-    -1
-  -964
-    -1
-     0
-     0
-   963
-     0
- -1867
-     0
-  2656
-     0
- -3272
-     0
-  3688
-     0
- -3871
-     0
-  3809
-     0
- -3509
-     0
-  2988
-     0
- -2279
-     0
-  1428
-     0
-  -488
-     0
-  -488
-    -1
-  1428
-    -1
- -2279
-    -1
-  2988
-    -1
- -3509
-    -1
-  3809
-    -1
- -3871
-    -1
-  3688
-    -1
- -3272
-    -1
-  2656
-    -1
- -1867
-    -1
-   963
-    -1
-    -1
-     0
-  -964
-     0
-  1866
-     0
- -2657
-     0
-  3271
-     0
- -3689
-     0
-  3870
-     0
- -3810
-     0
-  3508
-     0
- -2989
-     0
-  2278
-     0
- -1429
-     0
-   487
-     0
-   487
-    -1
- -1429
-    -1
-  2278
-    -1
- -2989
-    -1
-  3508
-    -1
- -3810
-    -1
-  3870
-    -1
- -3689
-    -1
-  3271
-    -1
- -2657
-    -1
-  1866
-    -1
-  -964
-    -1
-     0
-     0
-   963
-     0
- -1867
-     0
-  2656
-     0
- -3272
-     0
-  3688
-     0
- -3871
-     0
-  3809
-     0
- -3509
-     0
-  2988
-     0
- -2279
-     0
-  1428
-     0
-  -488
-     0
-  -488
-    -1
-  1428
-    -1
- -2279
-    -1
-  2988
-    -1
- -3509
-    -1
-  3809
-    -1
- -3871
-    -1
-  3688
-    -1
- -3272
-    -1
-  2656
-    -1
- -1867
-    -1
-   963
-    -1
-    -1
-     0
-  -964
-     0
-  1866
-     0
- -2657
-     0
-  3271
-     0
- -3689
-     0
-  3870
-     0
- -3810
-     0
-  3508
-     0
- -2989
-     0
-  2278
-     0
- -1429
-     0
-   487
-     0
-   487
-    -1
- -1429
-    -1
-  2278
-    -1
- -2989
-    -1
-  3508
-    -1
- -3810
-    -1
-  3870
-    -1
- -3689
-    -1
-  3271
-    -1
- -2657
-    -1
-  1866
-    -1
-  -964
-    -1
-     0
-     0
-   963
-     0
- -1867
-     0
-  2656
-     0
- -3272
-     0
-  3688
-     0
- -3871
-     0
-  3809
-     0
- -3509
-     0
-  2988
-     0
- -2279
-     0
-  1428
-     0
-  -488
-     0
-  -488
-    -1
-  1428
-    -1
- -2279
-    -1
-  2988
-    -1
- -3509
-    -1
-  3809
-    -1
- -3871
-    -1
-  3688
-    -1
- -3272
-    -1
-  2656
-    -1
- -1867
-    -1
-   963
-    -1
-    -1
-     0
-  -964
-     0
-  1866
-     0
- -2657
-     0
-  3271
-     0
- -3689
-     0

src/src/Sim/S5243TopPulseProfileTb.v

@@ -70,7 +70,7 @@ module S5243TopPulseProfileTb;
 	localparam	[4:0]	SMPLSTRBMUXCMD	=	5'd3;
 	
 	//COMMANDS	FOR REG_MAP
-	parameter	[31:0]	MeasCmdBypass	=	{8'h11,8'h0,8'h63,8'h1};
+	parameter	[31:0]	MeasCmdBypass	=	{8'h11,8'h0,8'h63,8'h9};
 	// parameter	[31:0]	MeasCmdFft 		=	{8'h11,8'h0,8'h63,7'h5,1'b1};
 	// parameter	[31:0]	MeasCmd 		=	{8'h11,8'h0,8'h53,8'h0};
 	// parameter	[31:0]	MeasCmd =	{8'h11,8'h3e,8'h63,8'h0};
@@ -180,8 +180,12 @@ module S5243TopPulseProfileTb;
 	reg	[31:0]	DspSpiData;
 	reg		startCalcCmdReg;
 						
-	wire	[17:0]	cos_value;	
-	wire	[17:0]	sin_value;				
+	wire	signed [13:0]	ncoSin1;	
+	wire	signed [13:0]	ncoSin2;			
+
+	wire	signed [14:0] mixedSignal = ncoSin1+ncoSin2;
+	
+	wire	[13:0] mixedSignalCut = mixedSignal[14-:14];
 
 	wire	ExtDspTrigPos0	=	(tb_cnt	>=	180	&&	tb_cnt	<=	181)?	1'b1:1'b0;
 	wire	ExtDspTrigNeg0	=	(tb_cnt	>=	180	&&	tb_cnt	<=	181)?	1'b0:1'b1;
@@ -256,27 +260,45 @@ end
 wire	Adc1DataDa0P;
 wire	Adc1DataDa1P;
 
-// wire	[31:0]	test	=	32'h2351eb85;
-wire	[31:0]	test	=	32'h40000000;
+wire	[31:0]	ncoPhInc1	=	32'h051eb851;
+wire	[31:0]	ncoPhInc2	=	32'h33333333;
 CordicNco		
-#(	.ODatWidth	(18),
+#(	.ODatWidth	(14),
 	.PhIncWidth	(32),
 	.IterNum	(10),
 	.EnSinN		(0))
-ncoInst
+ncoInst1
 (
 	.Clk_i				(Clk50),
 	.Rst_i				(rst),
 	.Val_i				(1'b1),
-	.PhaseInc_i			(test),
+	.PhaseInc_i			(ncoPhInc1),
 	.WindVal_i			(1'b1),
 	.WinType_i			(),
 	.Wind_o				(),
-	.Sin_o				(sin_value),
-	.Cos_o				(cos_value),
+	.Sin_o				(ncoSin1),
+	.Cos_o				(),
 	.Val_o				()
 );
 
+CordicNco		
+#(	.ODatWidth	(14),
+	.PhIncWidth	(32),
+	.IterNum	(10),
+	.EnSinN		(0))
+ncoInst2
+(
+	.Clk_i				(Clk50),
+	.Rst_i				(rst),
+	.Val_i				(1'b1),
+	.PhaseInc_i			(ncoPhInc2),
+	.WindVal_i			(1'b1),
+	.WinType_i			(),
+	.Wind_o				(),
+	.Sin_o				(ncoSin2),
+	.Cos_o				(),
+	.Val_o				()
+);
 
 S5243Top MasterFpga 
 (
@@ -360,8 +382,8 @@ S5243Top MasterFpga
 	//gain lines
 	.DspReadyForRx_i		(1'b0),
 	.AmpEn_o				(),	//	0-adc1ChA 1-adc1ChB 2-adc2ChA 3-adc2ChB
-	.AdcData_i				(sin_value[17-:14])
-	// .AdcData_i			(Data_i)
+	// .AdcData_i				(mixedSignal)
+	.AdcData_i			(mixedSignalCut)
 );
 
 parameter	IDLE	=	2'h0;

src/src/Top/S5243Top.v

@@ -684,15 +684,15 @@ ExternalDspInterface
 	
 	.OscDataRdFlag_o	(oscDataRdFlag),
 	
-	.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		(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		(sinAdd),	
 	// .Adc1ChR1Data_i		(sinAdd),