Skip to content

Commit

Permalink
update Wago FBs that they use STRING instead of WSTRING
Browse files Browse the repository at this point in the history
  • Loading branch information
moniwe authored and azoitl committed Sep 23, 2024
1 parent 62f4d3b commit 9a2933a
Show file tree
Hide file tree
Showing 4 changed files with 252 additions and 240 deletions.
135 changes: 69 additions & 66 deletions data/typelibrary/io-1.0.0/typelib/wago/Wago1405_6.fbt
Original file line number Diff line number Diff line change
@@ -1,67 +1,70 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
<FBType Comment="Service Interface Function Block Type" Name="Wago1405_6">
<Identification Description="Copyright (c) 2018 fortiss GmbH&#13;&#10; &#13;&#10;This program and the accompanying materials are made&#13;&#10;available under the terms of the Eclipse Public License 2.0&#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/&#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
<VersionInfo Author="Jose Cabral" Date="2018-12-05" Version="1.0"/>
<InterfaceList>
<EventInputs>
<Event Comment="Map Pins" Name="MAP" Type="Event">
<With Var="DigitalInput_1"/>
<With Var="DigitalInput_2"/>
<With Var="DigitalInput_5"/>
<With Var="DigitalInput_3"/>
<With Var="DigitalInput_4"/>
<With Var="DigitalInput_6"/>
<With Var="DigitalInput_7"/>
<With Var="DigitalInput_8"/>
<With Var="DigitalInput_9"/>
<With Var="DigitalInput_10"/>
<With Var="DigitalInput_11"/>
<With Var="DigitalInput_12"/>
<With Var="DigitalInput_13"/>
<With Var="DigitalInput_14"/>
<With Var="DigitalInput_15"/>
<With Var="DigitalInput_16"/>
<With Var="QI"/>
</Event>
</EventInputs>
<EventOutputs>
<Event Comment="Confirm Pin Mapping" Name="MAPO" Type="Event">
<With Var="QO"/>
</Event>
<Event Comment="Indication from Resource" Name="IND" Type="Event">
<With Var="QO"/>
<With Var="STATUS"/>
</Event>
</EventOutputs>
<InputVars>
<VarDeclaration Comment="Event Input Qualifier" Name="QI" Type="BOOL"/>
<VarDeclaration Comment="" Name="DigitalInput_1" Type="WSTRING"/>
<VarDeclaration Comment="" Name="DigitalInput_2" Type="WSTRING"/>
<VarDeclaration Comment="" Name="DigitalInput_3" Type="WSTRING"/>
<VarDeclaration Comment="" Name="DigitalInput_4" Type="WSTRING"/>
<VarDeclaration Comment="" Name="DigitalInput_5" Type="WSTRING"/>
<VarDeclaration Comment="" Name="DigitalInput_6" Type="WSTRING"/>
<VarDeclaration Comment="" Name="DigitalInput_7" Type="WSTRING"/>
<VarDeclaration Comment="" Name="DigitalInput_8" Type="WSTRING"/>
<VarDeclaration Comment="" Name="DigitalInput_9" Type="WSTRING"/>
<VarDeclaration Comment="" Name="DigitalInput_10" Type="WSTRING"/>
<VarDeclaration Comment="" Name="DigitalInput_11" Type="WSTRING"/>
<VarDeclaration Comment="" Name="DigitalInput_12" Type="WSTRING"/>
<VarDeclaration Comment="" Name="DigitalInput_13" Type="WSTRING"/>
<VarDeclaration Comment="" Name="DigitalInput_14" Type="WSTRING"/>
<VarDeclaration Comment="" Name="DigitalInput_15" Type="WSTRING"/>
<VarDeclaration Comment="" Name="DigitalInput_16" Type="WSTRING"/>
</InputVars>
<OutputVars>
<VarDeclaration Comment="Event Output Qualifier" Name="QO" Type="BOOL"/>
<VarDeclaration Comment="Service Status" Name="STATUS" Type="WSTRING"/>
</OutputVars>
<Plugs>
<AdapterDeclaration Comment="" Name="BusAdapterOut" Type="WagoBusAdapter"/>
</Plugs>
<Sockets>
<AdapterDeclaration Comment="" Name="BusAdapterIn" Type="WagoBusAdapter"/>
</Sockets>
</InterfaceList>
<?xml version="1.0" encoding="UTF-8"?>
<FBType Name="Wago1405_6" Comment="Service Interface Function Block Type">
<Identification Standard="61499-2" Description="Copyright (c) 2018, 2024 fortiss 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="Jose Cabral" Date="2018-12-05">
</VersionInfo>
<VersionInfo Version="1.1" Author="Monika Wenger" Date="2024-09-22">
</VersionInfo>
<InterfaceList>
<EventInputs>
<Event Name="MAP" Type="Event" Comment="Map Pins">
<With Var="DigitalInput_1"/>
<With Var="DigitalInput_2"/>
<With Var="DigitalInput_5"/>
<With Var="DigitalInput_3"/>
<With Var="DigitalInput_4"/>
<With Var="DigitalInput_6"/>
<With Var="DigitalInput_7"/>
<With Var="DigitalInput_8"/>
<With Var="DigitalInput_9"/>
<With Var="DigitalInput_10"/>
<With Var="DigitalInput_11"/>
<With Var="DigitalInput_12"/>
<With Var="DigitalInput_13"/>
<With Var="DigitalInput_14"/>
<With Var="DigitalInput_15"/>
<With Var="DigitalInput_16"/>
<With Var="QI"/>
</Event>
</EventInputs>
<EventOutputs>
<Event Name="MAPO" Type="Event" Comment="Confirm Pin Mapping">
<With Var="QO"/>
</Event>
<Event Name="IND" Type="Event" Comment="Indication from Resource">
<With Var="QO"/>
<With Var="STATUS"/>
</Event>
</EventOutputs>
<InputVars>
<VarDeclaration Name="QI" Type="BOOL" Comment="Event Input Qualifier"/>
<VarDeclaration Name="DigitalInput_1" Type="STRING" Comment=""/>
<VarDeclaration Name="DigitalInput_2" Type="STRING" Comment=""/>
<VarDeclaration Name="DigitalInput_3" Type="STRING" Comment=""/>
<VarDeclaration Name="DigitalInput_4" Type="STRING" Comment=""/>
<VarDeclaration Name="DigitalInput_5" Type="STRING" Comment=""/>
<VarDeclaration Name="DigitalInput_6" Type="STRING" Comment=""/>
<VarDeclaration Name="DigitalInput_7" Type="STRING" Comment=""/>
<VarDeclaration Name="DigitalInput_8" Type="STRING" Comment=""/>
<VarDeclaration Name="DigitalInput_9" Type="STRING" Comment=""/>
<VarDeclaration Name="DigitalInput_10" Type="STRING" Comment=""/>
<VarDeclaration Name="DigitalInput_11" Type="STRING" Comment=""/>
<VarDeclaration Name="DigitalInput_12" Type="STRING" Comment=""/>
<VarDeclaration Name="DigitalInput_13" Type="STRING" Comment=""/>
<VarDeclaration Name="DigitalInput_14" Type="STRING" Comment=""/>
<VarDeclaration Name="DigitalInput_15" Type="STRING" Comment=""/>
<VarDeclaration Name="DigitalInput_16" Type="STRING" Comment=""/>
</InputVars>
<OutputVars>
<VarDeclaration Name="QO" Type="BOOL" Comment="Event Output Qualifier"/>
<VarDeclaration Name="STATUS" Type="WSTRING" Comment="Service Status"/>
</OutputVars>
<Plugs>
<AdapterDeclaration Name="BusAdapterOut" Type="WagoBusAdapter" Comment=""/>
</Plugs>
<Sockets>
<AdapterDeclaration Name="BusAdapterIn" Type="WagoBusAdapter" Comment=""/>
</Sockets>
</InterfaceList>
</FBType>
135 changes: 69 additions & 66 deletions data/typelibrary/io-1.0.0/typelib/wago/Wago1504_5.fbt
Original file line number Diff line number Diff line change
@@ -1,67 +1,70 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE FBType SYSTEM "http://www.holobloc.com/xml/LibraryElement.dtd">
<FBType Comment="Service Interface Function Block Type" Name="Wago1504_5">
<Identification Description="Copyright (c) 2018 fortiss GmbH&#13;&#10; &#13;&#10;This program and the accompanying materials are made&#13;&#10;available under the terms of the Eclipse Public License 2.0&#13;&#10;which is available at https://www.eclipse.org/legal/epl-2.0/&#13;&#10;&#13;&#10;SPDX-License-Identifier: EPL-2.0" Standard="61499-2"/>
<VersionInfo Author="Jose Cabral" Date="2018-12-05" Version="1.0"/>
<InterfaceList>
<EventInputs>
<Event Comment="Map Pins" Name="MAP" Type="Event">
<With Var="DigitalOutput_1"/>
<With Var="DigitalOutput_2"/>
<With Var="DigitalOutput_5"/>
<With Var="DigitalOutput_3"/>
<With Var="DigitalOutput_4"/>
<With Var="DigitalOutput_6"/>
<With Var="DigitalOutput_7"/>
<With Var="DigitalOutput_8"/>
<With Var="DigitalOutput_9"/>
<With Var="DigitalOutput_10"/>
<With Var="DigitalOutput_11"/>
<With Var="DigitalOutput_12"/>
<With Var="DigitalOutput_13"/>
<With Var="DigitalOutput_14"/>
<With Var="DigitalOutput_15"/>
<With Var="DigitalOutput_16"/>
<With Var="QI"/>
</Event>
</EventInputs>
<EventOutputs>
<Event Comment="Confirm Pin Mapping" Name="MAPO" Type="Event">
<With Var="QO"/>
</Event>
<Event Comment="Indication from Resource" Name="IND" Type="Event">
<With Var="QO"/>
<With Var="STATUS"/>
</Event>
</EventOutputs>
<InputVars>
<VarDeclaration Comment="Event Input Qualifier" Name="QI" Type="BOOL"/>
<VarDeclaration Comment="" Name="DigitalOutput_1" Type="WSTRING"/>
<VarDeclaration Comment="" Name="DigitalOutput_2" Type="WSTRING"/>
<VarDeclaration Comment="" Name="DigitalOutput_3" Type="WSTRING"/>
<VarDeclaration Comment="" Name="DigitalOutput_4" Type="WSTRING"/>
<VarDeclaration Comment="" Name="DigitalOutput_5" Type="WSTRING"/>
<VarDeclaration Comment="" Name="DigitalOutput_6" Type="WSTRING"/>
<VarDeclaration Comment="" Name="DigitalOutput_7" Type="WSTRING"/>
<VarDeclaration Comment="" Name="DigitalOutput_8" Type="WSTRING"/>
<VarDeclaration Comment="" Name="DigitalOutput_9" Type="WSTRING"/>
<VarDeclaration Comment="" Name="DigitalOutput_10" Type="WSTRING"/>
<VarDeclaration Comment="" Name="DigitalOutput_11" Type="WSTRING"/>
<VarDeclaration Comment="" Name="DigitalOutput_12" Type="WSTRING"/>
<VarDeclaration Comment="" Name="DigitalOutput_13" Type="WSTRING"/>
<VarDeclaration Comment="" Name="DigitalOutput_14" Type="WSTRING"/>
<VarDeclaration Comment="" Name="DigitalOutput_15" Type="WSTRING"/>
<VarDeclaration Comment="" Name="DigitalOutput_16" Type="WSTRING"/>
</InputVars>
<OutputVars>
<VarDeclaration Comment="Event Output Qualifier" Name="QO" Type="BOOL"/>
<VarDeclaration Comment="Service Status" Name="STATUS" Type="WSTRING"/>
</OutputVars>
<Plugs>
<AdapterDeclaration Comment="" Name="BusAdapterOut" Type="WagoBusAdapter"/>
</Plugs>
<Sockets>
<AdapterDeclaration Comment="" Name="BusAdapterIn" Type="WagoBusAdapter"/>
</Sockets>
</InterfaceList>
<?xml version="1.0" encoding="UTF-8"?>
<FBType Name="Wago1504_5" Comment="Service Interface Function Block Type">
<Identification Standard="61499-2" Description="Copyright (c) 2018, 2024 fortiss 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="Jose Cabral" Date="2018-12-05">
</VersionInfo>
<VersionInfo Version="1.1" Author="Monika Wenger" Date="2024-09-22">
</VersionInfo>
<InterfaceList>
<EventInputs>
<Event Name="MAP" Type="Event" Comment="Map Pins">
<With Var="DigitalOutput_1"/>
<With Var="DigitalOutput_2"/>
<With Var="DigitalOutput_5"/>
<With Var="DigitalOutput_3"/>
<With Var="DigitalOutput_4"/>
<With Var="DigitalOutput_6"/>
<With Var="DigitalOutput_7"/>
<With Var="DigitalOutput_8"/>
<With Var="DigitalOutput_9"/>
<With Var="DigitalOutput_10"/>
<With Var="DigitalOutput_11"/>
<With Var="DigitalOutput_12"/>
<With Var="DigitalOutput_13"/>
<With Var="DigitalOutput_14"/>
<With Var="DigitalOutput_15"/>
<With Var="DigitalOutput_16"/>
<With Var="QI"/>
</Event>
</EventInputs>
<EventOutputs>
<Event Name="MAPO" Type="Event" Comment="Confirm Pin Mapping">
<With Var="QO"/>
</Event>
<Event Name="IND" Type="Event" Comment="Indication from Resource">
<With Var="QO"/>
<With Var="STATUS"/>
</Event>
</EventOutputs>
<InputVars>
<VarDeclaration Name="QI" Type="BOOL" Comment="Event Input Qualifier"/>
<VarDeclaration Name="DigitalOutput_1" Type="STRING" Comment=""/>
<VarDeclaration Name="DigitalOutput_2" Type="STRING" Comment=""/>
<VarDeclaration Name="DigitalOutput_3" Type="STRING" Comment=""/>
<VarDeclaration Name="DigitalOutput_4" Type="STRING" Comment=""/>
<VarDeclaration Name="DigitalOutput_5" Type="STRING" Comment=""/>
<VarDeclaration Name="DigitalOutput_6" Type="STRING" Comment=""/>
<VarDeclaration Name="DigitalOutput_7" Type="STRING" Comment=""/>
<VarDeclaration Name="DigitalOutput_8" Type="STRING" Comment=""/>
<VarDeclaration Name="DigitalOutput_9" Type="STRING" Comment=""/>
<VarDeclaration Name="DigitalOutput_10" Type="STRING" Comment=""/>
<VarDeclaration Name="DigitalOutput_11" Type="STRING" Comment=""/>
<VarDeclaration Name="DigitalOutput_12" Type="STRING" Comment=""/>
<VarDeclaration Name="DigitalOutput_13" Type="STRING" Comment=""/>
<VarDeclaration Name="DigitalOutput_14" Type="STRING" Comment=""/>
<VarDeclaration Name="DigitalOutput_15" Type="STRING" Comment=""/>
<VarDeclaration Name="DigitalOutput_16" Type="STRING" Comment=""/>
</InputVars>
<OutputVars>
<VarDeclaration Name="QO" Type="BOOL" Comment="Event Output Qualifier"/>
<VarDeclaration Name="STATUS" Type="WSTRING" Comment="Service Status"/>
</OutputVars>
<Plugs>
<AdapterDeclaration Name="BusAdapterOut" Type="WagoBusAdapter" Comment=""/>
</Plugs>
<Sockets>
<AdapterDeclaration Name="BusAdapterIn" Type="WagoBusAdapter" Comment=""/>
</Sockets>
</InterfaceList>
</FBType>
Loading

0 comments on commit 9a2933a

Please sign in to comment.