Skip to content

Commit

Permalink
FIX: the unit conversion
Browse files Browse the repository at this point in the history
  • Loading branch information
@ghalym
ghalym committed Oct 19, 2023
1 parent 56a771a commit ee3e0b5
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 49 deletions.
32 changes: 16 additions & 16 deletions lcls-plc-rixs-optics/_Config/PLC/rixs_optics.xti
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@
</SubItem>
</DataType>
<DataType>
<Name GUID="{32A476A9-0D93-49B0-AC33-DB53BFDFEBEB}" Namespace="lcls_twincat_motion" AutoDeleteType="true">EL5042_Status</Name>
<Name GUID="{3AB19797-F134-46A4-913F-427383F8D393}" Namespace="lcls_twincat_motion" AutoDeleteType="true">EL5042_Status</Name>
<BitSize>0</BitSize>
<BaseType GUID="{FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFF}"/>
<Hides>
<Hide GUID="{DAE06558-BF28-4CCF-B9B3-66AEA51A8DEB}"/>
<Hide GUID="{32A476A9-0D93-49B0-AC33-DB53BFDFEBEB}"/>
</Hides>
</DataType>
<DataType>
<Name GUID="{91B6EFD4-A96E-4F39-BC0F-5B1ED0B6691C}" Namespace="lcls_twincat_motion" AutoDeleteType="true">ST_RenishawAbsEnc</Name>
<Name GUID="{AE86CE9C-32E3-4311-9535-05836A2EF921}" Namespace="lcls_twincat_motion" AutoDeleteType="true">ST_RenishawAbsEnc</Name>
<Comment>
<![CDATA[ Renishaw BiSS-C absolute encoder used with an EL5042]]>
</Comment>
Expand All @@ -88,7 +88,7 @@
</SubItem>
<SubItem>
<Name>Status</Name>
<Type GUID="{32A476A9-0D93-49B0-AC33-DB53BFDFEBEB}" Namespace="lcls_twincat_motion">EL5042_Status</Type>
<Type GUID="{3AB19797-F134-46A4-913F-427383F8D393}" Namespace="lcls_twincat_motion">EL5042_Status</Type>
<Comment>
<![CDATA[ Status struct placeholder]]>
</Comment>
Expand All @@ -105,7 +105,7 @@
<BitOffs>64</BitOffs>
</SubItem>
<Hides>
<Hide GUID="{A1AF2E54-2B60-4775-BA9B-752B7A7C2594}"/>
<Hide GUID="{91B6EFD4-A96E-4F39-BC0F-5B1ED0B6691C}"/>
</Hides>
</DataType>
<DataType>
Expand Down Expand Up @@ -1352,7 +1352,7 @@ External Setpoint Generation:
<Comment>
<![CDATA[ Encoders]]>
</Comment>
<Type GUID="{91B6EFD4-A96E-4F39-BC0F-5B1ED0B6691C}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
<Type GUID="{AE86CE9C-32E3-4311-9535-05836A2EF921}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
<SubVar>
<Name>Count</Name>
<Comment>
Expand All @@ -1374,7 +1374,7 @@ External Setpoint Generation:
</Var>
<Var>
<Name>PRG_MR1K1_BEND.M1K1.fbRunHOMS.stYdwnEnc</Name>
<Type GUID="{91B6EFD4-A96E-4F39-BC0F-5B1ED0B6691C}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
<Type GUID="{AE86CE9C-32E3-4311-9535-05836A2EF921}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
<SubVar>
<Name>Count</Name>
<Comment>
Expand All @@ -1396,7 +1396,7 @@ External Setpoint Generation:
</Var>
<Var>
<Name>PRG_MR1K1_BEND.M1K1.fbRunHOMS.stXupEnc</Name>
<Type GUID="{91B6EFD4-A96E-4F39-BC0F-5B1ED0B6691C}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
<Type GUID="{AE86CE9C-32E3-4311-9535-05836A2EF921}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
<SubVar>
<Name>Count</Name>
<Comment>
Expand All @@ -1418,7 +1418,7 @@ External Setpoint Generation:
</Var>
<Var>
<Name>PRG_MR1K1_BEND.M1K1.fbRunHOMS.stXdwnEnc</Name>
<Type GUID="{91B6EFD4-A96E-4F39-BC0F-5B1ED0B6691C}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
<Type GUID="{AE86CE9C-32E3-4311-9535-05836A2EF921}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
<SubVar>
<Name>Count</Name>
<Comment>
Expand Down Expand Up @@ -1648,7 +1648,7 @@ Emergency Stop for MR1K1]]>
<Comment>
<![CDATA[ Encoders]]>
</Comment>
<Type GUID="{91B6EFD4-A96E-4F39-BC0F-5B1ED0B6691C}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
<Type GUID="{AE86CE9C-32E3-4311-9535-05836A2EF921}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
<SubVar>
<Name>Count</Name>
<Comment>
Expand All @@ -1670,7 +1670,7 @@ Emergency Stop for MR1K1]]>
</Var>
<Var>
<Name>PRG_MR1K2_SWITCH.M1K2.fbRunHOMS.stYdwnEnc</Name>
<Type GUID="{91B6EFD4-A96E-4F39-BC0F-5B1ED0B6691C}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
<Type GUID="{AE86CE9C-32E3-4311-9535-05836A2EF921}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
<SubVar>
<Name>Count</Name>
<Comment>
Expand All @@ -1692,7 +1692,7 @@ Emergency Stop for MR1K1]]>
</Var>
<Var>
<Name>PRG_MR1K2_SWITCH.M1K2.fbRunHOMS.stXupEnc</Name>
<Type GUID="{91B6EFD4-A96E-4F39-BC0F-5B1ED0B6691C}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
<Type GUID="{AE86CE9C-32E3-4311-9535-05836A2EF921}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
<SubVar>
<Name>Count</Name>
<Comment>
Expand All @@ -1714,7 +1714,7 @@ Emergency Stop for MR1K1]]>
</Var>
<Var>
<Name>PRG_MR1K2_SWITCH.M1K2.fbRunHOMS.stXdwnEnc</Name>
<Type GUID="{91B6EFD4-A96E-4F39-BC0F-5B1ED0B6691C}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
<Type GUID="{AE86CE9C-32E3-4311-9535-05836A2EF921}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
<SubVar>
<Name>Count</Name>
<Comment>
Expand Down Expand Up @@ -2188,7 +2188,7 @@ External Setpoint Generation:
</Var>
<Var>
<Name>PRG_SP1K1_MONO.mpi_upe</Name>
<Type GUID="{91B6EFD4-A96E-4F39-BC0F-5B1ED0B6691C}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
<Type GUID="{AE86CE9C-32E3-4311-9535-05836A2EF921}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
<SubVar>
<Name>Count</Name>
<Comment>
Expand All @@ -2210,7 +2210,7 @@ External Setpoint Generation:
</Var>
<Var>
<Name>PRG_SP1K1_MONO.gpi_upe</Name>
<Type GUID="{91B6EFD4-A96E-4F39-BC0F-5B1ED0B6691C}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
<Type GUID="{AE86CE9C-32E3-4311-9535-05836A2EF921}" Namespace="lcls_twincat_motion">ST_RenishawAbsEnc</Type>
<SubVar>
<Name>Count</Name>
<Comment>
Expand Down Expand Up @@ -8718,8 +8718,8 @@ External Setpoint Generation:
<TaskPouOids>
<TaskPouOid Prio="19" OTCID="#x08502004"/>
<TaskPouOid Prio="1" OTCID="#x08502001"/>
<TaskPouOid Prio="20" OTCID="#x08502003"/>
<TaskPouOid Prio="3" OTCID="#x08502002"/>
<TaskPouOid Prio="20" OTCID="#x08502003"/>
</TaskPouOids>
</Instance>
</Project>
Expand Down
2 changes: 1 addition & 1 deletion lcls-plc-rixs-optics/rixs_optics/POUs/PRG_ZeroOrder_PMPS.TcPOU
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ ffZeroOrderBeamExitSlits(io_fbFFHWO := GVL_PMPS.fbFastFaultOutput1);]]></ST>
</Action>
<Action Name="ACT_LRG_Grating_IN" Id="{8babb51d-911c-461c-99fc-bb1adfccc9fe}">
<Implementation>
<ST><![CDATA[bLRG_Grating_IN := ((M9.stAxisStatus.fActPosition) >= 36000) AND ((M9.stAxisStatus.fActPosition/1000) <= 43000);]]></ST>
<ST><![CDATA[bLRG_Grating_IN := ((M9.stAxisStatus.fActPosition) >= 36000) AND ((M9.stAxisStatus.fActPosition) <= 43000);]]></ST>
</Implementation>
</Action>
<Action Name="ACT_ZOS_IN" Id="{ea635b1c-413a-4430-b9a8-7a35a57ab8c1}">
Expand Down
64 changes: 32 additions & 32 deletions lcls-plc-rixs-optics/rixs_optics/rixs_optics.tmc
View file

Large diffs are not rendered by default.

0 comments on commit ee3e0b5

Please sign in to comment.