MNT: rebuild with minor optics lib change

pcdshub · Feb 8, 2024 · 3e6956b · 3e6956b
1 parent 97dc6ea
commit 3e6956b
Show file tree

Hide file tree

Showing 2 changed files with 226 additions and 211 deletions.
diff --git a/lcls-plc-tmo-optics/_Config/PLC/tmo_optics.xti b/lcls-plc-tmo-optics/_Config/PLC/tmo_optics.xti
@@ -1349,7 +1349,7 @@ External Setpoint Generation:
 		</DataType>
 	</DataTypes>
 	<Project GUID="{7FA5AD82-8B94-448C-8921-86A608467E2A}" Name="tmo_optics" PrjFilePath="..\..\tmo_optics\tmo_optics.plcproj" TmcFilePath="..\..\tmo_optics\tmo_optics.tmc" ReloadTmc="true" AmsPort="851" FileArchiveSettings="#x000e" SymbolicMapping="true">
-		<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="tmo_optics\tmo_optics.tmc" TmcHash="{49F5DB7F-00FD-F0E0-D5F9-510EEC9E7FF9}">
+		<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="tmo_optics\tmo_optics.tmc" TmcHash="{2546BD08-7CD4-7267-B94D-6D2E786212F0}">
 			<Name>tmo_optics Instance</Name>
 			<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
 			<Vars VarGrpType="1">
@@ -2530,6 +2530,10 @@ External Setpoint Generation:
  M2K4 US RTDs]]></Comment>
 					<Type>INT</Type>
 				</Var>
+				<Var>
+					<Name>GVL_M2K4_RTD.nM2K4US_RTD_2</Name>
+					<Type>INT</Type>
+				</Var>
 				<Var>
 					<Name>PRG_PMPS.fbArbiterIO.i_stCurrentBP</Name>
 					<Type GUID="{292CD354-C7C0-4A61-AAD0-1C85DD69646B}">ST_BeamParams_IO</Type>
@@ -2578,23 +2582,19 @@ External Setpoint Generation:
 					<Type>INT</Type>
 				</Var>
 				<Var>
-					<Name>GVL_M2K4_RTD.nM2K4US_RTD_2</Name>
+					<Name>GVL_M2K4_RTD.nM2K4US_RTD_3</Name>
 					<Type>INT</Type>
 				</Var>
 				<Var>
-					<Name>GVL_M2K4_RTD.nM2K4US_RTD_3</Name>
+					<Name>GVL_M2K4_RTD.nM2K4DS_RTD_1</Name>
+					<Comment><![CDATA[ M2K4 DS RTDs]]></Comment>
 					<Type>INT</Type>
 				</Var>
 				<Var>
 					<Name>GVL_M1K4.M1K4_Pitch.diEncCnt</Name>
 					<Comment><![CDATA[Raw encoder count]]></Comment>
 					<Type>LINT</Type>
 				</Var>
-				<Var>
-					<Name>GVL_M2K4_RTD.nM2K4DS_RTD_1</Name>
-					<Comment><![CDATA[ M2K4 DS RTDs]]></Comment>
-					<Type>INT</Type>
-				</Var>
 				<Var>
 					<Name>GVL_M2K4_RTD.nM2K4DS_RTD_2</Name>
 					<Type>INT</Type>
@@ -3041,10 +3041,6 @@ External Setpoint Generation:
 					<Name>Main.fbMotionStageM24.fbDriveVirtual.MasterAxis.PlcToNc</Name>
 					<Type GUID="{96B75FEB-2D84-43BE-A3EC-D9A681F27D52}" Namespace="MC">PLCTONC_AXIS_REF</Type>
 				</Var>
-				<Var>
-					<Name>PRG_MR1K4_SOMS.bActivateVarCool</Name>
-					<Type>BOOL</Type>
-				</Var>
 				<Var>
 					<Name>PRG_PMPS.fbArbiterIO.q_stRequestedBP</Name>
 					<Type GUID="{292CD354-C7C0-4A61-AAD0-1C85DD69646B}">ST_BeamParams_IO</Type>
@@ -3057,6 +3053,10 @@ External Setpoint Generation:
 					<Name>GVL_PMPS.g_FastFaultOutput2.q_xFastFaultOut</Name>
 					<Type>BOOL</Type>
 				</Var>
+				<Var>
+					<Name>PRG_MR1K4_SOMS.bActivateVarCool</Name>
+					<Type>BOOL</Type>
+				</Var>
 			</Vars>
 			<Vars VarGrpType="8" ContextId="2" AreaNo="36">
 				<Name>PlcTask Retains</Name>