You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cg...@apache.org on 2023/06/07 23:51:25 UTC
[plc4x] branch feat/hop updated (facb33c393 -> 1408efe8d8)
This is an automated email from the ASF dual-hosted git repository.
cgarcia pushed a change to branch feat/hop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
from facb33c393 Verifying the execution sequence for a multi-instance system.
add 1408efe8d8 Solves the S7 driver problems for handling cyclic subscriptions. Make the corrections in the Hop integration for the correct handling of Actions and Transforms.
No new revisions were added by this update.
Summary of changes:
.../java/s7/readwrite/Alarm8MessageQueryType.java | 3 -
.../readwrite/AlarmMessageAckObjectPushType.java | 3 -
.../java/s7/readwrite/AlarmMessageAckPushType.java | 3 -
.../s7/readwrite/AlarmMessageAckResponseType.java | 3 -
.../java/s7/readwrite/AlarmMessageAckType.java | 3 -
.../s7/readwrite/AlarmMessageObjectAckType.java | 3 -
.../s7/readwrite/AlarmMessageObjectPushType.java | 3 -
.../s7/readwrite/AlarmMessageObjectQueryType.java | 3 -
.../java/s7/readwrite/AlarmMessagePushType.java | 3 -
.../java/s7/readwrite/AlarmMessageQueryType.java | 3 -
.../plc4x/java/s7/readwrite/AlarmStateType.java | 2 +-
.../apache/plc4x/java/s7/readwrite/AlarmType.java | 2 +-
.../s7/readwrite/AssociatedQueryValueType.java | 3 -
.../java/s7/readwrite/AssociatedValueType.java | 3 -
.../s7/readwrite/COTPPacketConnectionRequest.java | 3 -
.../s7/readwrite/COTPPacketConnectionResponse.java | 3 -
.../plc4x/java/s7/readwrite/COTPPacketData.java | 3 -
.../s7/readwrite/COTPPacketDisconnectRequest.java | 3 -
.../s7/readwrite/COTPPacketDisconnectResponse.java | 3 -
.../java/s7/readwrite/COTPPacketTpduError.java | 3 -
.../plc4x/java/s7/readwrite/COTPParameter.java | 3 -
.../java/s7/readwrite/COTPParameterCalledTsap.java | 3 -
.../s7/readwrite/COTPParameterCallingTsap.java | 3 -
.../java/s7/readwrite/COTPParameterChecksum.java | 3 -
...TPParameterDisconnectAdditionalInformation.java | 3 -
.../java/s7/readwrite/COTPParameterTpduSize.java | 3 -
.../plc4x/java/s7/readwrite/COTPProtocolClass.java | 2 +-
.../plc4x/java/s7/readwrite/COTPTpduSize.java | 6 +-
.../java/s7/readwrite/CpuSubscribeEvents.java | 2 +-
.../java/s7/readwrite/CycServiceItemAnyType.java | 14 +-
.../s7/readwrite/CycServiceItemDbReadType.java | 3 -
.../java/s7/readwrite/CycServiceItemType.java | 3 -
.../java/s7/readwrite/DataTransportErrorCode.java | 2 +-
.../plc4x/java/s7/readwrite/DataTransportSize.java | 6 +-
.../plc4x/java/s7/readwrite/DateAndTime.java | 3 -
.../plc4x/java/s7/readwrite/DeviceGroup.java | 2 +-
.../apache/plc4x/java/s7/readwrite/EventType.java | 2 +-
.../apache/plc4x/java/s7/readwrite/MemoryArea.java | 6 +-
.../java/s7/readwrite/ModeTransitionType.java | 2 +-
.../apache/plc4x/java/s7/readwrite/QueryType.java | 2 +-
.../apache/plc4x/java/s7/readwrite/S7Address.java | 3 -
.../plc4x/java/s7/readwrite/S7AddressAny.java | 3 -
.../java/s7/readwrite/S7DataAlarmMessage.java | 3 -
.../apache/plc4x/java/s7/readwrite/S7Message.java | 3 -
.../java/s7/readwrite/S7MessageObjectRequest.java | 3 -
.../java/s7/readwrite/S7MessageObjectResponse.java | 3 -
.../plc4x/java/s7/readwrite/S7MessageRequest.java | 3 -
.../plc4x/java/s7/readwrite/S7MessageResponse.java | 3 -
.../java/s7/readwrite/S7MessageResponseData.java | 3 -
.../plc4x/java/s7/readwrite/S7MessageUserData.java | 3 -
.../plc4x/java/s7/readwrite/S7Parameter.java | 3 -
.../s7/readwrite/S7ParameterModeTransition.java | 3 -
.../s7/readwrite/S7ParameterReadVarRequest.java | 3 -
.../s7/readwrite/S7ParameterReadVarResponse.java | 3 -
.../readwrite/S7ParameterSetupCommunication.java | 3 -
.../java/s7/readwrite/S7ParameterUserData.java | 3 -
.../java/s7/readwrite/S7ParameterUserDataItem.java | 3 -
.../S7ParameterUserDataItemCPUFunctions.java | 3 -
.../s7/readwrite/S7ParameterWriteVarRequest.java | 3 -
.../s7/readwrite/S7ParameterWriteVarResponse.java | 3 -
.../apache/plc4x/java/s7/readwrite/S7Payload.java | 3 -
.../plc4x/java/s7/readwrite/S7PayloadAlarm8.java | 3 -
.../java/s7/readwrite/S7PayloadAlarmAckInd.java | 3 -
.../plc4x/java/s7/readwrite/S7PayloadAlarmS.java | 3 -
.../plc4x/java/s7/readwrite/S7PayloadAlarmSC.java | 3 -
.../plc4x/java/s7/readwrite/S7PayloadAlarmSQ.java | 3 -
.../s7/readwrite/S7PayloadDiagnosticMessage.java | 3 -
.../plc4x/java/s7/readwrite/S7PayloadNotify.java | 3 -
.../plc4x/java/s7/readwrite/S7PayloadNotify8.java | 3 -
.../s7/readwrite/S7PayloadReadVarResponse.java | 3 -
.../plc4x/java/s7/readwrite/S7PayloadUserData.java | 3 -
.../java/s7/readwrite/S7PayloadUserDataItem.java | 3 -
...erDataItemCpuFunctionAlarmAckErrorResponse.java | 3 -
...loadUserDataItemCpuFunctionAlarmAckRequest.java | 3 -
...oadUserDataItemCpuFunctionAlarmAckResponse.java | 3 -
...adUserDataItemCpuFunctionAlarmQueryRequest.java | 3 -
...dUserDataItemCpuFunctionAlarmQueryResponse.java | 3 -
...temCpuFunctionMsgSubscriptionAlarmResponse.java | 3 -
...rDataItemCpuFunctionMsgSubscriptionRequest.java | 3 -
...DataItemCpuFunctionMsgSubscriptionResponse.java | 3 -
...aItemCpuFunctionMsgSubscriptionSysResponse.java | 3 -
...serDataItemCpuFunctionReadSzlNoDataRequest.java | 3 -
...yloadUserDataItemCpuFunctionReadSzlRequest.java | 3 -
...loadUserDataItemCpuFunctionReadSzlResponse.java | 3 -
...UserDataItemCyclicServicesChangeDrivenPush.java | 3 -
...yclicServicesChangeDrivenSubscribeResponse.java | 3 -
...oadUserDataItemCyclicServicesErrorResponse.java | 3 -
.../S7PayloadUserDataItemCyclicServicesPush.java | 3 -
...UserDataItemCyclicServicesSubscribeRequest.java | 3 -
...serDataItemCyclicServicesSubscribeResponse.java | 3 -
...erDataItemCyclicServicesUnsubscribeRequest.java | 3 -
...rDataItemCyclicServicesUnsubscribeResponse.java | 3 -
.../s7/readwrite/S7PayloadWriteVarRequest.java | 3 -
.../s7/readwrite/S7PayloadWriteVarResponse.java | 3 -
.../java/s7/readwrite/S7VarPayloadDataItem.java | 3 -
.../java/s7/readwrite/S7VarPayloadStatusItem.java | 3 -
.../s7/readwrite/S7VarRequestParameterItem.java | 3 -
.../S7VarRequestParameterItemAddress.java | 3 -
.../org/apache/plc4x/java/s7/readwrite/State.java | 3 -
.../apache/plc4x/java/s7/readwrite/SubItem.java | 3 -
.../plc4x/java/s7/readwrite/SyntaxIdType.java | 2 +-
.../plc4x/java/s7/readwrite/SzlDataTreeItem.java | 3 -
.../org/apache/plc4x/java/s7/readwrite/SzlId.java | 3 -
.../java/s7/readwrite/SzlModuleTypeClass.java | 2 +-
.../apache/plc4x/java/s7/readwrite/SzlSublist.java | 2 +-
.../apache/plc4x/java/s7/readwrite/TPKTPacket.java | 3 -
.../apache/plc4x/java/s7/readwrite/TimeBase.java | 2 +-
.../plc4x/java/s7/readwrite/TransportSize.java | 46 +-
.../apache/plc4x/java/s7/events/S7CyclicEvent.java | 346 ++++--
.../apache/plc4x/java/s7/events/S7ModeEvent.java | 1 +
.../apache/plc4x/java/s7/readwrite/S7Driver.java | 2 +
.../readwrite/configuration/S7Configuration.java | 14 +-
.../java/s7/readwrite/context/S7DriverContext.java | 5 +-
.../java/s7/readwrite/optimizer/S7Optimizer.java | 9 +-
.../readwrite/protocol/S7HGeneratedDriverBase.java | 2 +-
.../plc4x/java/s7/readwrite/protocol/S7HMux.java | 1 +
.../java/s7/readwrite/protocol/S7HMuxImpl.java | 100 +-
...ttyPlcConnection.java => S7HPlcConnection.java} | 164 ++-
.../readwrite/protocol/S7ProtocolEventLogic.java | 41 +-
.../s7/readwrite/protocol/S7ProtocolLogic.java | 276 +++--
.../readwrite/utils/S7PlcSubscriptionHandle.java | 12 +
.../java/s7/readwrite/utils/StaticHelper.java | 3 +-
.../examples/plc4j/s7event/CycSubscription.java | 243 +++--
.../examples/plc4j/s7event/EventSubscription.java | 24 +-
.../plc4x/hop/metadata/util/Plc4xLookup.java | 4 +-
.../apache-hop/plc4x-hop-transformer/pom.xml | 5 +
.../hop/transforms/plc4xevent/Plc4xEvent.java | 569 +++++-----
.../plc4x/hop/transforms/plc4xinput/Plc4xRead.java | 1126 ++++++++++++++------
.../hop/transforms/plc4xinput/Plc4xReadDialog.java | 44 +-
.../hop/transforms/plc4xinput/Plc4xReadMeta.java | 452 ++++----
.../hop/transforms/plc4xoutput/Plc4xWrite.java | 816 +++++++-------
.../hop/transforms/plc4xoutput/Plc4xWriteMeta.java | 9 +-
.../plc4x/hop/transforms/plc4xsubs/Plc4xSubs.java | 939 ++++++++++------
.../util/{Plc4xPlcTag.java => Plc4xPlcField.java} | 20 +-
.../spi/connection/DefaultNettyPlcConnection.java | 1 +
.../java/plc4x/readwrite/Plc4xConnectRequest.java | 3 -
.../java/plc4x/readwrite/Plc4xConnectResponse.java | 3 -
.../plc4x/java/plc4x/readwrite/Plc4xConstants.java | 3 -
.../plc4x/java/plc4x/readwrite/Plc4xMessage.java | 3 -
.../java/plc4x/readwrite/Plc4xReadRequest.java | 3 -
.../java/plc4x/readwrite/Plc4xReadResponse.java | 3 -
.../plc4x/java/plc4x/readwrite/Plc4xTag.java | 3 -
.../java/plc4x/readwrite/Plc4xTagRequest.java | 3 -
.../java/plc4x/readwrite/Plc4xTagResponse.java | 3 -
.../java/plc4x/readwrite/Plc4xTagValueRequest.java | 3 -
.../plc4x/readwrite/Plc4xTagValueResponse.java | 3 -
.../java/plc4x/readwrite/Plc4xWriteRequest.java | 3 -
.../java/plc4x/readwrite/Plc4xWriteResponse.java | 3 -
.../s7/src/main/resources/protocols/s7/s7.mspec | 11 +-
src/site/asciidoc/images/01.png | Bin 0 -> 19058 bytes
src/site/asciidoc/images/dt0.png | Bin 0 -> 19058 bytes
src/site/asciidoc/images/dt01.png | Bin 0 -> 14671 bytes
src/site/asciidoc/images/dt02.png | Bin 0 -> 19607 bytes
src/site/asciidoc/users/protocols/01.png.cache | 1 +
src/site/asciidoc/users/protocols/dt0.png.cache | 1 +
src/site/asciidoc/users/protocols/dt01.png.cache | 1 +
src/site/asciidoc/users/protocols/dt02.png.cache | 1 +
.../asciidoc/users/protocols/image01.png.cache | 1 +
.../asciidoc/users/protocols/image02.png.cache | 1 +
.../asciidoc/users/protocols/image03.png.cache | 1 +
.../asciidoc/users/protocols/image04.png.cache | 1 +
.../asciidoc/users/protocols/image05.png.cache | 1 +
.../asciidoc/users/protocols/image06.png.cache | 1 +
.../asciidoc/users/protocols/image07.png.cache | 1 +
src/site/asciidoc/users/protocols/s7.adoc | 145 +++
.../asciidoc/users/protocols/szlxy11demo.png.cache | 1 +
166 files changed, 3479 insertions(+), 2330 deletions(-)
rename plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/{S7HDefaultNettyPlcConnection.java => S7HPlcConnection.java} (65%)
copy plc4j/integrations/apache-hop/plc4x-hop-transformer/src/main/java/org/apache/plc4x/hop/transforms/util/{Plc4xPlcTag.java => Plc4xPlcField.java} (85%)
create mode 100644 src/site/asciidoc/images/01.png
create mode 100644 src/site/asciidoc/images/dt0.png
create mode 100644 src/site/asciidoc/images/dt01.png
create mode 100644 src/site/asciidoc/images/dt02.png
create mode 100644 src/site/asciidoc/users/protocols/01.png.cache
create mode 100644 src/site/asciidoc/users/protocols/dt0.png.cache
create mode 100644 src/site/asciidoc/users/protocols/dt01.png.cache
create mode 100644 src/site/asciidoc/users/protocols/dt02.png.cache
create mode 100644 src/site/asciidoc/users/protocols/image01.png.cache
create mode 100644 src/site/asciidoc/users/protocols/image02.png.cache
create mode 100644 src/site/asciidoc/users/protocols/image03.png.cache
create mode 100644 src/site/asciidoc/users/protocols/image04.png.cache
create mode 100644 src/site/asciidoc/users/protocols/image05.png.cache
create mode 100644 src/site/asciidoc/users/protocols/image06.png.cache
create mode 100644 src/site/asciidoc/users/protocols/image07.png.cache
create mode 100644 src/site/asciidoc/users/protocols/szlxy11demo.png.cache