Skip to content

Commit 328de8e

Browse files
PreliyPreliy
authored
Merge pull request #14 from OpenCommissioning/development
Development
2 parents 9c20661 + 5ca0786 commit 328de8e

4 files changed

Lines changed: 113 additions & 13 deletions

File tree

‎Artifacts/OC_EtherCAT.ethml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -476,5 +476,23 @@
476476
.TxPDO := TIIB($BOXNO$)^TxPDO^FSOE'}
477477
$NAME$ : FB_Beckhoff_EL2904;]]>
478478
</Declaration>
479+
</Device>
480+
<Device ProductDescription="EK1914">
481+
<Declaration>
482+
<![CDATA[{attribute 'TcLinkTo' := '
483+
.RxPDO := TIIB($BOXNO$)^Outputs^FSOE;
484+
.bOutputDIO0 := TIIB($BOXNO$)^DIO Outputs^Output 0;
485+
.bOutputDIO1 := TIIB($BOXNO$)^DIO Outputs^Output 1;
486+
.bOutputDIO2 := TIIB($BOXNO$)^DIO Outputs^Output 2;
487+
.bOutputDIO3 := TIIB($BOXNO$)^DIO Outputs^Output 3;
488+
.bOutputDIOSafetyLinkedOutput0 := TIIB($BOXNO$)^DIO Outputs^Safety Linked Output 0;
489+
.bOutputDIOSafetyLinkedOutput1 := TIIB($BOXNO$)^DIO Outputs^Safety Linked Output 1;
490+
.TxPDO := TIIB($BOXNO$)^Inputs^FSOE;
491+
.bInputDIO0 := TIIB($BOXNO$)^DIO Inputs^Input 0;
492+
.bInputDIO1 := TIIB($BOXNO$)^DIO Inputs^Input 1;
493+
.bInputDIO2 := TIIB($BOXNO$)^DIO Inputs^Input 2;
494+
.bInputDIO3 := TIIB($BOXNO$)^DIO Inputs^Input 3'}
495+
$NAME$ : FB_Beckhoff_EK1914;]]>
496+
</Declaration>
479497
</Device>
480498
</Ethercat>

‎Artifacts/OC_EtherCAT.library‎

2.38 KB
Binary file not shown.

‎Devices/Terminals/FB_Beckhoff_EK1914.TcPOU‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4026.13">
3+
<POU Name="FB_Beckhoff_EK1914" Id="{ee3e9bec-150f-064b-0dfb-8262f6a99d11}" SpecialFunc="None">
4+
<Declaration><![CDATA[FUNCTION_BLOCK FB_Beckhoff_EK1914
5+
VAR_INPUT
6+
bSafetyIn1 : BOOL;
7+
bSafetyIn2 : BOOL;
8+
bInput0 : BOOL;
9+
bInput1 : BOOL;
10+
bInput2 : BOOL;
11+
bInput3 : BOOL;
12+
END_VAR
13+
VAR_OUTPUT
14+
bSafetyOut1 : BOOL;
15+
bSafetyOut2 : BOOL;
16+
bOutput0 : BOOL;
17+
bOutput1 : BOOL;
18+
bOutput2 : BOOL;
19+
bOutput3 : BOOL;
20+
bOSafetyLinkedOutput0 : BOOL;
21+
bOSafetyLinkedOutput1 : BOOL;
22+
END_VAR
23+
VAR
24+
RxPDO AT %I* : FSOE_6;
25+
TxPDO AT %Q* : FSOE_6;
26+
fbFsoeSlave : FB_FsoeSlave;
27+
nMasterData : BYTE := 0;
28+
nSlaveData : BYTE := 0;
29+
30+
bOutputDIO0 AT %I* : BOOL;
31+
bOutputDIO1 AT %I* : BOOL;
32+
bOutputDIO2 AT %I* : BOOL;
33+
bOutputDIO3 AT %I* : BOOL;
34+
bOutputDIOSafetyLinkedOutput0 AT %I* : BOOL;
35+
bOutputDIOSafetyLinkedOutput1 AT %I* : BOOL;
36+
bInputDIO0 AT %Q* : BOOL;
37+
bInputDIO1 AT %Q* : BOOL;
38+
bInputDIO2 AT %Q* : BOOL;
39+
bInputDIO3 AT %Q* : BOOL;
40+
END_VAR
41+
]]></Declaration>
42+
<Implementation>
43+
<ST><![CDATA[nSlaveData.0 := bSafetyIn1;
44+
nSlaveData.1 := bSafetyIn2;
45+
bInputDIO0 := bInput0;
46+
bInputDIO1 := bInput1;
47+
bInputDIO2 := bInput2;
48+
bInputDIO3 := bInput3;
49+
50+
fbFsoeSlave();
51+
52+
bSafetyOut1 := nMasterData.0;
53+
bSafetyOut2 := nMasterData.1;
54+
bOutput0 := bOutputDIO0;
55+
bOutput1 := bOutputDIO1;
56+
bOutput2 := bOutputDIO2;
57+
bOutput3 := bOutputDIO3;
58+
bOSafetyLinkedOutput0 := bOutputDIOSafetyLinkedOutput0;
59+
bOSafetyLinkedOutput1 := bOutputDIOSafetyLinkedOutput1;]]></ST>
60+
</Implementation>
61+
<Method Name="FB_init" Id="{f8d4c283-c105-0343-04d3-250d70427101}">
62+
<Declaration><![CDATA[METHOD FB_init : BOOL
63+
VAR_INPUT
64+
bInitRetains : BOOL; // if TRUE, the retain variables are initialized (warm start / cold start)
65+
bInCopyCode : BOOL; // if TRUE, the instance afterwards gets moved into the copy code (online change)
66+
END_VAR
67+
]]></Declaration>
68+
<Implementation>
69+
<ST><![CDATA[fbFsoeSlave.stConfig.nSlaveAddress := 0;
70+
fbFsoeSlave.stConfig.pFromBus := ADR(RxPDO);
71+
fbFsoeSlave.stConfig.pToBus := ADR(TxPDO);
72+
fbFsoeSlave.stConfig.nSizeMaster := 6;
73+
fbFsoeSlave.stConfig.nSizeSlave := 6;
74+
fbFsoeSlave.stConfig.pMasterData := ADR(nMasterData);
75+
fbFsoeSlave.stConfig.pSlaveData := ADR(nSlaveData);]]></ST>
76+
</Implementation>
77+
</Method>
78+
</POU>
79+
</TcPlcObject>

‎OC_EtherCAT.plcproj‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<Released>false</Released>
2020
<Company>Open Commissioning</Company>
2121
<Title>OC_EtherCAT</Title>
22-
<ProjectVersion>1.1.5</ProjectVersion>
22+
<ProjectVersion>1.1.6</ProjectVersion>
2323
<LibraryCategories>
2424
<LibraryCategory xmlns="">
2525
<Id>{41661a1f-00b4-4855-90c5-5a3bdd03b62b}</Id>
@@ -104,6 +104,9 @@
104104
<Compile Include="Devices\Drives\Sercos\ST_Sercos_ControlWord.TcDUT">
105105
<SubType>Code</SubType>
106106
</Compile>
107+
<Compile Include="Devices\Terminals\FB_Beckhoff_EK1914.TcPOU">
108+
<SubType>Code</SubType>
109+
</Compile>
107110
<Compile Include="Devices\Terminals\FB_Beckhoff_EL5152.TcPOU">
108111
<SubType>Code</SubType>
109112
</Compile>
@@ -282,8 +285,8 @@
282285
<ProjectExtensions>
283286
<PlcProjectOptions>
284287
<XmlArchive>
285-
<Data>
286-
<o xml:space="preserve" t="OptionKey">
288+
<Data>
289+
<o xml:space="preserve" t="OptionKey">
287290
<v n="Name">"&lt;ProjectRoot&gt;"</v>
288291
<d n="SubKeys" t="Hashtable" ckt="String" cvt="OptionKey">
289292
<v>{192FAD59-8248-4824-A8DE-9177C94C195A}</v>
@@ -497,16 +500,16 @@
497500
</d>
498501
<d n="Values" t="Hashtable" />
499502
</o>
500-
</Data>
501-
<TypeList>
502-
<Type n="Boolean">System.Boolean</Type>
503-
<Type n="ExactVersionConstraintToSave">{f9079115-a4ba-4f30-bf7c-9e76613146fc}</Type>
504-
<Type n="Hashtable">System.Collections.Hashtable</Type>
505-
<Type n="Int32">System.Int32</Type>
506-
<Type n="OptionKey">{54dd0eac-a6d8-46f2-8c27-2f43c7e49861}</Type>
507-
<Type n="String">System.String</Type>
508-
</TypeList>
509-
</XmlArchive>
503+
</Data>
504+
<TypeList>
505+
<Type n="Boolean">System.Boolean</Type>
506+
<Type n="ExactVersionConstraintToSave">{f9079115-a4ba-4f30-bf7c-9e76613146fc}</Type>
507+
<Type n="Hashtable">System.Collections.Hashtable</Type>
508+
<Type n="Int32">System.Int32</Type>
509+
<Type n="OptionKey">{54dd0eac-a6d8-46f2-8c27-2f43c7e49861}</Type>
510+
<Type n="String">System.String</Type>
511+
</TypeList>
512+
</XmlArchive>
510513
</PlcProjectOptions>
511514
</ProjectExtensions>
512515
</Project>

0 commit comments

Comments
 (0)