Добавляются мультиплексоры для сигналов модуляторов, для каждого из AM.

S5444_M/src/src/InternalDsp/InternalDsp.v

@@ -318,7 +318,7 @@ CordicNco
 	.IterNum	(13),
 	.EnSinN		(0)
 )
-ncoInstFirstTone
+ncoFirstTone
 (
 	.Clk_i		(Clk_i),
 	.Rst_i		(Rst_i|NcoRst_i),
@@ -339,7 +339,7 @@ CordicNco
 	.IterNum	(13),
 	.EnSinN		(0)
 )
-ncoInstSecondTone
+ncoSecondTone
 (
 	.Clk_i		(Clk_i),
 	.Rst_i		(Rst_i|NcoRst_i),

S5444_M/src/src/RegMap/RegMap.v

@@ -168,8 +168,8 @@ module	RegMap
 	localparam	AdcDirectRd1RegAddr		=	7'h14;
 	localparam	IfFtw1RegHAddr			=	7'h15;
 	localparam	IfFtw1RegLAddr			=	7'h16;
-	localparam	IfFtw2RegHAddr			=	7'h19;
-	localparam	IfFtw2RegLAddr			=	7'h1a;
+	localparam	IfFtw2RegHAddr			=	7'hc;
+	localparam	IfFtw2RegLAddr			=	7'hd;
 	localparam	FilterCorrCoefHAddr		=	7'h17;
 	localparam	FilterCorrCoefLAddr		=	7'h18;
 	localparam	ActivePortSelAddr		=	7'h19;	
@@ -553,6 +553,7 @@ module	RegMap
 					IfFtw2RegHAddr:			begin
 												ifFtw2RegH	<=	Data_i	[CmdDataRegWith-1:0];
 											end
+											
 					FilterCorrCoefLAddr:	begin
 												filterCorrCoefRegL	<=	Data_i	[CmdDataRegWith-1:0];
 											end
@@ -791,6 +792,8 @@ module	RegMap
 			adcDirectRd1Reg		<=	{CmdDataRegWith{1'b0}};
 			ifFtw1RegL			<=	{CmdDataRegWith{1'b0}};
 			ifFtw1RegH			<=	{CmdDataRegWith{1'b0}};
+			ifFtw2RegL			<=	{CmdDataRegWith{1'b0}};
+			ifFtw2RegH			<=	{CmdDataRegWith{1'b0}};
 			filterCorrCoefRegL	<=	{CmdDataRegWith{1'b0}};
 			filterCorrCoefRegH	<=	{CmdDataRegWith{1'b0}};
 			activePortSelReg	<=	{CmdDataRegWith{1'b0}};

S5444_M/src/src/Top/S5443Top.v

@@ -221,10 +221,10 @@ module	S5443Top
 	wire	[CmdDataRegWith-1:0]	adcCtrl;
 	wire	[CmdDataRegWith-1:0]	adcDirectRd0;
 	wire	[CmdDataRegWith-1:0]	adcDirectRd1;
-	wire	[CmdDataRegWith-1:0]	ifF1twL;
-	wire	[CmdDataRegWith-1:0]	ifF1twH;
-	wire	[CmdDataRegWith-1:0]	ifF2twL;
-	wire	[CmdDataRegWith-1:0]	ifF2twH;
+	wire	[CmdDataRegWith-1:0]	ifFtw1L;
+	wire	[CmdDataRegWith-1:0]	ifFtw1H;	
+	wire	[CmdDataRegWith-1:0]	ifFtw2L;
+	wire	[CmdDataRegWith-1:0]	ifFtw2H;
 	wire	[CmdDataRegWith-1:0]	measCtrl;
 	wire	[CmdDataRegWith-1:0]	amplitudeMod;
 	wire	[CmdDataRegWith-1:0]	activePortSel;
@@ -714,8 +714,8 @@ ExternalDspInterface
 	.Mode_i				(measCtrl[0]),
 	.PortSel_i			(measCtrl[23:22]),
 	.DecimFactor_i		(measCtrl[3:1]),
-	.IfFtwL_i			(ifF1twL),
-	.IfFtwH_i			(ifF1twH),
+	.IfFtwL_i			(ifFtw1L),
+	.IfFtwH_i			(ifFtw1H),
 	
 	.OscDataRdFlag_o	(oscDataRdFlag),
 	
@@ -762,7 +762,7 @@ NcoRstGen	NcoRstGenInst
 (
 	.Clk_i				(gclk),
 	.Rst_i				(initRst),
-	.NcoPhInc_i			({ifF1twH[0+:PhIncWidth-CmdDataRegWith],ifF1twL}),
+	.NcoPhInc_i			({ifFtw1H[0+:PhIncWidth-CmdDataRegWith],ifFtw1L}),
 	.StartMeasEvent_i	(startMeasEvent),
 	
 	.NcoRst_o			(ncoRst),
@@ -784,15 +784,15 @@ InternalDsp
 	.NcoRst_i				(ncoRst),
 	.OscWind_o				(oscWind),
 
-	.Adc1ChT1Data_i			(adc1ChT1Data),	//T1
-	.Adc1ChR1Data_i			(adc1ChR1Data),	//R1
-	.Adc2ChR2Data_i			(adc2ChR2Data),	//R2
-	.Adc2ChT2Data_i			(adc2ChT2Data),	//T2
+	// .Adc1ChT1Data_i			(adc1ChT1Data),	//T1
+	// .Adc1ChR1Data_i			(adc1ChR1Data),	//R1
+	// .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
+	.Adc1ChT1Data_i			(AdcData_i),	//T1
+	.Adc1ChR1Data_i			(AdcData_i),	//R1
+	.Adc2ChR2Data_i			(AdcData_i),	//R2
+	.Adc2ChT2Data_i			(AdcData_i),	//T2
 
 	.GatingPulse_i			(gatingPulse),
 
@@ -809,11 +809,10 @@ InternalDsp
 	.CalModeEn_i			(adcCtrl[1]),
 	.CalModeDone_o			(calDone),
 
-	.IfFtw1L_i				(ifF1twL),
-	.IfFtw1H_i				(ifF1twH),
-	
-	.IfFtw2L_i				(ifF2twL),
-	.IfFtw2H_i				(ifF2twH),
+	.IfFtw1L_i				(ifFtw1L),
+	.IfFtw1H_i				(ifFtw1H),
+	.IfFtw2L_i				(ifFtw2L),
+	.IfFtw2H_i				(ifFtw2H),
 	
 	.NcoSin_o				(ncoSin),
 	.NcoCos_o				(ncoCos),
@@ -873,10 +872,10 @@ RegMapInst
 	.AdcCtrlReg_o			(adcCtrl),
 	.AdcDirectRd0Reg_o		(adcDirectRd0),
 	.AdcDirectRd1Reg_o		(adcDirectRd1),
-	.IfFtw1RegL_o			(ifF1twL),
-	.IfFtw1RegH_o			(ifF1twH),
-	.IfFtw2RegL_o			(ifF2twL),
-	.IfFtw2RegH_o			(ifF2twH),
+	.IfFtw1RegL_o			(ifFtw1L),
+	.IfFtw1RegH_o			(ifFtw1H),
+	.IfFtw2RegL_o			(ifFtw2L),
+	.IfFtw2RegH_o			(ifFtw2H),
 	.FilterCorrCoefRegL_o	(filterCorrCoefL),
 	.FilterCorrCoefRegH_o	(filterCorrCoefH),
 	.ActivePortSel_o		(activePortSel),