Przeglądaj źródła

Убраны коментарии

ChStepan 9 miesięcy temu
rodzic
commit
ecd3db61c9

Plik diff jest za duży
+ 0 - 70
src/constrs/S5243Top.xdc


+ 5 - 4
src/src/Sim/S5243TopPulseProfileTb.v

@@ -70,13 +70,13 @@ 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'h53,8'h1};
 	// 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'h0,8'h53,8'h0};
 	// parameter	[31:0]	MeasCmd =	{8'h11,8'h3e,8'h63,8'h0};
 	parameter	[31:0]	AdcCtrl =	{8'h12,24'h2};
 	parameter	[31:0]	SensCtrlCmd =	{1'b0,27'h0,4'b1};
-	// parameter	[31:0]	DitherCmd 	= {8'h0E,24'h100192};
+	//parameter	[31:0]	DitherCmd 	= {8'h0E,24'h100192};
 	parameter	[31:0]	DitherCmd 	= {8'h0E,8'd9,4'h0,4'h1,4'd11,4'h3};
 	parameter	[31:0]	IfFtwH 	=	{8'h15,16'h0,8'h40};
 	parameter	[31:0]	IfFtwL 	=	{8'h16,24'h000000};
@@ -420,7 +420,8 @@ end
 always	@(posedge	Clk41)	begin
 	if	(txCurrState	==	CMD)	begin
 		if	(cmdCnt	==	0)	begin
-			DspSpiData		<=	MeasCmdBypass;
+			//DspSpiData		<=	MeasCmdBypass;
+			DspSpiData		<=	MeasCmd;
 		end	else	if	(cmdCnt	==	1)	begin
 			DspSpiData		<=	IfFtwH;
 		end	else	if	(cmdCnt	==	2)	begin

+ 1 - 19
src/src/Top/S5243Top.v

@@ -591,7 +591,7 @@ Clk200Gen	Clk200Gen
     .Rst_i			(initRst),
 	.Clk200_o		(refClk),
 	.Clk10Timers_o	(TimersClk_o),
-	.Clk150_o		(windClk150),
+	.Clk150_o		(),
 	
 	.Locked_o		(Locked200)
 );
@@ -683,16 +683,6 @@ ExternalDspInterface
 	.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),	
 	
 	.Mosi_o				(adcInitMosi),
 	.Sck_o				(adcInitSck),
@@ -767,11 +757,6 @@ InternalDsp
 	.Adc2ChR2Data_i		(adc2ChR2Data),	//R2
 	.Adc2ChT2Data_i		(adc2ChT2Data),	//T2
 	
-	// .Adc1ChT1Data_i		(AdcData_i),	//T1
-	// .Adc1ChR1Data_i		(AdcData_i),	//R1
-	// .Adc2ChR2Data_i		(AdcData_i),	//R2
-	// .Adc2ChT2Data_i		(AdcData_i),	//T2
-	
 	.GatingPulse_i		(gatingPulse),
 	
 	.StartMeas_i		(measStart),
@@ -996,7 +981,6 @@ generate
 		.NcoCos_i			(ncoCos),
 		
 		.AdcData_i			(adcDataBus[g]),
-		// .AdcData_i			(AdcData_i),
 		
 		.GainLowThreshold_i	(gainLowThresholdBus[g]),
 		.GainHighThreshold_i(gainHighThresholdBus[g]),
@@ -1127,7 +1111,6 @@ MeasStartEventGen	IntTrig2GenInst
 	.Clk_i				(gclk),
 	
 	.MeasTrig_i			(trigForIntTrig2),
-	// .StartMeasDsp_i		(startMeasEvent),
 	.StartMeasDsp_i		(intTrig1),
 	
 	.StartMeasEvent_o	(),
@@ -1185,7 +1168,6 @@ PulseGenNew
 PulseGenerator
 (
 	.Rst_i			(initRst|pGenRst[j]|pGenMeasRst[j]),
-	// .Rst_i			(initRst|pGenRst[j]),
 	.Clk_i			(gclk),
 	.EnPulse_i		(pgMuxedOut[j]),