瀏覽代碼

Актуализация FPGA_S проекта.

ChStepan 1 年之前
父節點
當前提交
ae841ab68d
共有 1 個文件被更改,包括 29 次插入3 次删除
  1. 29 3
      S5444_M/src/src/InternalDsp/InternalDsp.v

+ 29 - 3
S5444_M/src/src/InternalDsp/InternalDsp.v

@@ -382,7 +382,7 @@ generate
 			.CalibratedAdcData_o	(calAdcData[g])
 		);
 		
-		if	(g==2||g==ChNum-1)	begin
+		if	(g==1)	begin
 			GrDelModeMux	
 			#(	
 				.AdcDataWidth	(CorrAdcDataWidth),
@@ -395,7 +395,7 @@ generate
 				.MuxCtrl_i	(grDelayMeasFlag),
 	
 				.AdcDataOrig_i	(gatedAdcDataBus[g]),
-				.AdcDataGrDel_i	(gatedAdcDataBus[g-2]),
+				.AdcDataGrDel_i	(gatedAdcDataBus[g-1]),
 				
 				.NcoSinOrig_i	(ncoSinFirstTone),
 				.NcoCosOrig_i	(ncoCosFirstTone),
@@ -408,7 +408,33 @@ generate
 			);	
 		end
 		
-		if (g==2||g==ChNum-1) begin
+		if	(g==2)	begin
+			GrDelModeMux	
+			#(	
+				.AdcDataWidth	(CorrAdcDataWidth),
+				.NcoDataWidth	(NcoWidth)
+			)
+			GrDelModeMux
+			(
+				.Rst_i	(Rst_i),
+				
+				.MuxCtrl_i	(grDelayMeasFlag),
+	
+				.AdcDataOrig_i	(gatedAdcDataBus[g]),
+				.AdcDataGrDel_i	(gatedAdcDataBus[g+1]),
+				
+				.NcoSinOrig_i	(ncoSinFirstTone),
+				.NcoCosOrig_i	(ncoCosFirstTone),
+				.NcoSinGrDel_i	(ncoSinSecondTone),
+				.NcoCosGrDel_i	(ncoCosSecondTone),
+				
+				.MuxAdcData_o	(AdcDataBusMuxed[g]),
+				.MuxNcoSin_o	(ncoSinMuxedTone[g]),
+				.MuxNcoCos_o	(ncoCosMuxedTone[g])
+			);	
+		end
+		
+		if (g==1||g==2) begin
 			DspPipeline	
 			#(	
 				.AdcDataWidth		(AdcDataWidth),