You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by hu...@apache.org on 2021/07/10 09:43:57 UTC
[plc4x] branch feature/native_opua_client updated (3d3030e ->
287bec3)
This is an automated email from the ASF dual-hosted git repository.
hutcheb pushed a change to branch feature/native_opua_client
in repository https://gitbox.apache.org/repos/asf/plc4x.git.
from 3d3030e Add plcConnection.close to read hello world example.
add b757e05 Minor formatting changes, log removal, etc..
add 7d87ec5 plc4j: fixed timing issue with SimulatedConnectionTest
add 3d27849 plc4x: unified golang and java xml writing of spi types
add 1954d40 plc4x: fixed datatypes and bitlengths of field types for spi (ads,eip,modbus,s7)
add 2c746dc It turns out the KNX discovery used "SendRequest" for the search. This resulted in only one response being handled and the second response being discarded. Refactored the code to use a loop consuming the default-channel, hereby allowing multiple responses.
add a0afb3c plc4j: small cleanup and refactorings on BacNetIpProtocolLogic
add 35ff4b5 plc4go: initial bacnet draft
add 287bec3 Merge branch 'develop' into feature/native_opua_client
No new revisions were added by this update.
Summary of changes:
.../testing/protocols/ads/DriverTestsuite.xml | 66 +++----
.../testing/protocols/eip/DriverTestsuite.xml | 10 +-
.../testing/protocols/modbus/DriverTestsuite.xml | 64 +++----
.../testing/protocols/s7/DriverTestsuite.xml | 30 +--
plc4go/internal/plc4go/ads/Field.go | 112 +++--------
plc4go/internal/plc4go/bacnetip/Connection.go | 77 ++++++++
plc4go/internal/plc4go/bacnetip/Driver.go | 81 +++++++-
plc4go/internal/plc4go/bacnetip/Field.go | 92 +++++++++
.../plc4go/{eip => bacnetip}/FieldHandler.go | 30 +--
.../plc4go/{s7 => bacnetip}/MessageCodec.go | 16 +-
plc4go/internal/plc4go/bacnetip/Subscriber.go | 70 +++++++
.../plc4go/{modbus => bacnetip}/ValueHandler.go | 2 +-
plc4go/internal/plc4go/eip/Field.go | 34 ++--
plc4go/internal/plc4go/knxnetip/Discoverer.go | 61 +++---
plc4go/internal/plc4go/modbus/Field.go | 25 +--
plc4go/internal/plc4go/s7/Field.go | 74 +++++---
.../plc4go/spi/model/DefaultPlcReadRequest.go | 29 +--
.../plc4go/spi/model/DefaultPlcReadResponse.go | 54 +++---
.../spi/model/DefaultPlcSubscriptionEvent.go | 22 +--
.../spi/model/DefaultPlcSubscriptionRequest.go | 29 +--
.../spi/model/DefaultPlcSubscriptionResponse.go | 33 ++--
.../plc4go/spi/model/DefaultPlcWriteRequest.go | 64 +++----
.../plc4go/spi/model/DefaultPlcWriteResponse.go | 31 ++-
.../plc4go/spi/testutils/DriverTestRunner.go | 23 ++-
plc4go/internal/plc4go/spi/testutils/TestUtils.go | 12 ++
plc4go/internal/plc4go/spi/values/BINT.go | 14 +-
plc4go/internal/plc4go/spi/values/BOOL.go | 23 +--
plc4go/internal/plc4go/spi/values/BREAL.go | 14 +-
plc4go/internal/plc4go/spi/values/BYTE.go | 11 +-
plc4go/internal/plc4go/spi/values/CHAR.go | 11 +-
plc4go/internal/plc4go/spi/values/DATE.go | 9 +-
plc4go/internal/plc4go/spi/values/DATE_AND_TIME.go | 9 +-
plc4go/internal/plc4go/spi/values/DINT.go | 12 +-
plc4go/internal/plc4go/spi/values/DWORD.go | 11 +-
plc4go/internal/plc4go/spi/values/INT.go | 9 +-
plc4go/internal/plc4go/spi/values/LINT.go | 9 +-
plc4go/internal/plc4go/spi/values/LREAL.go | 9 +-
plc4go/internal/plc4go/spi/values/LTIME.go | 9 +-
plc4go/internal/plc4go/spi/values/LWORD.go | 11 +-
plc4go/internal/plc4go/spi/values/NULL.go | 12 --
plc4go/internal/plc4go/spi/values/PlcBitString.go | 23 +--
plc4go/internal/plc4go/spi/values/PlcByteArray.go | 16 +-
plc4go/internal/plc4go/spi/values/PlcList.go | 31 +--
plc4go/internal/plc4go/spi/values/PlcStruct.go | 28 ++-
plc4go/internal/plc4go/spi/values/REAL.go | 13 +-
plc4go/internal/plc4go/spi/values/RawPlcValue.go | 14 --
plc4go/internal/plc4go/spi/values/SINT.go | 9 +-
plc4go/internal/plc4go/spi/values/STRING.go | 11 +-
plc4go/internal/plc4go/spi/values/TIME.go | 9 +-
plc4go/internal/plc4go/spi/values/TIME_OF_DAY.go | 9 +-
plc4go/internal/plc4go/spi/values/UDINT.go | 9 +-
plc4go/internal/plc4go/spi/values/UINT.go | 9 +-
plc4go/internal/plc4go/spi/values/ULINT.go | 9 +-
plc4go/internal/plc4go/spi/values/USINT.go | 9 +-
plc4go/internal/plc4go/spi/values/WCHAR.go | 9 +-
plc4go/internal/plc4go/spi/values/WORD.go | 11 +-
plc4go/internal/plc4go/spi/values/WSTRING.go | 9 +-
.../plc4x/java/ads/field/DirectAdsField.java | 6 +-
.../plc4x/java/ads/field/DirectAdsStringField.java | 6 +-
.../plc4x/java/ads/field/SymbolicAdsField.java | 2 +-
.../java/ads/field/SymbolicAdsStringField.java | 4 +-
.../plc4x/java/eip/readwrite/field/EipField.java | 2 +-
.../plc4x/java/modbus/field/ModbusField.java | 4 +-
.../plc4x/java/opcua/context/SecureChannel.java | 60 ++----
.../java/opcua/protocol/OpcuaProtocolLogic.java | 12 +-
.../plc4x/java/s7/readwrite/field/S7Field.java | 8 +-
.../java/s7/readwrite/field/S7StringField.java | 8 +-
.../simulated/connection/SimulatedConnection.java | 75 ++++----
.../java/simulated/connection/SimulatedDevice.java | 41 +++-
.../plc4x/java/simulated/field/SimulatedField.java | 4 +-
.../java/simulated/types/SimulatedFieldType.java | 2 -
.../plc4x/java/simulated/utils/StaticHelper.java | 3 +-
.../connection/SimulatedConnectionTest.java | 19 +-
.../java/spi/generation/WriteBufferXmlBased.java | 15 +-
.../messages/DefaultPlcSubscriptionRequest.java | 9 +-
.../spi/model/DefaultPlcSubscriptionField.java | 9 +
.../spi/model/DefaultPlcSubscriptionHandle.java | 5 +-
.../org/apache/plc4x/java/spi/values/PlcBOOL.java | 8 +
.../org/apache/plc4x/java/spi/values/PlcBYTE.java | 8 +
.../plc4x/java/spi/values/PlcBigDecimal.java | 4 +-
.../plc4x/java/spi/values/PlcBigInteger.java | 3 +-
.../org/apache/plc4x/java/spi/values/PlcCHAR.java | 9 +
.../org/apache/plc4x/java/spi/values/PlcDATE.java | 4 +-
.../plc4x/java/spi/values/PlcDATE_AND_TIME.java | 4 +-
.../org/apache/plc4x/java/spi/values/PlcDINT.java | 8 +
.../org/apache/plc4x/java/spi/values/PlcDWORD.java | 8 +
.../org/apache/plc4x/java/spi/values/PlcINT.java | 10 +-
.../org/apache/plc4x/java/spi/values/PlcLINT.java | 8 +
.../org/apache/plc4x/java/spi/values/PlcLREAL.java | 8 +
.../org/apache/plc4x/java/spi/values/PlcLTIME.java | 4 +-
.../org/apache/plc4x/java/spi/values/PlcLWORD.java | 8 +
.../org/apache/plc4x/java/spi/values/PlcREAL.java | 8 +
.../org/apache/plc4x/java/spi/values/PlcSINT.java | 8 +
.../apache/plc4x/java/spi/values/PlcSTRING.java | 4 +-
.../org/apache/plc4x/java/spi/values/PlcTIME.java | 4 +-
.../plc4x/java/spi/values/PlcTIME_OF_DAY.java | 4 +-
.../org/apache/plc4x/java/spi/values/PlcUDINT.java | 8 +
.../org/apache/plc4x/java/spi/values/PlcUINT.java | 8 +
.../org/apache/plc4x/java/spi/values/PlcULINT.java | 8 +
.../org/apache/plc4x/java/spi/values/PlcUSINT.java | 8 +
.../org/apache/plc4x/java/spi/values/PlcWCHAR.java | 9 +
.../org/apache/plc4x/java/spi/values/PlcWORD.java | 8 +
.../resources/protocols/ads/DriverTestsuite.xml | 66 +++----
.../resources/protocols/eip/DriverTestsuite.xml | 10 +-
.../resources/protocols/modbus/DriverTestsuite.xml | 64 +++----
.../resources/protocols/s7/DriverTestsuite.xml | 30 +--
.../bacnetip/protocol/BacNetIpProtocolLogic.java | 207 +++++++++++----------
107 files changed, 1349 insertions(+), 1035 deletions(-)
create mode 100644 plc4go/internal/plc4go/bacnetip/Connection.go
create mode 100644 plc4go/internal/plc4go/bacnetip/Field.go
copy plc4go/internal/plc4go/{eip => bacnetip}/FieldHandler.go (65%)
copy plc4go/internal/plc4go/{s7 => bacnetip}/MessageCodec.go (89%)
create mode 100644 plc4go/internal/plc4go/bacnetip/Subscriber.go
copy plc4go/internal/plc4go/{modbus => bacnetip}/ValueHandler.go (98%)