FIX: Crystal gap limit switch inputs for the new unit.

pcdshub · Jan 5, 2024 · 9abb5dd · 9abb5dd
1 parent 2ae380f
commit 9abb5dd
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/lcls-plc-rixs-optics/_Config/NC/NC.xti b/lcls-plc-rixs-optics/_Config/NC/NC.xti
@@ -1363,16 +1363,16 @@ External Setpoint Generation:
 		<Axis Id="19" CreateSymbols="true" AxisType="1" AxisFolder="SL1K2">
 			<Name>SL1K2-Pitch-M19</Name>
 			<AxisPara>
-				<General UnitName="mrad"/>
+				<General UnitName="Degree"/>
 				<Dynamic Acceleration="0.836849" Deceleration="0.836849" Jerk="2.80127"/>
 				<Velo SlowManual="1" FastManual="2" Maximum="0.25"/>
 				<TargetPosControl Range="0.001"/>
 				<OtherSettings AllowMotionCmdToSlave="true" PulseDistancePos="0.5" PulseDistanceNeg="0.5"/>
 			</AxisPara>
 			<Encoder Name="Enc" EncType="29">
 				<EncPara ScaleFactorNumerator="7.1573649e-08" Offset="-2.626" MaxCount="#xffffffff">
-					<SoftEndMinControl Enable="true" Range="-3.7"/>
-					<SoftEndMaxControl Enable="true" Range="3"/>
+					<SoftEndMinControl Enable="true" Range="-1.9"/>
+					<SoftEndMaxControl Enable="true" Range="1.9"/>
 					<Inc RefSoftSyncMask="#x0000ffff"/>
 				</EncPara>
 				<Vars VarGrpType="1">
@@ -1513,8 +1513,8 @@ External Setpoint Generation:
 			</AxisPara>
 			<Encoder Name="Enc" EncType="29">
 				<EncPara ScaleFactorNumerator="1e-06" Offset="-9.6565" MaxCount="#xffffffff">
-					<SoftEndMinControl Enable="true" Range="-4.15"/>
-					<SoftEndMaxControl Enable="true" Range="3.15"/>
+					<SoftEndMinControl Enable="true" Range="-5"/>
+					<SoftEndMaxControl Enable="true" Range="5"/>
 					<Inc RefSoftSyncMask="#x0000ffff"/>
 				</EncPara>
 				<Vars VarGrpType="1">
@@ -1647,7 +1647,7 @@ External Setpoint Generation:
 		<Axis Id="21" CreateSymbols="true" AxisType="1" AxisFolder="SL1K2">
 			<Name>SL1K2-Roll-M21</Name>
 			<AxisPara>
-				<General UnitName="mrad"/>
+				<General UnitName="Degree"/>
 				<Dynamic Acceleration="1.83017" Deceleration="1.83017" Jerk="6.09002"/>
 				<Velo SlowManual="0.3" FastManual="1" Maximum="0.55"/>
 				<PositionAreaControl Range="0.2"/>
@@ -1656,8 +1656,8 @@ External Setpoint Generation:
 			</AxisPara>
 			<Encoder Name="Enc" EncType="29">
 				<EncPara ScaleFactorNumerator="1.54151668e-07" Offset="-5.269" MaxCount="#xffffffff">
-					<SoftEndMinControl Enable="true" Range="-4.82"/>
-					<SoftEndMaxControl Enable="true" Range="6.22"/>
+					<SoftEndMinControl Enable="true" Range="-4.7"/>
+					<SoftEndMaxControl Enable="true" Range="4.7"/>
 					<Inc RefSoftSyncMask="#x0000ffff"/>
 				</EncPara>
 				<Vars VarGrpType="1">
@@ -1799,7 +1799,7 @@ External Setpoint Generation:
 			<Encoder Name="Enc" EncType="29">
 				<EncPara ScaleFactorNumerator="1e-06" Offset="-20.3002" MaxCount="#xffffffff">
 					<SoftEndMinControl Enable="true" Range="0.02"/>
