浏览代码

Поправлена логика выбора канала сбора данных для FFT.

Shalambala 2 年之前
父节点
当前提交
a0252b6ed7

文件差异内容过多而无法显示
+ 13 - 11
S5443_M/S5443.srcs/constrs_1/new/S5443Top.xdc


二进制
S5443_M/S5443.srcs/sources_1/ip/MeasDataFifo/MeasDataFifo.dcp


文件差异内容过多而无法显示
+ 12458 - 12458
S5443_M/S5443.srcs/sources_1/ip/MeasDataFifo/MeasDataFifo_sim_netlist.v


文件差异内容过多而无法显示
+ 13680 - 13680
S5443_M/S5443.srcs/sources_1/ip/MeasDataFifo/MeasDataFifo_sim_netlist.vhdl


+ 4 - 37
S5443_M/S5443.srcs/sources_1/new/ExtDspInterface/DspInterface.v

@@ -182,16 +182,16 @@ always	@(posedge	Clk_i)	begin
 		case(PortSel_i)
 			0:	begin
 					// currDataChannel	<=	testDataChannel;
-					currDataChannel	<=	Adc2ChT2Data_i;
+					currDataChannel	<=	Adc2ChT2Data_i;		//Device T3
 				end
 			1:	begin
-					currDataChannel	<=	Adc2ChR2Data_i;
+					currDataChannel	<=	Adc2ChR2Data_i;		//Device R3
 				end
 			2:	begin
-					currDataChannel	<=	Adc1ChT1Data_i;
+					currDataChannel	<=	Adc1ChT1Data_i;		//Device T4
 				end
 			3:	begin
-					currDataChannel	<=	Adc1ChR1Data_i;
+					currDataChannel	<=	Adc1ChR1Data_i;		//Device R4
 				end
 		endcase
 	end	else	begin
@@ -229,39 +229,6 @@ DspSlaveSpi
 	.Miso_o		(Miso_o)
 );
 
-// DecimFilterWrapper	DecimFilter
-// (
-	// .Clk_i			(Clk_i),
-	// .Rst_i			(Rst_i),
-	// .OscWind_i		(OscWind_i),
-	// .DecimFactor_i	(DecimFactor_i),
-	
-	// .IfFtwL_i		(IfFtwL_i),
-	// .IfFtwH_i		(IfFtwH_i),
-	
-	// .AdcData_i		(currDataChannel),
-	// .TestData_o		(testData),
-	
-	// .FilteredAdcDataI_o	(filteredDecimDataI),
-	// .FilteredAdcDataQ_o	(filteredDecimDataQ),
-	// .FilteredDataVal_o	(filteredDecimDataVal)
-// );
-
-// FftDataFormer	FftDataFormerInst
-// (
-	// .Clk_i				(Clk_i), 
-	// .Rst_i				(Rst_i),	
-	// .OscWind_i			(OscWind_i),
-	// .MeasNum_i			(MeasNum_i),
-	
-	// .AdcData_i			({filteredDecimDataI,filteredDecimDataQ}),
-	// .AdcData_i			({testPatternData,testPatternData}),
-	// .AdcDataVal_i		(filteredDecimDataVal),
-	
-	// .OscDataBus_o		(fftDataBus),
-	// .OscDataBusVal_o	(fftDataBusVal)
-// );
-
 decimBlock	
 #(	
 	.inOutDataWidth	(14),

+ 1 - 1
S5443_M/S5443.srcs/sources_1/new/PulseMeas/PulseGenV2.v

@@ -18,7 +18,7 @@
 // Additional Comments: 
 //
 //////////////////////////////////////////////////////////////////////////////////
-module	PulseGen	
+module	PulseGenV2	
 #(	
 	parameter	CmdRegWidth	=	32
 )