Skip to content

Commit

Permalink
Update this concept, to be conform to #1043
Browse files Browse the repository at this point in the history
  • Loading branch information
franz-hoepfinger-4diac committed Feb 16, 2025
1 parent e9a0dec commit bcad466
Show file tree
Hide file tree
Showing 12 changed files with 173 additions and 66 deletions.
19 changes: 0 additions & 19 deletions data/typelibrary/adapterized-1.0.0/typelib/adapter/AX.adp

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<AdapterType Name="AB2" Comment="bidirectional Adapter Interface for 1 Event and 1 Byte" >
<Identification Standard="61499-1" Description="Copyright (c) 2025 HR Agrartechnik GmbH &#10; &#10;This program and the accompanying materials are made &#10;available under the terms of the Eclipse Public License 2.0 &#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#10; &#10;SPDX-License-Identifier: EPL-2.0" >
</Identification>
<VersionInfo Organization="HR Agrartechnik GmbH" Version="1.0" Author="Franz Höpfinger" Date="2025-01-24" Remarks="Initial Version">
</VersionInfo>
<CompilerInfo>
</CompilerInfo>
<InterfaceList>
<EventInputs>
<Event Name="EI1" Type="Event" Comment="Request (or Indication)" >
<With Var="DI1"/>
</Event>
</EventInputs>
<EventOutputs>
<Event Name="EO1" Type="Event" Comment="Indication (or Request)" >
<With Var="DO1"/>
</Event>
</EventOutputs>
<InputVars>
<VarDeclaration Name="DI1" Type="BYTE" Comment="Request (or Indication) to Socket" />
</InputVars>
<OutputVars>
<VarDeclaration Name="DO1" Type="BYTE" Comment="Indication (or Request) Data from Plug" />
</OutputVars>
</InterfaceList>
</AdapterType>
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<AdapterType Name="AE2" Comment="bidirectional Adapter Interface for 1 Event" >
<Identification Standard="61499-1" Description="Copyright (c) 2025 HR Agrartechnik GmbH &#10; &#10;This program and the accompanying materials are made &#10;available under the terms of the Eclipse Public License 2.0 &#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#10; &#10;SPDX-License-Identifier: EPL-2.0" >
</Identification>
<VersionInfo Organization="HR Agrartechnik GmbH" Version="1.0" Author="Franz Höpfinger" Date="2025-01-24" Remarks="Initial Version">
</VersionInfo>
<CompilerInfo>
</CompilerInfo>
<InterfaceList>
<EventInputs>
<Event Name="EI1" Type="Event" Comment="Request (or Indication)" >
</Event>
</EventInputs>
<EventOutputs>
<Event Name="EO1" Type="Event" Comment="Indication (or Request)" >
</Event>
</EventOutputs>
</InterfaceList>
</AdapterType>
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<AdapterType Name="AX2" Comment="bidirectional Adapter Interface for 1 Event and 1 Bool" >
<Identification Standard="61499-1" Description="Copyright (c) 2025 HR Agrartechnik GmbH &#10; &#10;This program and the accompanying materials are made &#10;available under the terms of the Eclipse Public License 2.0 &#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#10; &#10;SPDX-License-Identifier: EPL-2.0" >
</Identification>
<VersionInfo Organization="HR Agrartechnik GmbH" Version="1.0" Author="Franz Höpfinger" Date="2025-01-24" Remarks="Initial Version">
</VersionInfo>
<CompilerInfo>
</CompilerInfo>
<InterfaceList>
<EventInputs>
<Event Name="EI1" Type="Event" Comment="Request (or Indication)" >
<With Var="DI1"/>
</Event>
</EventInputs>
<EventOutputs>
<Event Name="EO1" Type="Event" Comment="Indication (or Request)" >
<With Var="DO1"/>
</Event>
</EventOutputs>
<InputVars>
<VarDeclaration Name="DI1" Type="BOOL" Comment="Request (or Indication) to Socket" />
</InputVars>
<OutputVars>
<VarDeclaration Name="DO1" Type="BOOL" Comment="Indication (or Request) Data from Plug" />
</OutputVars>
</InterfaceList>
</AdapterType>
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<AdapterType Name="AB" Comment="unidirectional Adapter Interface for 1 Event and 1 Byte" >
<Identification Standard="61499-1" Description="Copyright (c) 2025 HR Agrartechnik GmbH &#10; &#10;This program and the accompanying materials are made &#10;available under the terms of the Eclipse Public License 2.0 &#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#10; &#10;SPDX-License-Identifier: EPL-2.0" >
</Identification>
<VersionInfo Organization="HR Agrartechnik GmbH" Version="1.0" Author="Franz Höpfinger" Date="2025-01-24" Remarks="Initial Version">
</VersionInfo>
<CompilerInfo>
</CompilerInfo>
<InterfaceList>
<EventOutputs>
<Event Name="E1" Type="Event" Comment="Indication (or Request)" >
<With Var="D1"/>
</Event>
</EventOutputs>
<OutputVars>
<VarDeclaration Name="D1" Type="BYTE" Comment="Indication (or Request) Data from Plug" />
</OutputVars>
</InterfaceList>
</AdapterType>
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<AdapterType Name="AE" Comment="unidirectional Adapter Interface for 1 Event" >
<Identification Standard="61499-1" Description="Copyright (c) 2025 HR Agrartechnik GmbH &#10; &#10;This program and the accompanying materials are made &#10;available under the terms of the Eclipse Public License 2.0 &#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#10; &#10;SPDX-License-Identifier: EPL-2.0" >
</Identification>
<VersionInfo Organization="HR Agrartechnik GmbH" Version="1.0" Author="Franz Höpfinger" Date="2025-01-24" Remarks="Initial Version">
</VersionInfo>
<CompilerInfo>
</CompilerInfo>
<InterfaceList>
<EventOutputs>
<Event Name="E1" Type="Event" Comment="Indication (or Request)" >
</Event>
</EventOutputs>
</InterfaceList>
</AdapterType>
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<AdapterType Name="AX" Comment="unidirectional Adapter Interface for 1 Event and 1 Bool" >
<Identification Standard="61499-1" Description="Copyright (c) 2024 HR Agrartechnik GmbH &#10; &#10;This program and the accompanying materials are made &#10;available under the terms of the Eclipse Public License 2.0 &#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#10; &#10;SPDX-License-Identifier: EPL-2.0" >
</Identification>
<VersionInfo Organization="HR Agrartechnik GmbH" Version="1.0" Author="Franz Höpfinger" Date="2024-04-24" Remarks="Initial Version">
</VersionInfo>
<CompilerInfo>
</CompilerInfo>
<InterfaceList>
<EventOutputs>
<Event Name="E1" Type="Event" Comment="Indication (or Request)" >
<With Var="D1"/>
</Event>
</EventOutputs>
<OutputVars>
<VarDeclaration Name="D1" Type="BOOL" Comment="Indication (or Request) Data from Plug" />
</OutputVars>
</InterfaceList>
</AdapterType>
22 changes: 11 additions & 11 deletions data/typelibrary/adapterized-1.0.0/typelib/boolean/AX_OR_2.fbt
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<FBType Name="AX_OR_2" Comment="FB to calculate boolean OR" >
<Identification Standard="61499-2" Description="Copyright (c) 2024 HR Agrartechnik GmbH &#10; &#10;This program and the accompanying materials are made &#10;available under the terms of the Eclipse Public License 2.0 &#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#10; &#10;SPDX-License-Identifier: EPL-2.0" >
<Identification Standard="61499-2" Description="Copyright (c) 2024 HR Agrartechnik GmbH &#10; &#10;This program and the accompanying materials are made &#10;available under the terms of the Eclipse Public License 2.0 &#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#10; &#10;SPDX-License-Identifier: EPL-2.0" >
</Identification>
<VersionInfo Version="1.0" Author="franz" Date="2024-10-23">
<VersionInfo Organization="HR Agrartechnik GmbH" Version="1.0" Author="Franz Höpfinger" Date="2024-10-23">
</VersionInfo>
<CompilerInfo packageName="io::adp::boolean">
<CompilerInfo>
</CompilerInfo>
<InterfaceList>
<Plugs>
<AdapterDeclaration Name="OUT" Type="AX" Comment="OR result" x="-11713.33" y="-986.67"/>
<AdapterDeclaration Name="OUT" Type="AX" Comment="OR result" x="1600" y="373.33"/>
</Plugs>
<Sockets>
<AdapterDeclaration Name="IN1" Type="AX" Comment="OR input 1" x="-13713.33" y="-986.67"/>
<AdapterDeclaration Name="IN2" Type="AX" Comment="OR input 2" x="-13713.33" y="-400"/>
<AdapterDeclaration Name="IN1" Type="AX" Comment="OR input 1" x="133.33" y="33.33"/>
<AdapterDeclaration Name="IN2" Type="AX" Comment="OR input 2" x="133.33" y="813.33"/>
</Sockets>
</InterfaceList>
<FBNetwork>
<FB Name="OR_2" Type="OR_2" x="-12760" y="-986.67">
<FB Name="OR_2" Type="OR_2" x="820" y="373.33">
</FB>
<EventConnections>
<Connection Source="IN1.E1" Destination="OR_2.REQ"/>
<Connection Source="IN2.E1" Destination="OR_2.REQ" dx1="253.33"/>
<Connection Source="IN1.E1" Destination="OR_2.REQ" dx1="140"/>
<Connection Source="IN2.E1" Destination="OR_2.REQ" dx1="140"/>
<Connection Source="OR_2.CNF" Destination="OUT.E1"/>
</EventConnections>
<DataConnections>
<Connection Source="IN1.D1" Destination="OR_2.IN1"/>
<Connection Source="IN2.D1" Destination="OR_2.IN2" dx1="286.67"/>
<Connection Source="IN1.D1" Destination="OR_2.IN1" dx1="73.33"/>
<Connection Source="IN2.D1" Destination="OR_2.IN2" dx1="206.67"/>
<Connection Source="OR_2.OUT" Destination="OUT.D1"/>
</DataConnections>
</FBNetwork>
Expand Down
26 changes: 13 additions & 13 deletions data/typelibrary/adapterized-1.0.0/typelib/boolean/AX_OR_3.fbt
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<FBType Name="AX_OR_3" Comment="FB to calculate boolean OR" >
<Identification Standard="61499-2" Description="Copyright (c) 2024 HR Agrartechnik GmbH &#10; &#10;This program and the accompanying materials are made &#10;available under the terms of the Eclipse Public License 2.0 &#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#10; &#10;SPDX-License-Identifier: EPL-2.0" >
<Identification Standard="61499-2" Description="Copyright (c) 2024 HR Agrartechnik GmbH &#10; &#10;This program and the accompanying materials are made &#10;available under the terms of the Eclipse Public License 2.0 &#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#10; &#10;SPDX-License-Identifier: EPL-2.0" >
</Identification>
<VersionInfo Version="1.0" Author="franz" Date="2024-10-23">
<VersionInfo Organization="HR Agrartechnik GmbH" Version="1.0" Author="Franz Höpfinger" Date="2024-10-23">
</VersionInfo>
<CompilerInfo packageName="io::adp::boolean">
<CompilerInfo>
</CompilerInfo>
<InterfaceList>
<Plugs>
<AdapterDeclaration Name="OUT" Type="AX" Comment="OR result" x="-11713.33" y="-400"/>
<AdapterDeclaration Name="OUT" Type="AX" Comment="OR result" x="1600" y="813.33"/>
</Plugs>
<Sockets>
<AdapterDeclaration Name="IN1" Type="AX" Comment="OR input 1" x="-13713.33" y="-986.67"/>
<AdapterDeclaration Name="IN2" Type="AX" Comment="OR input 2" x="-13713.33" y="-400"/>
<AdapterDeclaration Name="IN3" Type="AX" Comment="OR input 3" x="-13713.33" y="186.67"/>
<AdapterDeclaration Name="IN1" Type="AX" Comment="OR input 1" x="133.33" y="33.33"/>
<AdapterDeclaration Name="IN2" Type="AX" Comment="OR input 2" x="133.33" y="813.33"/>
<AdapterDeclaration Name="IN3" Type="AX" Comment="OR input 3" x="133.33" y="1593.33"/>
</Sockets>
</InterfaceList>
<FBNetwork>
<FB Name="OR_3" Type="OR_3" x="-12760" y="-400">
<FB Name="OR_3" Type="OR_3" x="820" y="813.33">
</FB>
<EventConnections>
<Connection Source="IN1.E1" Destination="OR_3.REQ" dx1="280"/>
<Connection Source="IN1.E1" Destination="OR_3.REQ" dx1="73.33"/>
<Connection Source="IN2.E1" Destination="OR_3.REQ"/>
<Connection Source="OR_3.CNF" Destination="OUT.E1"/>
<Connection Source="IN3.E1" Destination="OR_3.REQ" dx1="280"/>
<Connection Source="IN3.E1" Destination="OR_3.REQ" dx1="73.33"/>
</EventConnections>
<DataConnections>
<Connection Source="IN1.D1" Destination="OR_3.IN1" dx1="246.67"/>
<Connection Source="IN2.D1" Destination="OR_3.IN2" dx1="246.67"/>
<Connection Source="IN1.D1" Destination="OR_3.IN1" dx1="206.67"/>
<Connection Source="IN2.D1" Destination="OR_3.IN2" dx1="140"/>
<Connection Source="OR_3.OUT" Destination="OUT.D1"/>
<Connection Source="IN3.D1" Destination="OR_3.IN3" dx1="313.33"/>
<Connection Source="IN3.D1" Destination="OR_3.IN3" dx1="140"/>
</DataConnections>
</FBNetwork>
</FBType>
34 changes: 17 additions & 17 deletions data/typelibrary/adapterized-1.0.0/typelib/boolean/AX_OR_4.fbt
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<FBType Name="AX_OR_4" Comment="FB to calculate boolean OR" >
<Identification Standard="61499-2" Description="Copyright (c) 2024 HR Agrartechnik GmbH &#10; &#10;This program and the accompanying materials are made &#10;available under the terms of the Eclipse Public License 2.0 &#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#10; &#10;SPDX-License-Identifier: EPL-2.0" >
<Identification Standard="61499-2" Description="Copyright (c) 2024 HR Agrartechnik GmbH &#10; &#10;This program and the accompanying materials are made &#10;available under the terms of the Eclipse Public License 2.0 &#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#10; &#10;SPDX-License-Identifier: EPL-2.0" >
</Identification>
<VersionInfo Version="1.0" Author="franz" Date="2024-10-23">
<VersionInfo Organization="HR Agrartechnik GmbH" Version="1.0" Author="Franz Höpfinger" Date="2024-10-23">
</VersionInfo>
<CompilerInfo packageName="io::adp::boolean">
<CompilerInfo>
</CompilerInfo>
<InterfaceList>
<Plugs>
<AdapterDeclaration Name="OUT" Type="AX" Comment="OR result" x="-17046.67" y="-366.67"/>
<AdapterDeclaration Name="OUT" Type="AX" Comment="OR result" x="1666.67" y="1200"/>
</Plugs>
<Sockets>
<AdapterDeclaration Name="IN1" Type="AX" Comment="OR input 1" x="-19046.67" y="-986.67"/>
<AdapterDeclaration Name="IN2" Type="AX" Comment="OR input 2" x="-19046.67" y="-366.67"/>
<AdapterDeclaration Name="IN3" Type="AX" Comment="OR input 3" x="-19046.67" y="253.33"/>
<AdapterDeclaration Name="IN4" Type="AX" Comment="OR input 4" x="-19046.67" y="873.33"/>
<AdapterDeclaration Name="IN1" Type="AX" Comment="OR input 1" x="133.33" y="33.33"/>
<AdapterDeclaration Name="IN2" Type="AX" Comment="OR input 2" x="133.33" y="813.33"/>
<AdapterDeclaration Name="IN3" Type="AX" Comment="OR input 3" x="133.33" y="1593.33"/>
<AdapterDeclaration Name="IN4" Type="AX" Comment="OR input 4" x="133.33" y="2373.33"/>
</Sockets>
</InterfaceList>
<FBNetwork>
<FB Name="OR_4" Type="OR_4" x="-18093.33" y="-366.67">
<FB Name="OR_4" Type="OR_4" x="886.67" y="1200">
</FB>
<EventConnections>
<Connection Source="IN1.E1" Destination="OR_4.REQ" dx1="273.33"/>
<Connection Source="IN2.E1" Destination="OR_4.REQ"/>
<Connection Source="IN1.E1" Destination="OR_4.REQ" dx1="140"/>
<Connection Source="IN2.E1" Destination="OR_4.REQ" dx1="140"/>
<Connection Source="OR_4.CNF" Destination="OUT.E1"/>
<Connection Source="IN3.E1" Destination="OR_4.REQ" dx1="266.67"/>
<Connection Source="IN4.E1" Destination="OR_4.REQ" dx1="266.67"/>
<Connection Source="IN3.E1" Destination="OR_4.REQ" dx1="140"/>
<Connection Source="IN4.E1" Destination="OR_4.REQ" dx1="140"/>
</EventConnections>
<DataConnections>
<Connection Source="IN1.D1" Destination="OR_4.IN1" dx1="233.33"/>
<Connection Source="IN2.D1" Destination="OR_4.IN2" dx1="233.33"/>
<Connection Source="IN1.D1" Destination="OR_4.IN1" dx1="206.67"/>
<Connection Source="IN2.D1" Destination="OR_4.IN2" dx1="73.33"/>
<Connection Source="OR_4.OUT" Destination="OUT.D1"/>
<Connection Source="IN3.D1" Destination="OR_4.IN3" dx1="300"/>
<Connection Source="IN4.D1" Destination="OR_4.IN4" dx1="333.33"/>
<Connection Source="IN3.D1" Destination="OR_4.IN3" dx1="206.67"/>
<Connection Source="IN4.D1" Destination="OR_4.IN4" dx1="273.33"/>
</DataConnections>
</FBNetwork>
</FBType>
6 changes: 3 additions & 3 deletions data/typelibrary/adapterized-1.0.0/typelib/io/IXA.fbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<FBType Name="IXA" Comment="Composite FB for boolean input data" >
<Identification Standard="61499-2" Description="Copyright (c) 2024 HR Agrartechnik GmbH &#10; &#10;This program and the accompanying materials are made &#10;available under the terms of the Eclipse Public License 2.0 &#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#10; &#10;SPDX-License-Identifier: EPL-2.0" >
<Identification Standard="61499-2" Description="Copyright (c) 2024 HR Agrartechnik GmbH &#10; &#10;This program and the accompanying materials are made &#10;available under the terms of the Eclipse Public License 2.0 &#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#10; &#10;SPDX-License-Identifier: EPL-2.0" >
</Identification>
<VersionInfo Version="1.0" Author="franz" Date="2024-04-24">
<VersionInfo Organization="HR Agrartechnik GmbH" Version="1.0" Author="Franz Höpfinger" Date="2024-04-24">
</VersionInfo>
<CompilerInfo>
</CompilerInfo>
Expand All @@ -28,7 +28,7 @@
<VarDeclaration Name="STATUS" Type="STRING" Comment="Service Status" />
</OutputVars>
<Plugs>
<AdapterDeclaration Name="IN" Type="AX" x="5600" y="1200"/>
<AdapterDeclaration Name="IN" Type="AX"/>
</Plugs>
</InterfaceList>
<FBNetwork>
Expand Down
6 changes: 3 additions & 3 deletions data/typelibrary/adapterized-1.0.0/typelib/io/QXA.fbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<FBType Name="QXA" Comment="Composite FB for boolean output data" >
<Identification Standard="61499-2" Description="Copyright (c) 2024 HR Agrartechnik GmbH &#10; &#10;This program and the accompanying materials are made &#10;available under the terms of the Eclipse Public License 2.0 &#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#10; &#10;SPDX-License-Identifier: EPL-2.0" >
<Identification Standard="61499-2" Description="Copyright (c) 2024 HR Agrartechnik GmbH &#10; &#10;This program and the accompanying materials are made &#10;available under the terms of the Eclipse Public License 2.0 &#10;which is available at https://www.eclipse.org/legal/epl-2.0/ &#10; &#10;SPDX-License-Identifier: EPL-2.0" >
</Identification>
<VersionInfo Version="1.0" Author="franz" Date="2024-04-24">
<VersionInfo Organization="HR Agrartechnik GmbH" Version="1.0" Author="Franz Höpfinger" Date="2024-04-24">
</VersionInfo>
<CompilerInfo>
</CompilerInfo>
Expand Down Expand Up @@ -32,7 +32,7 @@
<VarDeclaration Name="STATUS" Type="STRING" Comment="Service Status" />
</OutputVars>
<Sockets>
<AdapterDeclaration Name="OUT" Type="AX" x="-1800" y="900"/>
<AdapterDeclaration Name="OUT" Type="AX"/>
</Sockets>
</InterfaceList>
<FBNetwork>
Expand Down

0 comments on commit bcad466

Please sign in to comment.