浏览代码

Код поправлен, чтобы соответствовать регистровой карте (команде MeasCtrl). Добавлен актуальный документ с описанием регистровой карты.

ChStepan 1 年之前
父节点
当前提交
33f3790c7a
共有 3 个文件被更改,包括 69 次插入24 次删除
  1. 二进制
      S5444_M/XC5445_GrDelMeas_plus_port_sel_reg_.xlsx
  2. 56 11
      S5444_M/src/constrs/S5443Top.xdc
  3. 13 13
      S5444_M/src/src/Top/S5443Top.v

二进制
S5444_M/XC5445_GrDelMeas_plus_port_sel_reg_.xlsx


文件差异内容过多而无法显示
+ 56 - 11
S5444_M/src/constrs/S5443Top.xdc


+ 13 - 13
S5444_M/src/src/Top/S5443Top.v

@@ -577,19 +577,19 @@ module	S5443Top
 	assign	PortSel_o	[3:2] 	=	slowModOut[ChNum-3]	? activePortSel[5:4]:2'b0;
 	assign	PortSel_o	[1:0] 	=	slowModOut[ChNum-4]	? activePortSel[1:0]:2'b0;
 
-	assign	Trig6to1Dir_o	[0]	=	!measCtrl[18];
-	assign	Trig6to1Dir_o	[1]	=	!measCtrl[19];
-	assign	Trig6to1Dir_o	[2]	=	!measCtrl[20];
-	assign	Trig6to1Dir_o	[3]	=	!measCtrl[21];
-	assign	Trig6to1Dir_o	[4]	=	!measCtrl[22];
-	assign	Trig6to1Dir_o	[5]	=	!measCtrl[23];
-	
-	assign	Trig6to1_io	[0]	=	(measCtrl[18])	?	1'bz:extPortsMuxedOut[0];	//1 - in, 0 - out
-	assign	Trig6to1_io	[1]	=	(measCtrl[19])	?	1'bz:extPortsMuxedOut[1];	//1 - in, 0 - out
-	assign	Trig6to1_io	[2]	=	(measCtrl[20])	?	1'bz:extPortsMuxedOut[2];	//1 - in, 0 - out
-	assign	Trig6to1_io	[3]	=	(measCtrl[21])	?	1'bz:extPortsMuxedOut[3];	//1 - in, 0 - out
-	assign	Trig6to1_io	[4]	=	(measCtrl[22])	?	1'bz:extPortsMuxedOut[4];	//1 - in, 0 - out
-	assign	Trig6to1_io	[5]	=	(measCtrl[23])	?	1'bz:extPortsMuxedOut[5];	//1 - in, 0 - out
+	assign	Trig6to1Dir_o	[0]	=	!measCtrl[16];
+	assign	Trig6to1Dir_o	[1]	=	!measCtrl[17];
+	assign	Trig6to1Dir_o	[2]	=	!measCtrl[18];
+	assign	Trig6to1Dir_o	[3]	=	!measCtrl[19];
+	assign	Trig6to1Dir_o	[4]	=	!measCtrl[20];
+	assign	Trig6to1Dir_o	[5]	=	!measCtrl[21];
+	
+	assign	Trig6to1_io	[0]	=	(measCtrl[16])	?	1'bz:extPortsMuxedOut[0];	//1 - in, 0 - out
+	assign	Trig6to1_io	[1]	=	(measCtrl[17])	?	1'bz:extPortsMuxedOut[1];	//1 - in, 0 - out
+	assign	Trig6to1_io	[2]	=	(measCtrl[18])	?	1'bz:extPortsMuxedOut[2];	//1 - in, 0 - out
+	assign	Trig6to1_io	[3]	=	(measCtrl[19])	?	1'bz:extPortsMuxedOut[3];	//1 - in, 0 - out
+	assign	Trig6to1_io	[4]	=	(measCtrl[20])	?	1'bz:extPortsMuxedOut[4];	//1 - in, 0 - out
+	assign	Trig6to1_io	[5]	=	(measCtrl[21])	?	1'bz:extPortsMuxedOut[5];	//1 - in, 0 - out
 	
 	assign	DspReadyForRxToFpgaS_o	=	dspReadyForRxRegR;
 	assign	StartMeasDsp_o	=	startMeasSyncR;