Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: Fine tuning of the API and SPI #1786

Merged
merged 32 commits into from
Oct 2, 2024
Merged

refactor: Fine tuning of the API and SPI #1786

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
5236450
refactor: Fine tuning of the API and SPI to allow ILLEGAL_ADDRESS res…
chrisdutz Sep 24, 2024
2d25409
refactor: Major cleanup of the PlcValueHandler
chrisdutz Sep 25, 2024
7b55736
refactor: Major cleanup of the PlcValueHandler
chrisdutz Sep 25, 2024
3884549
refactor: Added more testcases to the PlcValueHandler tests
chrisdutz Sep 25, 2024
f7638e5
Merge remote-tracking branch 'origin/develop' into refactor/api-fine-…
chrisdutz Sep 26, 2024
1c5ffaf
refactor: Added more testcases to the PlcValueHandler tests (Refactor…
chrisdutz Sep 26, 2024
69e78c6
refactor: Added more testcases to the PlcValueHandler tests
chrisdutz Sep 26, 2024
3c0e4ea
refactor: Added more testcases to the PlcValueHandler tests
chrisdutz Sep 26, 2024
8182800
refactor: Added more testcases to the PlcValueHandler tests
chrisdutz Sep 26, 2024
7924a67
refactor: Finished updating the PlcValue types and the single item te…
chrisdutz Sep 27, 2024
b0bdbfe
Merge remote-tracking branch 'origin/develop' into refactor/api-fine-…
chrisdutz Sep 27, 2024
76e6ef3
refactor: Moved the PlcTagHandler from the driver to the PlcConnectio…
chrisdutz Sep 29, 2024
fad287d
fix: Hopefully fixed the time-zone issue in the tests.
chrisdutz Sep 29, 2024
097c9f8
fix: Added back a LegacyPlcValueHandler and made the OPC-UA Driver us…
chrisdutz Sep 29, 2024
16feb76
chore: sync xml
sruehl Sep 30, 2024
afa1765
refactor: Changed the names of the new items when serialized in xml t…
chrisdutz Sep 30, 2024
99018e6
refactor: Changed the names of the new items when serialized in xml t…
chrisdutz Sep 30, 2024
3a99cea
refactor: Changed the names of the new items when serialized in xml t…
chrisdutz Sep 30, 2024
0fd2d9c
fix: Disabled another OPC-UA test, which seems to be randomly failing…
chrisdutz Sep 30, 2024
7c6660c
doc: Updated the RELEASE_NOTES
chrisdutz Sep 30, 2024
5e43fcf
refactor: Renamed some of the variables in the Plc4xProtocolBase class
chrisdutz Sep 30, 2024
af7c030
refactor: Added support to a "toFuture()" method to return a future i…
chrisdutz Oct 1, 2024
42769a3
Merge remote-tracking branch 'origin/develop' into refactor/api-fine-…
chrisdutz Oct 1, 2024
1c2ca38
refactor: Added support to a "toFuture()" method to return a future i…
chrisdutz Oct 1, 2024
6317d31
chore: Updated some generated code.
chrisdutz Oct 1, 2024
aa4f965
refactor: Changed the structure of how to process requests in the ads…
chrisdutz Oct 1, 2024
cdcddcc
fix: Fixed a small bug in the size calculation of an ArrayInfo
chrisdutz Oct 1, 2024
24c9392
Merge remote-tracking branch 'refs/remotes/origin/develop' into refac…
chrisdutz Oct 2, 2024
4de3701
fix: Fixed how Modbus tags produce their array-info
chrisdutz Oct 2, 2024
6de3088
fix: Fixed how Modbus tags produce their array-info
chrisdutz Oct 2, 2024
198e42d
Merge remote-tracking branch 'origin/refactor/api-fine-tuning' into r…
chrisdutz Oct 2, 2024
69ee185
fix: Undid our future-chaining-experiment
chrisdutz Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions plc4go/assets/testing/protocols/ads/DriverTestsuite.xml
View file
Open in desktop
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
18 changes: 11 additions & 7 deletions plc4go/assets/testing/protocols/eip/DriverTestsuite.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,24 +398,28 @@
<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>
<DefaultPlcTagItem>
<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>
</DefaultPlcTagItem>
</hurz>
</tags>
</PlcTagRequest>
</PlcReadRequest>
</request>
<values isList="true">
<hurz>
<ResponseItem>
<DefaultPlcResponseItem>
<code dataType="string" bitLength="16" encoding="UTF-8">OK</code>
<value>
<PlcDINT dataType="int" bitLength="32">369229824</PlcDINT>
</value>
</ResponseItem>
</DefaultPlcResponseItem>
</hurz>
</values>
</PlcReadResponse>
Expand Down
122 changes: 71 additions & 51 deletions plc4go/assets/testing/protocols/modbus/tcp/DriverTestsuiteOptimized.xml
View file
Open in desktop
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
Loading