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

src/src/FftDataFiltering/DecimFilterWrapper.v

@@ -76,7 +76,7 @@ module	DecimFilterWrapper
 	
 	wire	[39:0]	firData;
 	wire	firDataVal;
-	wire	bypassData = (DecimFactor_i==3'd0 | DecimFactor_i==3'd1);
+	wire	bypassFlag = (DecimFactor_i==3'd0 | DecimFactor_i==3'd1);
 	
 	wire	[17:0]	adcExtData	=	{{extendBitNum{AdcData_i[AdcDataWidth-1]}},AdcData_i};
 	
@@ -90,8 +90,8 @@ module	DecimFilterWrapper
 //================================================================================
 	assign oscWindVal = !coefDataVal&OscWind_i;
 
-	assign FilteredAdcDataI_o	=	decimData;
-	assign FilteredDataVal_o	=	decimDataVal;
+	assign FilteredAdcDataI_o	=	(bypassFlag)? adcExtData[LsbForR1-1-:16]:decimData[17-:16];
+	assign FilteredDataVal_o	=	(bypassFlag)? OscWind_i:decimDataVal;
 
 //================================================================================
 //	CODING

src/src/FftDataFiltering/RomCtrl.v

@@ -32,7 +32,7 @@ module RomCtrl
 	input Clk_i,
 	input Rst_i,
 	input OscWind_i,
-	input CoefDataVal_o,
+	output CoefDataVal_o,
 	input [2:0]	DecimFactor_i,
 	output [OutWidth-1:0] CoefAddr_o
 );

src/src/Sim/CicTest.m

@@ -12,6 +12,11 @@ xDecim = 1:1:PointsNum/R;
 Fs = 50;
 ff = 0:1/PointsNum*2:1-1/PointsNum*2;
 
+Cw = 18;
+N=65;
+
+Bfir = Cw + ceil(log2(N))
+
 ReadInDataId = fopen('C:/S5243_FFT_REPO/src/src/Sim/InputSignal.txt','r');
 InDataSignal = fscanf(ReadInDataId,FormatSpec);
 fclose(ReadInDataId);
@@ -104,4 +109,3 @@ figure('name','Cic Calc and Cic Real', 'Numbertitle', 'off')
 
 
 
-

src/src/Sim/DecimFilterWrapperTb.v

@@ -121,7 +121,7 @@ end
 always	@(posedge	Clk50)	begin
 	if	(!Rst)	begin
 		if (tbCnt == 100) begin
-			decimFactor	<=	7;
+			decimFactor	<=	1;
 		end
 	end else begin
 	 decimFactor <= 0;

src/src/Top/S5243Top.v

@@ -679,15 +679,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),