Skip to content

Commit

Permalink
Merge pull request #127 from joshc-slac/joshc-slac/adding-PF1K0-EL3602
Browse files Browse the repository at this point in the history
ENH: adding pf1k0 el3602
  • Loading branch information
joshc-slac authored Dec 3, 2024
2 parents 9a7f1db + 60b8c15 commit 9a83b37
Show file tree
Hide file tree
Showing 7 changed files with 264 additions and 96 deletions.
32 changes: 16 additions & 16 deletions plc-kfe-motion.sln
Original file line number Diff line number Diff line change
Expand Up @@ -33,22 +33,22 @@ Global
{63CBF008-0762-41FB-908E-CCE4E38CC038}.Release|TwinCAT RT (x64).Build.0 = Release|TwinCAT RT (x64)
{63CBF008-0762-41FB-908E-CCE4E38CC038}.Release|TwinCAT RT (x86).ActiveCfg = Release|TwinCAT RT (x86)
{63CBF008-0762-41FB-908E-CCE4E38CC038}.Release|TwinCAT RT (x86).Build.0 = Release|TwinCAT RT (x86)
{4B72BB13-08B4-4AB1-86B6-277D50D421AD}.Debug|TwinCAT CE7 (ARMV7).ActiveCfg = Debug|TwinCAT CE7 (ARMV7)
{4B72BB13-08B4-4AB1-86B6-277D50D421AD}.Debug|TwinCAT CE7 (ARMV7).Build.0 = Debug|TwinCAT CE7 (ARMV7)
{4B72BB13-08B4-4AB1-86B6-277D50D421AD}.Debug|TwinCAT OS (ARMT2).ActiveCfg = Debug|TwinCAT OS (ARMT2)
{4B72BB13-08B4-4AB1-86B6-277D50D421AD}.Debug|TwinCAT OS (ARMT2).Build.0 = Debug|TwinCAT OS (ARMT2)
{4B72BB13-08B4-4AB1-86B6-277D50D421AD}.Debug|TwinCAT RT (x64).ActiveCfg = Debug|TwinCAT RT (x64)
{4B72BB13-08B4-4AB1-86B6-277D50D421AD}.Debug|TwinCAT RT (x64).Build.0 = Debug|TwinCAT RT (x64)
{4B72BB13-08B4-4AB1-86B6-277D50D421AD}.Debug|TwinCAT RT (x86).ActiveCfg = Debug|TwinCAT RT (x86)
{4B72BB13-08B4-4AB1-86B6-277D50D421AD}.Debug|TwinCAT RT (x86).Build.0 = Debug|TwinCAT RT (x86)
{4B72BB13-08B4-4AB1-86B6-277D50D421AD}.Release|TwinCAT CE7 (ARMV7).ActiveCfg = Release|TwinCAT CE7 (ARMV7)
{4B72BB13-08B4-4AB1-86B6-277D50D421AD}.Release|TwinCAT CE7 (ARMV7).Build.0 = Release|TwinCAT CE7 (ARMV7)
{4B72BB13-08B4-4AB1-86B6-277D50D421AD}.Release|TwinCAT OS (ARMT2).ActiveCfg = Release|TwinCAT OS (ARMT2)
{4B72BB13-08B4-4AB1-86B6-277D50D421AD}.Release|TwinCAT OS (ARMT2).Build.0 = Release|TwinCAT OS (ARMT2)
{4B72BB13-08B4-4AB1-86B6-277D50D421AD}.Release|TwinCAT RT (x64).ActiveCfg = Release|TwinCAT RT (x64)
{4B72BB13-08B4-4AB1-86B6-277D50D421AD}.Release|TwinCAT RT (x64).Build.0 = Release|TwinCAT RT (x64)
{4B72BB13-08B4-4AB1-86B6-277D50D421AD}.Release|TwinCAT RT (x86).ActiveCfg = Release|TwinCAT RT (x86)
{4B72BB13-08B4-4AB1-86B6-277D50D421AD}.Release|TwinCAT RT (x86).Build.0 = Release|TwinCAT RT (x86)
{4CB52DF2-BB08-42C8-8F14-671947063F6D}.Debug|TwinCAT CE7 (ARMV7).ActiveCfg = Debug|TwinCAT CE7 (ARMV7)
{4CB52DF2-BB08-42C8-8F14-671947063F6D}.Debug|TwinCAT CE7 (ARMV7).Build.0 = Debug|TwinCAT CE7 (ARMV7)
{4CB52DF2-BB08-42C8-8F14-671947063F6D}.Debug|TwinCAT OS (ARMT2).ActiveCfg = Debug|TwinCAT OS (ARMT2)
{4CB52DF2-BB08-42C8-8F14-671947063F6D}.Debug|TwinCAT OS (ARMT2).Build.0 = Debug|TwinCAT OS (ARMT2)
{4CB52DF2-BB08-42C8-8F14-671947063F6D}.Debug|TwinCAT RT (x64).ActiveCfg = Debug|TwinCAT RT (x64)
{4CB52DF2-BB08-42C8-8F14-671947063F6D}.Debug|TwinCAT RT (x64).Build.0 = Debug|TwinCAT RT (x64)
{4CB52DF2-BB08-42C8-8F14-671947063F6D}.Debug|TwinCAT RT (x86).ActiveCfg = Debug|TwinCAT RT (x86)
{4CB52DF2-BB08-42C8-8F14-671947063F6D}.Debug|TwinCAT RT (x86).Build.0 = Debug|TwinCAT RT (x86)
{4CB52DF2-BB08-42C8-8F14-671947063F6D}.Release|TwinCAT CE7 (ARMV7).ActiveCfg = Release|TwinCAT CE7 (ARMV7)
{4CB52DF2-BB08-42C8-8F14-671947063F6D}.Release|TwinCAT CE7 (ARMV7).Build.0 = Release|TwinCAT CE7 (ARMV7)
{4CB52DF2-BB08-42C8-8F14-671947063F6D}.Release|TwinCAT OS (ARMT2).ActiveCfg = Release|TwinCAT OS (ARMT2)
{4CB52DF2-BB08-42C8-8F14-671947063F6D}.Release|TwinCAT OS (ARMT2).Build.0 = Release|TwinCAT OS (ARMT2)
{4CB52DF2-BB08-42C8-8F14-671947063F6D}.Release|TwinCAT RT (x64).ActiveCfg = Release|TwinCAT RT (x64)
{4CB52DF2-BB08-42C8-8F14-671947063F6D}.Release|TwinCAT RT (x64).Build.0 = Release|TwinCAT RT (x64)
{4CB52DF2-BB08-42C8-8F14-671947063F6D}.Release|TwinCAT RT (x86).ActiveCfg = Release|TwinCAT RT (x86)
{4CB52DF2-BB08-42C8-8F14-671947063F6D}.Release|TwinCAT RT (x86).Build.0 = Release|TwinCAT RT (x86)
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
8 changes: 4 additions & 4 deletions plc-kfe-motion/_Config/IO/Device 1 (EtherCAT).xti
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?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="CDevEtherCATDef" SubType="111">
<Device Id="1" DevType="111" DevFlags="#x0003" AmsPort="28673" AmsNetId="172.21.92.58.2.1" RemoteName="Device 1 (EtherCAT)" InfoImageId="2">
<Name>__FILENAME__</Name>
<?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="CDevEtherCATDef" SubType="111">
<Device Id="1" DevType="111" DevFlags="#x0003" AmsPort="28673" AmsNetId="172.21.92.58.2.1" RemoteName="Device 1 (EtherCAT)">
<Name>Device 1 (EtherCAT)</Name>
<AddressInfo>
<Ccat>
<Address>-268435456</Address>
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.29" ClassName="CFlbTermDef" SubType="9099">
<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">
<ImageDatas>
<ImageData Id="1000">424dd6020000000000003600000028000000100000000e0000000100180000000000a0020000c40e0000c40e00000000000000000000ff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080808080808080808080808080808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0000000c0c0c0000000808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c000bfff00bfffc0c0c0808080c0c0c000ffffc0c0c000ffff808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c000bfff00bfffc0c0c0808080c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c000bfff00bfffc0c0c0808080c0c0c0000000c0c0c0000000808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0ff0000c0c0c0ff0000808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0000000c0c0c0000000808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c000bfff00bfffc0c0c0808080c0c0c00000ffc0c0c00000ff808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c000bfff00bfffc0c0c0808080c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c000bfff00bfffc0c0c0808080c0c0c0000000c0c0c0000000808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0008000c0c0c0008000808080ff00ffff00ffff00ffff00ffff00ffff00ffc0c0c0c0c0c0c0c0c0c0c0c0808080c0c0c0c0c0c0c0c0c0c0c0c0808080ff00ffff00ffff00ffff00ffff00ff</ImageData>
</ImageDatas>
Expand All @@ -22,8 +22,11 @@
<Box File="PF1K0-EL3314.xti" Id="70">
<EtherCAT PortABoxInfo="#x01000045"/>
</Box>
<Box File="PF1K0-EL9011.xti" Id="71">
<Box File="PF1K0-EL3062.xti" Id="216">
<EtherCAT PortABoxInfo="#x01000046"/>
</Box>
<Box File="PF1K0-EL9011.xti" Id="71">
<EtherCAT PortABoxInfo="#x010000d8"/>
</Box>
</Box>
</TcSmItem>
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
<?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">
<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-002000000006}" IecBaseType="true" BitType="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="216" BoxType="9099" BoxFlags="#x00000020">
<Name>__FILENAME__</Name>
<ImageId>1000</ImageId>
<EtherCAT SlaveType="2" PdiType="#x0005" MboxDataLinkLayer="true" StateMBoxPolling="true" CycleMBoxPollingTime="0" CoeType="7" FoeType="1" VendorId="#x00000002" ProductCode="#x0bf63052" RevisionNo="#x00140000" InfoDataAddr="true" TimeoutMailbox2="2000" CheckRevisionNoType="3" PortPhys="51" MaxSlotCount="256" MaxSlotGroupCount="1" SlotPdoIncrement="1" SlotIndexIncrement="16" Type="EL3062 2Ch. Ana. Input 0-10V" Desc="EL3062">
<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="#x00020000">
<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="#x00020000">
<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="#x00020000">
<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="#x00020000">
<Type>INT</Type>
</Entry>
</Pdo>
<CoeProfile ProfileNo="19665801"/>
<CoeProfile ProfileNo="19665801"/>
</EtherCAT>
</Box>
</TcSmItem>
2 changes: 1 addition & 1 deletion plc-kfe-motion/kfe_motion/kfe_motion.plcproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<ProjectGuid>{4b72bb13-08b4-4ab1-86b6-277d50d421ad}</ProjectGuid>
<SubObjectsSortedByName>True</SubObjectsSortedByName>
<Name>kfe_motion</Name>
<ProgramVersion>3.1.4022.3</ProgramVersion>
<ProgramVersion>3.1.4022.7</ProgramVersion>
<Application>{18c132e7-6a13-4953-9f10-8c47ddd85a35}</Application>
<TypeSystem>{96fd1a01-55e4-47aa-a72d-1f4c14f26980}</TypeSystem>
<Implicit_Task_Info>{85331d72-6df2-40d7-9bc0-d8bfcf3a3f03}</Implicit_Task_Info>
Expand Down
Loading

0 comments on commit 9a83b37

Please sign in to comment.