Skip to content

Commit

Permalink
Merge pull request #129 from nrwslac/pc-sp-flow-sensors
Browse files Browse the repository at this point in the history
Multi-Core Allocation, Flow Meter Additions
  • Loading branch information
nrwslac authored Aug 22, 2024
2 parents f2d0570 + ce82401 commit db8c4c5
Show file tree
Hide file tree
Showing 12 changed files with 41,579 additions and 41,156 deletions.
2 changes: 2 additions & 0 deletions plc-tmo-motion/_Config/IO/Device 1 (EtherCAT).xti
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@
<EtherCAT EnableVirtualSwitch="true" MaxSwitchPorts="2" MaxSwitchFrames="120">
<SyncUnit Name="SL2K4" NoDeleteIfUnused="true"/>
<SyncUnit Name="LI2K4" NoDeleteIfUnused="true"/>
<SyncUnit Name="SL2K4" NoDeleteIfUnused="true"/>
<SyncUnit Name="LI2K4" NoDeleteIfUnused="true"/>
</EtherCAT>
</Device>
</TcSmItem>
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">424dd6020000000000003600000028000000100000000e0000000100180000000000a0020000120b0000120b00000000000000000000ff00ffff00ffff00ffff00ffff00ffff00ff808080808080808080808080808080808080808080808080ff00ffff00ffff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ffff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0808080808080808080c0c0c0c0c0c080808000bfffff00ffff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c080808080808080808000bfff00bfff00bfff00bfff00bfffff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0808080808080808080c0c0c0c0c0c080808000bfffff00ffff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ffff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0808080808080808080c0c0c0c0c0c080808000bfffff00ff007fff007fff007fff007fff007fff007fffc0c0c0c0c0c080808080808080808000bfff00bfff00bfff00bfff00bfff007fff007fff007fff007fff007fff007fffc0c0c0c0c0c0808080808080808080c0c0c0c0c0c080808000bfffff00ff007fff007fff007fff007fff007fff007fffc0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ff007fff007fff007fff007fff007fff007fffc0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ff007fff007fff007fff007fff007fff007fffc0c0c0c0c0c0c0c0c0bbc2bbc0c0c0c0c0c0c0c0c0808080ff00ffff00ff007fff007fff007fff007fff007fff007fffc0c0c0c0c0c0bac2ba0bfc0bc0c0c0c0c0c0c0c0c0808080ff00ffff00ff007fff007fff007fff007fff007fff007fffc0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ff</ImageData>
</ImageDatas>
Expand All @@ -13,5 +13,8 @@
<Box File="ST4K4-TERM (EP2338-0001).xti" Id="108">
<EtherCAT PortABoxInfo="#x0100006b"/>
</Box>
<Box File="EP3174-FWM-E2.xti" Id="235">
<EtherCAT PortABoxInfo="#x0100006c"/>
</Box>
</Box>
</TcSmItem>
Original file line number Diff line number Diff line change
@@ -0,0 +1,242 @@
<?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" BitType="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-002000000005}" IecBaseType="true" AutoDeleteType="true" HideSubItems="true">ARRAY [0..4] OF BIT</Name>
<BitSize>5</BitSize>
<BaseType GUID="{18071995-0000-0000-0000-000000000010}">BIT</BaseType>
<ArrayInfo>
<LBound>0</LBound>
<Elements>5</Elements>
</ArrayInfo>
</DataType>
</DataTypes>
<ImageDatas>
<ImageData Id="1000">424de6000000000000007600000028000000100000000e000000010004000000000070000000c30e0000c30e000010000000100000000000ff00ff00ff00ff000000ffff000000ff000000ffff0000008000800080008000000080800000008000000080800080808000c0c0c000ffffff00000000001111111111111111fffffffffffffffffcfcfcfcfffff44ff4f4f4f4fffff44ffffffffffffffffffffffffffffffffffcfcfcfcfffff44ff4f4f4f4fffff44fffffffffffffffff44444411111111114444441111111111444444111111111144444411111111114444441111111111</ImageData>
</ImageDatas>
<Box Id="235" BoxType="9099" BoxFlags="#x00000020">
<Name>__FILENAME__</Name>
<ImageId>1000</ImageId>
<EtherCAT SlaveType="2" PdiType="#x0605" MboxDataLinkLayer="true" StateMBoxPolling="true" CycleMBoxPollingTime="0" CoeType="7" FoeType="1" VendorId="#x00000002" ProductCode="#x0c664052" RevisionNo="#x00160002" InfoDataAddr="true" TimeoutMailbox2="2000" CheckRevisionNoType="3" PortPhys="17" MaxSlotCount="256" MaxSlotGroupCount="1" SlotPdoIncrement="1" SlotIndexIncrement="16" Type="EP3174-0002 4Ch. Ana. Input +/-10V, 0-10V, 0/4-20mA configurable" Desc="EP3174-0002">
<SyncMan>001080002600010001000000800080008000001026010000</SyncMan>
<SyncMan>801080002200010002000000800080008000801022010000</SyncMan>
<SyncMan>001100000400000003000000000000000000001104000000</SyncMan>
<SyncMan>801110002000010004000000000000001000801120010000</SyncMan>
<Fmmu>0000000000000000801100010100000002000000000000000000000000000000</Fmmu>
<Fmmu>00000000000000000d0800010100000003000000000000000000000000000000</Fmmu>
<BootStrapData>0010f400f410f400</BootStrapData>
<DcMode>53796e6368726f6e00000000000000004672656552756e2f534d2d53796e6368726f6e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000</DcMode>
<DcMode>4443000000000000000000000000000044432d53796e6368726f6e000000000000000000000000000000000000000000000000000000000050c30000000000070100000000000000000000000000000000000000000000000000000000000000</DcMode>
<DcMode>4443494e00000000000000000000000044432d53796e6368726f6e2028696e70757420626173656429000000000000000000000078ecffff50c30000000000070100000000000000000001000000000000000000000000000000000000000000</DcMode>
<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 greater than Limit1
Bit1: Value smaller than Limit1]]></Comment>
</Entry>
<Entry Name="Status__Limit 2" Index="#x6000" Sub="#x05">
<Type>BIT2</Type>
<Comment><![CDATA[Bit0: Value greater than Limit2
Bit1: Value smaller than 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-002000000005}">ARRAY [0..4] OF BIT</Type>
</Entry>
<Entry Name="Status__Sync error" Index="#x6000" Sub="#x0e">
<Type>BIT</Type>
</Entry>
<Entry Name="Status__TxPDO State" Index="#x6000" Sub="#x0f">
<Type>BIT</Type>
</Entry>
<Entry Name="Status__TxPDO Toggle" Index="#x6000" Sub="#x10">
<Type>BIT</Type>
</Entry>
<Entry Name="Value" Index="#x6000" Sub="#x11">
<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">
<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 greater than Limit1
Bit1: Value smaller than Limit1]]></Comment>
</Entry>
<Entry Name="Status__Limit 2" Index="#x6010" Sub="#x05">
<Type>BIT2</Type>
<Comment><![CDATA[Bit0: Value greater than Limit2
Bit1: Value smaller than 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-002000000005}">ARRAY [0..4] OF BIT</Type>
</Entry>
<Entry Name="Status__Sync error" Index="#x6010" Sub="#x0e">
<Type>BIT</Type>
</Entry>
<Entry Name="Status__TxPDO State" Index="#x6010" Sub="#x0f">
<Type>BIT</Type>
</Entry>
<Entry Name="Status__TxPDO Toggle" Index="#x6010" Sub="#x10">
<Type>BIT</Type>
</Entry>
<Entry Name="Value" Index="#x6010" Sub="#x11">
<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">
<Type>INT</Type>
</Entry>
</Pdo>
<Pdo Name="AI Standard Channel 3" Index="#x1a04" Flags="#x0010" SyncMan="3">
<ExcludePdo>#x1a05</ExcludePdo>
<Entry Name="Status__Underrange" Index="#x6020" Sub="#x01">
<Type>BIT</Type>
<Comment><![CDATA[Underrange event active]]></Comment>
</Entry>
<Entry Name="Status__Overrange" Index="#x6020" Sub="#x02">
<Type>BIT</Type>
<Comment><![CDATA[Overrange event active]]></Comment>
</Entry>
<Entry Name="Status__Limit 1" Index="#x6020" Sub="#x03">
<Type>BIT2</Type>
<Comment><![CDATA[Bit0: Value greater than Limit1
Bit1: Value smaller than Limit1]]></Comment>
</Entry>
<Entry Name="Status__Limit 2" Index="#x6020" Sub="#x05">
<Type>BIT2</Type>
<Comment><![CDATA[Bit0: Value greater than Limit2
Bit1: Value smaller than Limit2]]></Comment>
</Entry>
<Entry Name="Status__Error" Index="#x6020" 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-002000000005}">ARRAY [0..4] OF BIT</Type>
</Entry>
<Entry Name="Status__Sync error" Index="#x6020" Sub="#x0e">
<Type>BIT</Type>
</Entry>
<Entry Name="Status__TxPDO State" Index="#x6020" Sub="#x0f">
<Type>BIT</Type>
</Entry>
<Entry Name="Status__TxPDO Toggle" Index="#x6020" Sub="#x10">
<Type>BIT</Type>
</Entry>
<Entry Name="Value" Index="#x6020" Sub="#x11">
<Type>INT</Type>
</Entry>
</Pdo>
<Pdo Name="AI Compact Channel 3" Index="#x1a05" Flags="#x0010">
<ExcludePdo>#x1a04</ExcludePdo>
<Entry Name="Value" Index="#x6020" Sub="#x11">
<Type>INT</Type>
</Entry>
</Pdo>
<Pdo Name="AI Standard Channel 4" Index="#x1a06" Flags="#x0010" SyncMan="3">
<ExcludePdo>#x1a07</ExcludePdo>
<Entry Name="Status__Underrange" Index="#x6030" Sub="#x01">
<Type>BIT</Type>
<Comment><![CDATA[Underrange event active]]></Comment>
</Entry>
<Entry Name="Status__Overrange" Index="#x6030" Sub="#x02">
<Type>BIT</Type>
<Comment><![CDATA[Overrange event active]]></Comment>
</Entry>
<Entry Name="Status__Limit 1" Index="#x6030" Sub="#x03">
<Type>BIT2</Type>
<Comment><![CDATA[Bit0: Value greater than Limit1
Bit1: Value smaller than Limit1]]></Comment>
</Entry>
<Entry Name="Status__Limit 2" Index="#x6030" Sub="#x05">
<Type>BIT2</Type>
<Comment><![CDATA[Bit0: Value greater than Limit2
Bit1: Value smaller than Limit2]]></Comment>
</Entry>
<Entry Name="Status__Error" Index="#x6030" 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-002000000005}">ARRAY [0..4] OF BIT</Type>
</Entry>
<Entry Name="Status__Sync error" Index="#x6030" Sub="#x0e">
<Type>BIT</Type>
</Entry>
<Entry Name="Status__TxPDO State" Index="#x6030" Sub="#x0f">
<Type>BIT</Type>
</Entry>
<Entry Name="Status__TxPDO Toggle" Index="#x6030" Sub="#x10">
<Type>BIT</Type>
</Entry>
<Entry Name="Value" Index="#x6030" Sub="#x11">
<Type>INT</Type>
</Entry>
</Pdo>
<Pdo Name="AI Compact Channel 4" Index="#x1a07" Flags="#x0010">
<ExcludePdo>#x1a06</ExcludePdo>
<Entry Name="Value" Index="#x6030" Sub="#x11">
<Type>INT</Type>
</Entry>
</Pdo>
<CoeProfile ProfileNo="19665801" DisplayName="Analog Input"/>
<CoeProfile ProfileNo="19665801" DisplayName="Analog Input"/>
<CoeProfile ProfileNo="19665801" DisplayName="Analog Input"/>
<CoeProfile ProfileNo="19665801" DisplayName="Analog Input"/>
</EtherCAT>
</Box>
</TcSmItem>
4 changes: 2 additions & 2 deletions plc-tmo-motion/_Config/NC/NC.xti
Original file line number Diff line number Diff line change
Expand Up @@ -1316,7 +1316,7 @@ External Setpoint Generation:
</DataType>
</DataTypes>
<NC>
<SafTask Priority="4" CycleTime="20000" AmsPort="501" IoAtBegin="true">
<SafTask Priority="4" CycleTime="20000" AmsPort="501" Affinity="#x00000004" IoAtBegin="true">
<Name>NC-Task 1 SAF</Name>
<Vars VarGrpType="1" InsertType="1">
<Name>Inputs</Name>
Expand All @@ -1328,7 +1328,7 @@ External Setpoint Generation:
<Name>Image</Name>
</Image>
</SafTask>
<SvbTask Priority="8" CycleTime="100000" AmsPort="511">
<SvbTask Priority="8" CycleTime="100000" AmsPort="511" Affinity="#x00000004">
<Name>NC-Task 1 SVB</Name>
</SvbTask>
<AxisFolder Name="AL1K4-L2SI"/>
Expand Down
Loading

0 comments on commit db8c4c5

Please sign in to comment.