Skip to content

Commit

Permalink
refactor: Major cleanup of the PlcValueHandler
Browse files Browse the repository at this point in the history
  • Loading branch information
@chrisdutz
chrisdutz committed Sep 25, 2024
1 parent 5236450 commit 2d25409
Show file tree
Hide file tree
Showing 99 changed files with 2,492 additions and 1,883 deletions.
14 changes: 9 additions & 5 deletions plc4go/assets/testing/protocols/ads/DriverTestsuite.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1150,17 +1150,21 @@
<PlcTagRequest>
<tags isList="true">
<hurz>
<SymbolicAdsTag>
<symbolicAddress dataType="string" bitLength="128" encoding="UTF-8">MAIN.hurz_Struct</symbolicAddress>
</SymbolicAdsTag>
<DefaultPlcTagItem>
<tag>
<SymbolicAdsTag>
<symbolicAddress dataType="string" bitLength="128" encoding="UTF-8">MAIN.hurz_Struct</symbolicAddress>
</SymbolicAdsTag>
</tag>
</DefaultPlcTagItem>
</hurz>
</tags>
</PlcTagRequest>
</PlcReadRequest>
</request>
<values isList="true">
<hurz>
<ResponseItem>
<DefaultPlcResponseItem>
<code dataType="string" bitLength="16" encoding="UTF-8">OK</code>
<value>
<PlcStruct>
Expand Down Expand Up @@ -1232,7 +1236,7 @@
</hurz_DATE>
</PlcStruct>
</value>
</ResponseItem>
</DefaultPlcResponseItem>
</hurz>
</values>
</PlcReadResponse>
Expand Down
14 changes: 9 additions & 5 deletions plc4go/assets/testing/protocols/eip/DriverTestsuite.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -398,11 +398,15 @@
<PlcTagRequest>
<tags isList="true">
<hurz>
<EipTag>
<node dataType="string" bitLength="40" encoding="UTF-8">%rate</node>
<type dataType="string" bitLength="32" encoding="UTF-8">DINT</type>
<elementNb dataType="uint" bitLength="16">1</elementNb>
</EipTag>
<DefaultTagItem>
<tag>
<EipTag>
<node dataType="string" bitLength="40" encoding="UTF-8">%rate</node>
<type dataType="string" bitLength="32" encoding="UTF-8">DINT</type>
<elementNb dataType="uint" bitLength="16">1</elementNb>
</EipTag>
</tag>
</DefaultTagItem>
</hurz>
</tags>
</PlcTagRequest>
Expand Down
122 changes: 71 additions & 51 deletions plc4go/assets/testing/protocols/modbus/tcp/DriverTestsuiteOptimized.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,24 +97,28 @@
<PlcTagRequest>
<tags isList="true">
<hurz>
<ModbusTagHoldingRegister>
<address dataType="uint" bitLength="16">0</address>
<numberOfElements dataType="uint" bitLength="16">1</numberOfElements>
<dataType dataType="string" bitLength="32" encoding="UTF-8">REAL</dataType>
</ModbusTagHoldingRegister>
<DefaultPlcTagItem>
<tag>
<ModbusTagHoldingRegister>
<address dataType="uint" bitLength="16">0</address>
<numberOfElements dataType="uint" bitLength="16">1</numberOfElements>
<dataType dataType="string" bitLength="32" encoding="UTF-8">REAL</dataType>
</ModbusTagHoldingRegister>
</tag>
</DefaultPlcTagItem>
</hurz>
</tags>
</PlcTagRequest>
</PlcReadRequest>
</request>
<values isList="true">
<hurz>
<ResponseItem>
<DefaultPlcResponseItem>
<code dataType="string" bitLength="16" encoding="UTF-8">OK</code>
<value>
<PlcREAL dataType="float" bitLength="32">3.1415927410125732</PlcREAL>
</value>
</ResponseItem>
</DefaultPlcResponseItem>
</hurz>
</values>
</PlcReadResponse>
Expand Down Expand Up @@ -190,27 +194,31 @@
<PlcTagRequest>
<tags isList="true">
<hurz>
<ModbusTagHoldingRegister>
<address dataType="uint" bitLength="16">0</address>
<numberOfElements dataType="uint" bitLength="16">2</numberOfElements>
<dataType dataType="string" bitLength="32" encoding="UTF-8">REAL</dataType>
</ModbusTagHoldingRegister>
<DefaultPlcTagItem>
<tag>
<ModbusTagHoldingRegister>
<address dataType="uint" bitLength="16">0</address>
<numberOfElements dataType="uint" bitLength="16">2</numberOfElements>
<dataType dataType="string" bitLength="32" encoding="UTF-8">REAL</dataType>
</ModbusTagHoldingRegister>
</tag>
</DefaultPlcTagItem>
</hurz>
</tags>
</PlcTagRequest>
</PlcReadRequest>
</request>
<values isList="true">
<hurz>
<ResponseItem>
<DefaultPlcResponseItem>
<code dataType="string" bitLength="16" encoding="UTF-8">OK</code>
<value>
<PlcList>
<PlcREAL dataType="float" bitLength="32">3.1415927410125732</PlcREAL>
<PlcREAL dataType="float" bitLength="32">3.1415927410125732</PlcREAL>
</PlcList>
</value>
</ResponseItem>
</DefaultPlcResponseItem>
</hurz>
</values>
</PlcReadResponse>
Expand Down Expand Up @@ -290,39 +298,47 @@
<PlcTagRequest>
<tags isList="true">
<hurz1>
<ModbusTagHoldingRegister>
<address dataType="uint" bitLength="16">0</address>
<numberOfElements dataType="uint" bitLength="16">1</numberOfElements>
<dataType dataType="string" bitLength="32" encoding="UTF-8">REAL</dataType>
</ModbusTagHoldingRegister>
<DefaultPlcTagItem>
<tag>
<ModbusTagHoldingRegister>
<address dataType="uint" bitLength="16">0</address>
<numberOfElements dataType="uint" bitLength="16">1</numberOfElements>
<dataType dataType="string" bitLength="32" encoding="UTF-8">REAL</dataType>
</ModbusTagHoldingRegister>
</tag>
</DefaultPlcTagItem>
</hurz1>
<hurz2>
<ModbusTagHoldingRegister>
<address dataType="uint" bitLength="16">2</address>
<numberOfElements dataType="uint" bitLength="16">1</numberOfElements>
<dataType dataType="string" bitLength="32" encoding="UTF-8">REAL</dataType>
</ModbusTagHoldingRegister>
<DefaultPlcTagItem>
<tag>
<ModbusTagHoldingRegister>
<address dataType="uint" bitLength="16">2</address>
<numberOfElements dataType="uint" bitLength="16">1</numberOfElements>
<dataType dataType="string" bitLength="32" encoding="UTF-8">REAL</dataType>
</ModbusTagHoldingRegister>
</tag>
</DefaultPlcTagItem>
</hurz2>
</tags>
</PlcTagRequest>
</PlcReadRequest>
</request>
<values isList="true">
<hurz1>
<ResponseItem>
<DefaultPlcResponseItem>
<code dataType="string" bitLength="16" encoding="UTF-8">OK</code>
<value>
<PlcREAL dataType="float" bitLength="32">3.1415927410125732</PlcREAL>
</value>
</ResponseItem>
</DefaultPlcResponseItem>
</hurz1>
<hurz2>
<ResponseItem>
<DefaultPlcResponseItem>
<code dataType="string" bitLength="16" encoding="UTF-8">OK</code>
<value>
<PlcREAL dataType="float" bitLength="32">3.1415927410125732</PlcREAL>
</value>
</ResponseItem>
</DefaultPlcResponseItem>
</hurz2>
</values>
</PlcReadResponse>
Expand Down Expand Up @@ -401,19 +417,21 @@
<PlcTagRequest>
<tags isList="true">
<hurz>
<ModbusTagHoldingRegister>
<address dataType="uint" bitLength="16">0</address>
<numberOfElements dataType="uint" bitLength="16">1</numberOfElements>
<dataType dataType="string" bitLength="32" encoding="UTF-8">REAL</dataType>
</ModbusTagHoldingRegister>
<DefaultPlcTagValueItem>
<tag>
<ModbusTagHoldingRegister>
<address dataType="uint" bitLength="16">0</address>
<numberOfElements dataType="uint" bitLength="16">1</numberOfElements>
<dataType dataType="string" bitLength="32" encoding="UTF-8">REAL</dataType>
</ModbusTagHoldingRegister>
</tag>
<value>
<PlcREAL dataType="float" bitLength="32">3.1415927410125732</PlcREAL>
</value>
</DefaultPlcTagValueItem>
</hurz>
</tags>
</PlcTagRequest>
<values isList="true">
<hurz>
<PlcREAL dataType="float" bitLength="32">3.1415927410125732</PlcREAL>
</hurz>
</values>
</PlcWriteRequest>
</request>
<responseCodes isList="true">
Expand Down Expand Up @@ -498,22 +516,24 @@
<PlcTagRequest>
<tags isList="true">
<hurz>
<ModbusTagHoldingRegister>
<address dataType="uint" bitLength="16">0</address>
<numberOfElements dataType="uint" bitLength="16">2</numberOfElements>
<dataType dataType="string" bitLength="32" encoding="UTF-8">REAL</dataType>
</ModbusTagHoldingRegister>
<DefaultPlcTagValueItem>
<tag>
<ModbusTagHoldingRegister>
<address dataType="uint" bitLength="16">0</address>
<numberOfElements dataType="uint" bitLength="16">2</numberOfElements>
<dataType dataType="string" bitLength="32" encoding="UTF-8">REAL</dataType>
</ModbusTagHoldingRegister>
</tag>
<value>
<PlcList>
<PlcREAL dataType="float" bitLength="32">3.1415927410125732</PlcREAL>
<PlcREAL dataType="float" bitLength="32">3.1415927410125732</PlcREAL>
</PlcList>
</value>
</DefaultPlcTagValueItem>
</hurz>
</tags>
</PlcTagRequest>
<values isList="true">
<hurz>
<PlcList>
<PlcREAL dataType="float" bitLength="32">3.1415927410125732</PlcREAL>
<PlcREAL dataType="float" bitLength="32">3.1415927410125732</PlcREAL>
</PlcList>
</hurz>
</values>
</PlcWriteRequest>
</request>
<responseCodes isList="true">
Expand Down
Loading

0 comments on commit 2d25409

Please sign in to comment.