Skip to content

Commit

Permalink
Merge pull request #110 from ghalym/xs-v2
Browse files Browse the repository at this point in the history
WIP: SL1K2 New Unit.
  • Loading branch information
nrwslac authored Jan 12, 2024
2 parents 87051f9 + 9abb5dd commit 7ef8c9c
Show file tree
Hide file tree
Showing 17 changed files with 1,250 additions and 94,172 deletions.
18 changes: 9 additions & 9 deletions GratingMonoScope/VSSettings/.vsm
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<Children>
<Node>
<Title>Scope YT NC Project</Title>
<Expanded>True</Expanded>
<FileName>C:\Users\nrw\plcprojs\lcls-plc-rixs-optics\GratingMonoScope\Scope YT NC Project.tcscopex</FileName>
<Expanded>False</Expanded>
<FileName>C:\Users\mghaly\Documents\Github local\lcls-plc-rixs-optics\GratingMonoScope\Scope YT NC Project.tcscopex</FileName>
<Children>
<Node>
<Title>DataPool</Title>
<Expanded>True</Expanded>
<Expanded>False</Expanded>
<FileName></FileName>
<Children>
<Node>
Expand Down Expand Up @@ -65,12 +65,12 @@
</Node>
<Node>
<Title>Grating NC</Title>
<Expanded>True</Expanded>
<Expanded>False</Expanded>
<FileName></FileName>
<Children>
<Node>
<Title>Encoder Counts Diff</Title>
<Expanded>True</Expanded>
<Expanded>False</Expanded>
<FileName></FileName>
<Children>
<Node>
Expand All @@ -83,7 +83,7 @@
</Node>
<Node>
<Title>Position absolute</Title>
<Expanded>True</Expanded>
<Expanded>False</Expanded>
<FileName></FileName>
<Children>
<Node>
Expand All @@ -102,7 +102,7 @@
</Node>
<Node>
<Title>Velocity</Title>
<Expanded>True</Expanded>
<Expanded>False</Expanded>
<FileName></FileName>
<Children>
<Node>
Expand All @@ -121,7 +121,7 @@
</Node>
<Node>
<Title>Acceleration</Title>
<Expanded>True</Expanded>
<Expanded>False</Expanded>
<FileName></FileName>
<Children>
<Node>
Expand All @@ -140,7 +140,7 @@
</Node>
<Node>
<Title>Position Lag</Title>
<Expanded>True</Expanded>
<Expanded>False</Expanded>
<FileName></FileName>
<Children>
<Node>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<TcSmItem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmItem" TcSmVersion="1.0" TcVersion="3.1.4022.30" ClassName="CFlbTermDef" SubType="9099">
<?xml version="1.0"?>
<TcSmItem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4024.35" ClassName="CFlbTermDef" SubType="9099">
<ImageDatas>
<ImageData Id="1000">424dd6020000000000003600000028000000100000000e0000000100180000000000a0020000c40e0000c40e00000000000000000000ff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080808080808080808080808080808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0000000c0c0c0000000808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c000bfff00bfffc0c0c0808080c0c0c000ffffc0c0c000ffff808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c000bfff00bfffc0c0c0808080c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c000bfff00bfffc0c0c0808080c0c0c0000000c0c0c0000000808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0ff0000c0c0c0ff0000808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0000000c0c0c0000000808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c000bfff00bfffc0c0c0808080c0c0c00000ffc0c0c00000ff808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c000bfff00bfffc0c0c0808080c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c000bfff00bfffc0c0c0808080c0c0c0000000c0c0c0000000808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0008000c0c0c0008000808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ffff00ffff00ffff00ff</ImageData>
</ImageDatas>
Expand Down Expand Up @@ -43,9 +43,12 @@
<Box File="EL3201_SL1K2_4.xti" Id="137">
<EtherCAT PortABoxInfo="#x01000088"/>
</Box>
<Box File="EL2004_SL1K2.xti" Id="138">
<Box File="EL3052_SL1K2_FSW.xti" Id="227">
<EtherCAT PortABoxInfo="#x01000089"/>
</Box>
<Box File="EL2004_SL1K2.xti" Id="138">
<EtherCAT PortABoxInfo="#x010000e3"/>
</Box>
<Box File="EL4004_SL1K2.xti" Id="57">
<EtherCAT PortABoxInfo="#x0100008a"/>
</Box>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
<?xml version="1.0"?>
<TcSmItem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4024.35" ClassName="CFlbTermDef" SubType="9099">
<DataTypes>
<DataType>
<Name GUID="{18071995-0000-0000-0000-002000000001}" IecBaseType="true" AutoDeleteType="true" HideSubItems="true">ARRAY [0..0] OF BIT</Name>
<BitSize>1</BitSize>
<BaseType GUID="{18071995-0000-0000-0000-000000000010}">BIT</BaseType>
<ArrayInfo>
<LBound>0</LBound>
<Elements>1</Elements>
</ArrayInfo>
</DataType>
<DataType>
<Name GUID="{18071995-0000-0000-0000-002000000006}" IecBaseType="true" AutoDeleteType="true" HideSubItems="true">ARRAY [0..5] OF BIT</Name>
<BitSize>6</BitSize>
<BaseType GUID="{18071995-0000-0000-0000-000000000010}">BIT</BaseType>
<ArrayInfo>
<LBound>0</LBound>
<Elements>6</Elements>
</ArrayInfo>
</DataType>
</DataTypes>
<ImageDatas>
<ImageData Id="1000">424dd6020000000000003600000028000000100000000e0000000100180000000000a0020000c40e0000c40e00000000000000000000ff00ffff00ffff00ffff00ffff00ffff00ff808080808080808080808080808080ff00ffff00ffff00ffff00ffff00ffff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0000000c0c0c0000000808080ff00ffff00ffff00ffff00ffff00ffff00ffff00ffff00ffff00ffff00ffff00ffc0c0c000ffffc0c0c000ffff808080ff00ffff00ffff00ffff00ffff00ffff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ffff00ffff00ffff00ffff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0000000c0c0c0000000808080ff00ffff00ffff00ffff00ffff00ffff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0ff0000c0c0c0ff0000808080ff00ffff00ffff00ffff00ffff00ffff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ffff00ffff00ffff00ff00ff0000ff0000ff0000ff0000ff0000ff00c0c0c0000000c0c0c0000000808080ff00ffff00ffff00ffff00ffff00ff00ff0000ff0000ff0000ff0000ff0000ff00c0c0c00000ffc0c0c00000ff808080ff00ffff00ffff00ffff00ffff00ff00ff0000ff0000ff0000ff0000ff0000ff00c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ffff00ffff00ffff00ff00ff0000ff0000ff0000ff0000ff0000ff00c0c0c0000000c0c0c0000000808080ff00ffff00ffff00ffff00ffff00ff00ff0000ff0000ff0000ff0000ff0000ff00c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ffff00ffff00ffff00ff00ff0000ff0000ff0000ff0000ff0000ff00c0c0c0008000c0c0c0008000808080ff00ffff00ffff00ffff00ffff00ff00ff0000ff0000ff0000ff0000ff0000ff00c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ffff00ffff00ffff00ff</ImageData>
</ImageDatas>
<Box Id="227" BoxType="9099" BoxFlags="#x00000020">
<Name>__FILENAME__</Name>
<ImageId>1000</ImageId>
<EtherCAT SlaveType="2" PdiType="#x0405" MboxDataLinkLayer="true" StateMBoxPolling="true" CycleMBoxPollingTime="0" CoeType="7" FoeType="1" VendorId="#x00000002" ProductCode="#x0bec3052" RevisionNo="#x00150000" InfoDataAddr="true" TimeoutMailbox2="2000" CheckRevisionNoType="3" PortPhys="51" SdoUploadWithMaxLength="true" MaxSlotCount="256" MaxSlotGroupCount="1" SlotPdoIncrement="1" SlotIndexIncrement="16" Type="EL3052 2Ch. Ana. Input 4-20mA" Desc="EL3052">
<SyncMan>001080002600010001000000800080008000001026010000</SyncMan>
<SyncMan>801080002200010002000000800080008000801022010000</SyncMan>
<SyncMan>001100000400000003000000000000000000001104000000</SyncMan>
<SyncMan>801108002000010004000000000000000800801120010000</SyncMan>
<Fmmu>0000000000000000801100010100000002000000000000000000000000000000</Fmmu>
<Fmmu>00000000000000000d0800010100000003000000000000000000000000000000</Fmmu>
<BootStrapData>0010f400f410f400</BootStrapData>
<Pdo Name="AI Standard Channel 1" Index="#x1a00" Flags="#x0010" SyncMan="3">
<ExcludePdo>#x1a01</ExcludePdo>
<Entry Name="Status__Underrange" Index="#x6000" Sub="#x01">
<Type>BIT</Type>
<Comment><![CDATA[Underrange event active]]></Comment>
</Entry>
<Entry Name="Status__Overrange" Index="#x6000" Sub="#x02">
<Type>BIT</Type>
<Comment><![CDATA[Overrange event active]]></Comment>
</Entry>
<Entry Name="Status__Limit 1" Index="#x6000" Sub="#x03">
<Type>BIT2</Type>
<Comment><![CDATA[Bit0: Value smaller/equal Limit1
Bit1: Value bigger/equal Limit1]]></Comment>
</Entry>
<Entry Name="Status__Limit 2" Index="#x6000" Sub="#x05">
<Type>BIT2</Type>
<Comment><![CDATA[Bit0: Value smaller/equal Limit2
Bit1: Value bigger/equal Limit2]]></Comment>
</Entry>
<Entry Name="Status__Error" Index="#x6000" Sub="#x07">
<Type>BIT</Type>
<Comment><![CDATA[Bit set when Over- or Underrange]]></Comment>
</Entry>
<Entry Name="Status__">
<Type GUID="{18071995-0000-0000-0000-002000000001}">ARRAY [0..0] OF BIT</Type>
</Entry>
<Entry Name="Status__">
<Type GUID="{18071995-0000-0000-0000-002000000006}">ARRAY [0..5] OF BIT</Type>
</Entry>
<Entry Name="Status__TxPDO State" Index="#x6000" Sub="#x0f">
<Type>BIT</Type>
<Comment><![CDATA[TRUE when this TxPDO is not valid]]></Comment>
</Entry>
<Entry Name="Status__TxPDO Toggle" Index="#x6000" Sub="#x10">
<Type>BIT</Type>
<Comment><![CDATA[Bit toggles everytime when new value available]]></Comment>
</Entry>
<Entry Name="Value" Index="#x6000" Sub="#x11" Flags="#x00040000">
<Type>INT</Type>
</Entry>
</Pdo>
<Pdo Name="AI Compact Channel 1" Index="#x1a01" Flags="#x0010">
<ExcludePdo>#x1a00</ExcludePdo>
<Entry Name="Value" Index="#x6000" Sub="#x11" Flags="#x00040000">
<Type>INT</Type>
</Entry>
</Pdo>
<Pdo Name="AI Standard Channel 2" Index="#x1a02" Flags="#x0010" SyncMan="3">
<ExcludePdo>#x1a03</ExcludePdo>
<Entry Name="Status__Underrange" Index="#x6010" Sub="#x01">
<Type>BIT</Type>
<Comment><![CDATA[Underrange event active]]></Comment>
</Entry>
<Entry Name="Status__Overrange" Index="#x6010" Sub="#x02">
<Type>BIT</Type>
<Comment><![CDATA[Overrange event active]]></Comment>
</Entry>
<Entry Name="Status__Limit 1" Index="#x6010" Sub="#x03">
<Type>BIT2</Type>
<Comment><![CDATA[Bit0: Value smaller/equal Limit1
Bit1: Value bigger/equal Limit1]]></Comment>
</Entry>
<Entry Name="Status__Limit 2" Index="#x6010" Sub="#x05">
<Type>BIT2</Type>
<Comment><![CDATA[Bit0: Value smaller/equal Limit2
Bit1: Value bigger/equal Limit2]]></Comment>
</Entry>
<Entry Name="Status__Error" Index="#x6010" Sub="#x07">
<Type>BIT</Type>
<Comment><![CDATA[Bit set when Over- or Underrange]]></Comment>
</Entry>
<Entry Name="Status__">
<Type GUID="{18071995-0000-0000-0000-002000000001}">ARRAY [0..0] OF BIT</Type>
</Entry>
<Entry Name="Status__">
<Type GUID="{18071995-0000-0000-0000-002000000006}">ARRAY [0..5] OF BIT</Type>
</Entry>
<Entry Name="Status__TxPDO State" Index="#x6010" Sub="#x0f">
<Type>BIT</Type>
<Comment><![CDATA[TRUE when this TxPDO is not valid]]></Comment>
</Entry>
<Entry Name="Status__TxPDO Toggle" Index="#x6010" Sub="#x10">
<Type>BIT</Type>
<Comment><![CDATA[Bit toggles everytime when new value available]]></Comment>
</Entry>
<Entry Name="Value" Index="#x6010" Sub="#x11" Flags="#x00040000">
<Type>INT</Type>
</Entry>
</Pdo>
<Pdo Name="AI Compact Channel 2" Index="#x1a03" Flags="#x0010">
<ExcludePdo>#x1a02</ExcludePdo>
<Entry Name="Value" Index="#x6010" Sub="#x11" Flags="#x00040000">
<Type>INT</Type>
</Entry>
</Pdo>
<CoeProfile ProfileNo="19665801"/>
<CoeProfile ProfileNo="19665801"/>
</EtherCAT>
</Box>
</TcSmItem>
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,13 @@
<DcMode>53796e6368726f6e00000000000000004672656552756e2f534d2d53796e6368726f6e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000</DcMode>
<DcMode>4443000000000000000000000000000044432d53796e6368726f6e000000000000000000000000000000000000000000000000000000000000000000000000030100000000000000000000000000000000000000000000000000000000000000</DcMode>
<DcMode>4443494e00000000000000000000000044432d53796e6368726f6e2028696e7075742062617365642900000000000000000000000000000000000000000000030100000000000000000001000000000000000000000000000000000000000000</DcMode>
<MBoxUserCmdData>004003000a00000000000000030010000000000000000000000000000000000020f3100502000000010000</MBoxUserCmdData>
<MBoxUserCmdData>004003000a00000000000000000000000000000000000000000000000000000020f3100502000000010000</MBoxUserCmdData>
<MBoxUserCmdData>02000300090000000f0000000000000000000000000000000000000000000000200880130100000001436c6f636b204672657175656e637900</MBoxUserCmdData>
<MBoxUserCmdData>020003000900000010000000000000000000000000000000000000000000000020088016010000001a53696e676c657475726e205b4269745d00</MBoxUserCmdData>
<MBoxUserCmdData>02000300090000000f0000000000000000000000000000000000000000000000201880130100000001436c6f636b204672657175656e637900</MBoxUserCmdData>
<MBoxUserCmdData>020003000900000010000000000000000000000000000000000000000000000020188016010000001a53696e676c657475726e205b4269745d00</MBoxUserCmdData>
<MBoxUserCmdData>02000300090000000f00000000000000000000000000000000000000000000002018801501000000004d756c74697475726e205b4269745d00</MBoxUserCmdData>
<MBoxUserCmdData>02000300090000000f00000000000000000000000000000000000000000000002008801501000000004d756c74697475726e205b4269745d00</MBoxUserCmdData>
<Pdo Name="FB Inputs Channel 1" Index="#x1a00" Flags="#x0010" SyncMan="3">
<ExcludePdo>#x1a02</ExcludePdo>
<Entry Name="Status__Warning" Index="#x6000" Sub="#x01">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,13 @@
<DcMode>53796e6368726f6e00000000000000004672656552756e2f534d2d53796e6368726f6e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000</DcMode>
<DcMode>4443000000000000000000000000000044432d53796e6368726f6e000000000000000000000000000000000000000000000000000000000000000000000000030100000000000000000000000000000000000000000000000000000000000000</DcMode>
<DcMode>4443494e00000000000000000000000044432d53796e6368726f6e2028696e7075742062617365642900000000000000000000000000000000000000000000030100000000000000000001000000000000000000000000000000000000000000</DcMode>
<MBoxUserCmdData>004003000a00000000000000030010000000000000000000000000000000000020f3100502000000010000</MBoxUserCmdData>
<MBoxUserCmdData>004003000a00000000000000000000000000000000000000000000000000000020f3100502000000010000</MBoxUserCmdData>
<MBoxUserCmdData>02000300090000000f0000000000000000000000000000000000000000000000200880130100000001436c6f636b204672657175656e637900</MBoxUserCmdData>
<MBoxUserCmdData>020003000900000010000000000000000000000000000000000000000000000020088016010000001a53696e676c657475726e205b4269745d00</MBoxUserCmdData>
<MBoxUserCmdData>02000300090000000f0000000000000000000000000000000000000000000000201880130100000001436c6f636b204672657175656e637900</MBoxUserCmdData>
<MBoxUserCmdData>020003000900000010000000000000000000000000000000000000000000000020188016010000001a53696e676c657475726e205b4269745d00</MBoxUserCmdData>
<MBoxUserCmdData>02000300090000000f00000000000000000000000000000000000000000000002018801501000000004d756c74697475726e205b4269745d00</MBoxUserCmdData>
<MBoxUserCmdData>02000300090000000f00000000000000000000000000000000000000000000002008801501000000004d756c74697475726e205b4269745d00</MBoxUserCmdData>
<Pdo Name="FB Inputs Channel 1" Index="#x1a00" Flags="#x0010" SyncMan="3">
<ExcludePdo>#x1a02</ExcludePdo>
<Entry Name="Status__Warning" Index="#x6000" Sub="#x01">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,13 @@
<DcMode>53796e6368726f6e00000000000000004672656552756e2f534d2d53796e6368726f6e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000</DcMode>
<DcMode>4443000000000000000000000000000044432d53796e6368726f6e000000000000000000000000000000000000000000000000000000000000000000000000030100000000000000000000000000000000000000000000000000000000000000</DcMode>
<DcMode>4443494e00000000000000000000000044432d53796e6368726f6e2028696e7075742062617365642900000000000000000000000000000000000000000000030100000000000000000001000000000000000000000000000000000000000000</DcMode>
<MBoxUserCmdData>004003000a00000000000000030010000000000000000000000000000000000020f3100502000000010000</MBoxUserCmdData>
<MBoxUserCmdData>004003000a00000000000000000000000000000000000000000000000000000020f3100502000000010000</MBoxUserCmdData>
<MBoxUserCmdData>02000300090000000f0000000000000000000000000000000000000000000000200880130100000001436c6f636b204672657175656e637900</MBoxUserCmdData>
<MBoxUserCmdData>020003000900000010000000000000000000000000000000000000000000000020088016010000001a53696e676c657475726e205b4269745d00</MBoxUserCmdData>
<MBoxUserCmdData>02000300090000000f0000000000000000000000000000000000000000000000201880130100000001436c6f636b204672657175656e637900</MBoxUserCmdData>
<MBoxUserCmdData>020003000900000010000000000000000000000000000000000000000000000020188016010000001a53696e676c657475726e205b4269745d00</MBoxUserCmdData>
<MBoxUserCmdData>02000300090000000f00000000000000000000000000000000000000000000002018801501000000004d756c74697475726e205b4269745d00</MBoxUserCmdData>
<MBoxUserCmdData>02000300090000000f00000000000000000000000000000000000000000000002008801501000000004d756c74697475726e205b4269745d00</MBoxUserCmdData>
<Pdo Name="FB Inputs Channel 1" Index="#x1a00" Flags="#x0010" SyncMan="3">
<ExcludePdo>#x1a02</ExcludePdo>
<Entry Name="Status__Warning" Index="#x6000" Sub="#x01">
Expand Down
Loading

0 comments on commit 7ef8c9c

Please sign in to comment.