Bladeren bron

Исправлена ошибка при упаковке децимированного потока.

Shalambala 2 jaren geleden
bovenliggende
commit
72404e6bde

BIN
S5443_M/S5443.srcs/sources_1/ip/MeasDataFifo/MeasDataFifo.dcp


File diff suppressed because it is too large
+ 12458 - 12458
S5443_M/S5443.srcs/sources_1/ip/MeasDataFifo/MeasDataFifo_sim_netlist.v


File diff suppressed because it is too large
+ 13680 - 13680
S5443_M/S5443.srcs/sources_1/ip/MeasDataFifo/MeasDataFifo_sim_netlist.vhdl


+ 3 - 6
S5443_M/S5443.srcs/sources_1/new/MeasDataFifo/OscDataFormer.v

@@ -32,7 +32,7 @@ module OscDataFormer
 	reg	oscDataBusValReg;
 	reg	oscDataBusValRegReg;
 	
-	reg	[DataValCycles-1:0]	cycleCnt;
+	reg	[4-1:0]	cycleCnt;
 	
 	reg	[31:0]	wrDataCnt;
 	wire	wrDone	=	OscWind_i?	(wrDataCnt	==	MeasNum_i):1'b0;
@@ -81,12 +81,9 @@ module OscDataFormer
 	always	@(posedge	Clk_i)	begin
 		if	(!Rst_i)	begin
 			if	(OscWind_i)	begin
-				if	(cycleCnt	!=	DataValCycles-1	&	AdcDataVal_i)	begin
+				if	(AdcDataVal_i)	begin
 					cycleCnt	<=	cycleCnt+4'd1;
 				end
-				if	(cycleCnt	==	DataValCycles-1)	begin
-					cycleCnt	<=	4'd0;
-				end
 			end	else	begin
 				cycleCnt	<=	0;
 			end
@@ -127,7 +124,7 @@ module OscDataFormer
 	
 	always	@(posedge	Clk_i)	begin
 		if	(!Rst_i)	begin
-			if	(cycleCnt	==	DataValCycles-1)	begin
+			if	(cycleCnt	==	DataValCycles-1	&	AdcDataVal_i)	begin
 				oscDataBusValReg	<=	1'b1;
 			end	else	begin
 				oscDataBusValReg	<=	1'b0;

+ 1 - 1
S5443_M/S5443.srcs/sources_1/new/S5443TopSpectrumTb.v

@@ -72,7 +72,7 @@ module S5443TopSpectrumTb;
 	localparam	[1:0]	CURRADCCHANNEL	=	2'b0;
 	//COMMANDS	FOR REG_MAP
 	parameter	[31:0]	MeasCmdBypass	=	{8'h11,8'h0,8'h63,8'h1};
-	parameter	[31:0]	MeasCmdFft 		=	{8'h11,8'h0,8'h63,7'h1,1'b1};
+	parameter	[31:0]	MeasCmdFft 		=	{8'h11,8'h0,8'h63,7'h2,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};
 	parameter	[31:0]	AdcCtrl =	{8'h12,24'h2};