Убран функционал связанный с режимом осциллографа и fft.

src/src/ExtDspInterface/DspInterface.v

@@ -285,10 +285,10 @@ MeasDataFifoInst
 	.MeasNum_i		(MeasNum_i),	
 	.StartMeasDsp_i	(StartMeasDsp_i),	
 	.DspReadyForRx_i(DspReadyForRx_i),	
-	// .MeasDataBus_i	(measDataBus),
-	.MeasDataBus_i	(dataForFifo),
-	// .MeasDataVal_i	(LpOutStart_i),	
-	.MeasDataVal_i	(dataForFifoVal),	
+	.MeasDataBus_i	(measDataBus),
+	// .MeasDataBus_i	(dataForFifo),
+	.MeasDataVal_i	(LpOutStart_i),	
+	// .MeasDataVal_i	(dataForFifoVal),	
 	
 	.MeasDataBus_o	(measDataBusTx),
 	.MeasDataVal_o	(measDataValTx)

src/src/MeasDataFifo/MeasDataFifoWrapper.v

@@ -23,12 +23,8 @@ module MeasDataFifoWrapper
 //  REG/WIRE
 //================================================================================
 
-	wire	fullFlagExt;
-	wire	emptyFlagExt;
-	
 	wire	fullFlag;
 	wire	emptyFlag;
-	
 	wire	wrEn;
 	wire	rdEn;
 
@@ -47,8 +43,6 @@ module MeasDataFifoWrapper
 	reg		[13:0]	rdCnt;
 	wire	rstOr;
 	
-	wire	[DataWidth*(ChNum*2)-1:0]	measDataBus;
-	wire	writeEn	=	!(emptyFlagExt|fullFlag);
 //================================================================================
 //  ASSIGNMENTS
 //================================================================================
@@ -77,24 +71,12 @@ always	@(posedge	Clk_i)	begin
 	end
 end
 
-MeasDataFifoExtender	MeasDataFifoExtender
+MeasDataFifo	MeasDataFifoInst
 (
 	.clk	(Clk_i),
 	.srst	(Rst_i|startMeasDspPos),
 	.din	(MeasDataBus_i),
 	.wr_en	(wrEn),
-	.rd_en	(writeEn),
-	.dout	(measDataBus),
-	.full	(fullFlagExt),
-	.empty	(emptyFlagExt)
-);
-
-MeasDataFifo	MeasDataFifo
-(
-	.clk	(Clk_i),
-	.srst	(Rst_i|startMeasDspPos),
-	.din	(measDataBus),
-	.wr_en	(writeEn),
 	.rd_en	(rdEn),
 	.dout	(MeasDataBus_o),
 	.full	(fullFlag),
@@ -102,7 +84,7 @@ MeasDataFifo	MeasDataFifo
 );
 
   
-FifoController	FifoController
+FifoController	FifoControllerInst
 (
 	.Clk_i				(Clk_i), 
 	.Rst_i				(Rst_i|startMeasDspPos),	
@@ -110,7 +92,7 @@ FifoController	FifoController
 	.PpiBusy_i			(PpiBusy_i),	
 	.MeasNum_i			(MeasNum_i),	
 	.MeasDataVal_i		(MeasDataVal_i),
-	.FullFlag_i			(fullFlagExt),
+	.FullFlag_i			(fullFlag),
 	.EmptyFlag_i		(emptyFlag),
 	
 	.MeasDataVal_o		(),