-					<SoftEndMaxControl Enable="true" Range="8.65"/>
+					<SoftEndMaxControl Enable="true" Range="11"/>
 					<Inc RefSoftSyncMask="#x0000ffff"/>
 				</EncPara>
 				<Vars VarGrpType="1">
@@ -1942,8 +1942,8 @@ External Setpoint Generation:
 			</AxisPara>
 			<Encoder Name="Enc" EncType="29">
 				<EncPara ScaleFactorNumerator="1e-06" Offset="-13.8017" MaxCount="#xffffffff">
-					<SoftEndMinControl Enable="true" Range="-0.59"/>
-					<SoftEndMaxControl Enable="true" Range="41.6"/>
+					<SoftEndMinControl Enable="true"/>
+					<SoftEndMaxControl Enable="true" Range="45"/>
 					<Inc RefSoftSyncMask="#x0000ffff"/>
 				</EncPara>
 				<Vars VarGrpType="1">

diff --git a/lcls-plc-rixs-optics/lcls-plc-rixs-optics.tsproj b/lcls-plc-rixs-optics/lcls-plc-rixs-optics.tsproj
@@ -13,8 +13,8 @@
 					<ManualSelect>{BF78CFC7-2E63-42C3-8C07-BB6C346BFB8B}</ManualSelect>
 					<ManualSelect>{3EBB9639-5FF3-42B6-8847-35C70DC013C8}</ManualSelect>
 					<TargetSelect TargetId="2">{BF78CFC7-2E63-42C3-8C07-BB6C346BFB8B}</TargetSelect>
-					<TargetSelect TargetId="2">{BCA6EE0A-9CE1-4D3F-98CA-413ABC0D94FD}</TargetSelect>
 					<TargetSelect TargetId="2">{66689887-CCBD-452C-AC9A-039D997C6E66}</TargetSelect>
+					<TargetSelect TargetId="2">{BCA6EE0A-9CE1-4D3F-98CA-413ABC0D94FD}</TargetSelect>
 					<TargetSelect TargetId="2">{3EBB9639-5FF3-42B6-8847-35C70DC013C8}</TargetSelect>
 					<TargetSelect TargetId="2">{777F1598-583B-4503-99BB-7C02E0ABD97E}</TargetSelect>
 					<TargetSelect TargetId="2">{520DE751-9DB6-47CB-8240-BD5C466E7E64}</TargetSelect>

diff --git a/lcls-plc-rixs-optics/rixs_optics/GVLs/Main.TcGVL b/lcls-plc-rixs-optics/rixs_optics/GVLs/Main.TcGVL
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4022.18">
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.12">
   <GVL Name="Main" Id="{70c05a97-6edf-41f6-937c-0e62f3a09f50}">
     <Declaration><![CDATA[VAR_GLOBAL
 (*
@@ -184,8 +184,8 @@
     '}
     M21 : DUT_MotionStage := (sName:= 'SL1K2:EXIT:MMS:ROLL',fVelocity :=0.24); // Air Roll
 
-    {attribute 'TcLinkTo' := '.bLimitForwardEnable:=TIIB[EL7047_SL1K2_GAP]^STM Status^Status^Digital input 2;
-                              .bLimitBackwardEnable:=TIIB[EL7047_SL1K2_GAP]^STM Status^Status^Digital input 1;
+    {attribute 'TcLinkTo' := '.bLimitForwardEnable:=TIIB[EL7047_SL1K2_GAP]^STM Status^Status^Digital input 1;
+                              .bLimitBackwardEnable:=TIIB[EL7047_SL1K2_GAP]^STM Status^Status^Digital input 2;
                               .nRawEncoderULINT      := TIIB[EL5042_SL1K2_ROLL_GAP]^FB Inputs Channel 2^Position'}
     {attribute 'pytmc' := '
         pv: SL1K2:EXIT:MMS:GAP