FIX: Library versions

pcdshub · Mar 19, 2024 · c286fd5 · c286fd5
1 parent fef649c
commit c286fd5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/PLC_QRIX_VAC.plcproj b/lcls-plc-qrix-vac/lcls-plc-qrix-vac/PLC_QRIX_VAC/PLC_QRIX_VAC.plcproj
@@ -130,13 +130,13 @@
   </ItemGroup>
   <ItemGroup>
     <PlaceholderResolution Include="LCLS General">
-      <Resolution>LCLS General, * (SLAC)</Resolution>
+      <Resolution>LCLS General, 2.10.0 (SLAC)</Resolution>
     </PlaceholderResolution>
     <PlaceholderResolution Include="LCLS Vacuum">
       <Resolution>LCLS Vacuum, 2.3.0 (SLAC - LCLS)</Resolution>
     </PlaceholderResolution>
     <PlaceholderResolution Include="LCLSVacuumSerialDriverLib">
-      <Resolution>LCLSVacuumSerialDriverLib, * (SLAC - LCLS)</Resolution>
+      <Resolution>LCLSVacuumSerialDriverLib, 1.2.2 (SLAC - LCLS)</Resolution>
     </PlaceholderResolution>
     <PlaceholderResolution Include="PMPS">
       <Resolution>PMPS, 2.1.0 (SLAC - LCLS)</Resolution>

diff --git a/lcls-plc-qrix-vac/lcls-plc-qrix-vac/_Config/PLC/PLC_QRIX_VAC.xti b/lcls-plc-qrix-vac/lcls-plc-qrix-vac/_Config/PLC/PLC_QRIX_VAC.xti
@@ -1255,6 +1255,13 @@
 					</Comment>
 					<Type GUID="{B2093238-7A67-422D-8EEF-49CE8F36A81D}" Namespace="Tc2_SerialCom">EL6inData22B</Type>
 				</Var>
+				<Var>
+					<Name>GVL_Devices.qRIXS_SA_GCP_02.i_iPRESS_R</Name>
+					<Comment>
+						<![CDATA[ input Pressure // Link to analog Input]]>
+					</Comment>
+					<Type>INT</Type>
+				</Var>
 				<Var>
 					<Name>GVL_Devices.qRIXS_ROUGH_GPI_03.i_iPRESS_R</Name>
 					<Comment>
@@ -1746,6 +1753,7 @@
 			<OwnerB Name="TIID^Device 1 (EtherCAT)^B950_233_WALL_S_DRL_05^EL3174-0002_02_13">
 				<Link VarA="CommTask Inputs^GVL_Devices.qRIXS_ROUGH_GPI_03.i_iPRESS_R" VarB="AI Standard Channel 2^Value" AutoLink="true"/>
 				<Link VarA="CommTask Inputs^GVL_Devices.qRIXS_ROUGH_GPI_04.i_iPRESS_R" VarB="AI Standard Channel 3^Value" AutoLink="true"/>
+				<Link VarA="CommTask Inputs^GVL_Devices.qRIXS_SA_GCP_02.i_iPRESS_R" VarB="AI Standard Channel 2^Value" AutoLink="true"/>
 				<Link VarA="CommTask Inputs^GVL_Devices.qRIXS_SDS_GPI_01.i_iPRESS_R" VarB="AI Standard Channel 1^Value" AutoLink="true"/>
 			</OwnerB>
 			<OwnerB Name="TIID^Device 1 (EtherCAT)^qRIXS_PNL1_E0_EK1100^qRIXS_PNL1_E1_EL1004">