You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by ld...@apache.org on 2021/09/16 15:44:52 UTC
[plc4x] branch develop updated (d6bff1b -> 73a178b)
This is an automated email from the ASF dual-hosted git repository.
ldywicki pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git.
from d6bff1b plc4go: add missing implementations for ads driver
add 34d719a PLC4X-294 / PLC4X-296 Introduce event listeners for connections and drivers.
add 1aa57f5 Separate CAN transport and CAN driver.
add bbc00de Implementation of generic purpose CAN driver.
add 73a178b Update of CAN related documentation.
No new revisions were added by this update.
Summary of changes:
.../apache/plc4x/java/api/EventPlcConnection.java} | 20 +-
.../api/listener/ConnectionStateListener.java} | 14 +-
.../plc4x/java/api/listener/EventListener.java} | 10 +-
.../api/listener/MessageExchangeListener.java} | 14 +-
plc4j/drivers/{canopen => can}/pom.xml | 222 ++---
.../plc4x/java/can/adapter/CANDriverAdapter.java | 108 +++
.../java/can/adapter/Plc4xCANProtocolBase.java} | 18 +-
.../conversation/ConversationContextWrapper.java | 84 ++
.../conversation/DeferredErrorHandler.java} | 24 +-
.../DeferredRequestContextWrapper.java | 87 ++
.../conversation/DeferredTimeoutHandler.java} | 29 +-
.../ResolvedSendRequestContextWrapper.java | 80 ++
.../conversation/SendRequestContextWrapper.java | 90 ++
.../plc4x/java/can/generic/GenericCANDriver.java | 133 +++
.../configuration/GenericCANConfiguration.java} | 17 +-
.../generic/context/GenericCANDriverContext.java} | 7 +-
.../java/can/generic/field/GenericCANField.java | 83 ++
.../can/generic/field/GenericCANFieldHandler.java} | 20 +-
.../generic/protocol/GenericCANProtocolLogic.java | 229 +++++
.../protocol/GenericCANSubscriptionHandle.java | 58 ++
.../transport/GenericCANFrameDataHandler.java | 47 +
.../java/can/generic/transport/GenericFrame.java} | 38 +-
.../services/org.apache.plc4x.java.api.PlcDriver | 19 +
.../java/can/generic/GenericCANDriverTest.java | 97 ++
.../generic/field/GenericCANFieldHandlerTest.java} | 19 +-
plc4j/drivers/canopen/pom.xml | 186 ++--
.../plc4x/java/canopen/CANOpenPlcDriver.java | 51 +-
.../api/conversation/canopen/CANConversation.java | 11 +-
.../canopen/CANOpenConversationBase.java | 12 +-
.../canopen/SDODownloadConversation.java | 6 +-
.../canopen/SDOUploadConversation.java | 4 +-
.../configuration/CANOpenConfiguration.java | 2 +-
.../CANTransportConversation.java} | 17 +-
.../plc4x/java/canopen/helper/CANOpenHelper.java | 2 +-
.../plc4x/java/canopen/listener/Callback.java | 2 +-
.../java/canopen/listener/CompositeCallback.java | 2 +-
.../canopen/protocol/CANOpenProtocolLogic.java | 28 +-
.../canopen/transport/CANOpenFrameDataHandler.java | 68 ++
.../transport/socketcan/CANOpenSocketCANFrame.java | 159 ----
.../socketcan/io/CANOpenSocketCANFrameIO.java | 159 ----
.../plc4x/java/canopen/CANOpenDriverSDOIT.java | 2 -
.../plc4x/java/canopen/CANTestTransport.java | 63 ++
.../java/org/apache/plc4x/java/canopen/Main.java | 2 +-
.../canopen/transport/CANOpenFrameDataAdapter.java | 62 ++
.../transport/IdentityCANOpenFrameBuilder.java | 66 ++
.../org.apache.plc4x.java.spi.transport.Transport | 20 +
plc4j/drivers/pom.xml | 1 +
.../plc4x/java/spi/EventListenerMessageCodec.java | 64 ++
.../connection/CustomProtocolStackConfigurer.java | 157 ++++
.../spi/connection/DefaultNettyPlcConnection.java | 29 +-
.../java/spi/connection/GeneratedDriverBase.java | 14 +-
.../spi/connection/ProtocolStackConfigurer.java | 11 +-
.../connection/SingleProtocolStackConfigurer.java | 4 +-
plc4j/transports/can/pom.xml | 55 ++
.../plc4x/java/transport/can/CANFrameBuilder.java | 31 +
.../plc4x/java/transport/can/CANTransport.java | 48 +
.../transport/can}/CANTransportConfiguration.java | 2 +-
.../plc4x/java/transport/can/FrameData.java} | 13 +-
plc4j/transports/pom.xml | 2 +
plc4j/transports/socketcan/pom.xml | 50 +-
.../socketcan/SocketCANChannelFactory.java | 1 +
.../socketcan/SocketCANFrameBuilder.java} | 39 +-
.../transport/socketcan/SocketCANTransport.java | 72 +-
.../transport/socketcan}/helper/HeaderParser.java | 5 +-
plc4j/transports/{socketcan => virtualcan}/pom.xml | 32 +-
.../java/transport/virtualcan/VirtualCANFrame.java | 61 ++
.../transport/virtualcan/VirtualCANTransport.java | 128 +++
.../transport/virtualcan/io/VirtualCANFrameIO.java | 54 ++
.../org.apache.plc4x.java.spi.transport.Transport | 20 +
.../src/main/resources/protocols/can/canopen.mspec | 13 +-
.../protocols/canopen/CANOpenDriverSDOIT.xml | 987 +++++++++++++++------
{plc4j/transports => protocols/genericcan}/pom.xml | 32 +-
.../protocol/genericcan/GenericCANProtocol.java | 45 +
...e.plc4x.plugins.codegenerator.protocol.Protocol | 19 +
.../main/resources/protocols/can/genericcan.mspec | 106 +++
protocols/pom.xml | 2 +
{plc4j/transports => protocols/socketcan}/pom.xml | 30 +-
.../protocol/socketcan/SocketCANProtocol.java | 46 +
...e.plc4x.plugins.codegenerator.protocol.Protocol | 19 +
.../main/resources/protocols/can/socketcan.mspec | 40 +
src/site/asciidoc/users/protocols/can.adoc | 69 ++
src/site/asciidoc/users/protocols/canopen.adoc | 4 +-
src/site/asciidoc/users/protocols/genericcan.adoc | 126 +++
src/site/asciidoc/users/transports/can.adoc | 76 ++
src/site/asciidoc/users/transports/index.adoc | 1 +
85 files changed, 3905 insertions(+), 1094 deletions(-)
rename plc4j/{drivers/canopen/src/main/java/org/apache/plc4x/java/canopen/transport/CANOpenFrameBuilder.java => api/src/main/java/org/apache/plc4x/java/api/EventPlcConnection.java} (65%)
copy plc4j/{drivers/canopen/src/main/java/org/apache/plc4x/java/canopen/listener/Callback.java => api/src/main/java/org/apache/plc4x/java/api/listener/ConnectionStateListener.java} (78%)
copy plc4j/{drivers/canopen/src/main/java/org/apache/plc4x/java/canopen/transport/CANOpenFrameBuilderFactory.java => api/src/main/java/org/apache/plc4x/java/api/listener/EventListener.java} (85%)
copy plc4j/{drivers/canopen/src/main/java/org/apache/plc4x/java/canopen/listener/Callback.java => api/src/main/java/org/apache/plc4x/java/api/listener/MessageExchangeListener.java} (78%)
copy plc4j/drivers/{canopen => can}/pom.xml (62%)
create mode 100644 plc4j/drivers/can/src/main/java/org/apache/plc4x/java/can/adapter/CANDriverAdapter.java
copy plc4j/{spi/src/main/java/org/apache/plc4x/java/spi/connection/ProtocolStackConfigurer.java => drivers/can/src/main/java/org/apache/plc4x/java/can/adapter/Plc4xCANProtocolBase.java} (67%)
create mode 100644 plc4j/drivers/can/src/main/java/org/apache/plc4x/java/can/adapter/conversation/ConversationContextWrapper.java
copy plc4j/drivers/{canopen/src/test/java/org/apache/plc4x/java/canopen/CANOpenDriverSDOIT.java => can/src/main/java/org/apache/plc4x/java/can/adapter/conversation/DeferredErrorHandler.java} (58%)
create mode 100644 plc4j/drivers/can/src/main/java/org/apache/plc4x/java/can/adapter/conversation/DeferredRequestContextWrapper.java
copy plc4j/drivers/{canopen/src/main/java/org/apache/plc4x/java/canopen/listener/CompositeCallback.java => can/src/main/java/org/apache/plc4x/java/can/adapter/conversation/DeferredTimeoutHandler.java} (58%)
create mode 100644 plc4j/drivers/can/src/main/java/org/apache/plc4x/java/can/adapter/conversation/ResolvedSendRequestContextWrapper.java
create mode 100644 plc4j/drivers/can/src/main/java/org/apache/plc4x/java/can/adapter/conversation/SendRequestContextWrapper.java
create mode 100644 plc4j/drivers/can/src/main/java/org/apache/plc4x/java/can/generic/GenericCANDriver.java
copy plc4j/drivers/{canopen/src/main/java/org/apache/plc4x/java/canopen/configuration/CANOpenConfiguration.java => can/src/main/java/org/apache/plc4x/java/can/generic/configuration/GenericCANConfiguration.java} (77%)
rename plc4j/drivers/{canopen/src/main/java/org/apache/plc4x/java/canopen/transport/CANOpenFrameBuilderFactory.java => can/src/main/java/org/apache/plc4x/java/can/generic/context/GenericCANDriverContext.java} (82%)
create mode 100644 plc4j/drivers/can/src/main/java/org/apache/plc4x/java/can/generic/field/GenericCANField.java
copy plc4j/drivers/{canopen/src/main/java/org/apache/plc4x/java/canopen/transport/CANOpenFrame.java => can/src/main/java/org/apache/plc4x/java/can/generic/field/GenericCANFieldHandler.java} (67%)
create mode 100644 plc4j/drivers/can/src/main/java/org/apache/plc4x/java/can/generic/protocol/GenericCANProtocolLogic.java
create mode 100644 plc4j/drivers/can/src/main/java/org/apache/plc4x/java/can/generic/protocol/GenericCANSubscriptionHandle.java
create mode 100644 plc4j/drivers/can/src/main/java/org/apache/plc4x/java/can/generic/transport/GenericCANFrameDataHandler.java
copy plc4j/drivers/{canopen/src/main/java/org/apache/plc4x/java/canopen/transport/CANOpenFrame.java => can/src/main/java/org/apache/plc4x/java/can/generic/transport/GenericFrame.java} (54%)
create mode 100644 plc4j/drivers/can/src/main/resources/META-INF/services/org.apache.plc4x.java.api.PlcDriver
create mode 100644 plc4j/drivers/can/src/test/java/org/apache/plc4x/java/can/generic/GenericCANDriverTest.java
copy plc4j/drivers/{canopen/src/test/java/org/apache/plc4x/java/canopen/CANOpenDriverSDOIT.java => can/src/test/java/org/apache/plc4x/java/can/generic/field/GenericCANFieldHandlerTest.java} (64%)
rename plc4j/drivers/canopen/src/main/java/org/apache/plc4x/java/canopen/{socketcan/SocketCANConversation.java => conversation/CANTransportConversation.java} (71%)
create mode 100644 plc4j/drivers/canopen/src/main/java/org/apache/plc4x/java/canopen/transport/CANOpenFrameDataHandler.java
delete mode 100644 plc4j/drivers/canopen/src/main/java/org/apache/plc4x/java/canopen/transport/socketcan/CANOpenSocketCANFrame.java
delete mode 100644 plc4j/drivers/canopen/src/main/java/org/apache/plc4x/java/canopen/transport/socketcan/io/CANOpenSocketCANFrameIO.java
create mode 100644 plc4j/drivers/canopen/src/test/java/org/apache/plc4x/java/canopen/CANTestTransport.java
create mode 100644 plc4j/drivers/canopen/src/test/java/org/apache/plc4x/java/canopen/transport/CANOpenFrameDataAdapter.java
create mode 100644 plc4j/drivers/canopen/src/test/java/org/apache/plc4x/java/canopen/transport/IdentityCANOpenFrameBuilder.java
create mode 100644 plc4j/drivers/canopen/src/test/resources/META-INF/services/org.apache.plc4x.java.spi.transport.Transport
create mode 100644 plc4j/spi/src/main/java/org/apache/plc4x/java/spi/EventListenerMessageCodec.java
create mode 100644 plc4j/spi/src/main/java/org/apache/plc4x/java/spi/connection/CustomProtocolStackConfigurer.java
create mode 100644 plc4j/transports/can/pom.xml
create mode 100644 plc4j/transports/can/src/main/java/org/apache/plc4x/java/transport/can/CANFrameBuilder.java
create mode 100644 plc4j/transports/can/src/main/java/org/apache/plc4x/java/transport/can/CANTransport.java
rename plc4j/transports/{socketcan/src/main/java/org/apache/plc4x/java/transport/socketcan => can/src/main/java/org/apache/plc4x/java/transport/can}/CANTransportConfiguration.java (94%)
rename plc4j/{drivers/canopen/src/main/java/org/apache/plc4x/java/canopen/transport/CANOpenFrame.java => transports/can/src/main/java/org/apache/plc4x/java/transport/can/FrameData.java} (75%)
rename plc4j/{drivers/canopen/src/main/java/org/apache/plc4x/java/canopen/transport/socketcan/CANOpenSocketCANFrameBuilder.java => transports/socketcan/src/main/java/org/apache/plc4x/java/transport/socketcan/SocketCANFrameBuilder.java} (50%)
rename plc4j/{drivers/canopen/src/main/java/org/apache/plc4x/java/canopen => transports/socketcan/src/main/java/org/apache/plc4x/java/transport/socketcan}/helper/HeaderParser.java (93%)
copy plc4j/transports/{socketcan => virtualcan}/pom.xml (73%)
create mode 100644 plc4j/transports/virtualcan/src/main/java/org/apache/plc4x/java/transport/virtualcan/VirtualCANFrame.java
create mode 100644 plc4j/transports/virtualcan/src/main/java/org/apache/plc4x/java/transport/virtualcan/VirtualCANTransport.java
create mode 100644 plc4j/transports/virtualcan/src/main/java/org/apache/plc4x/java/transport/virtualcan/io/VirtualCANFrameIO.java
create mode 100644 plc4j/transports/virtualcan/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.transport.Transport
copy {plc4j/transports => protocols/genericcan}/pom.xml (67%)
create mode 100644 protocols/genericcan/src/main/java/org/apache/plc4x/protocol/genericcan/GenericCANProtocol.java
create mode 100644 protocols/genericcan/src/main/resources/META-INF/services/org.apache.plc4x.plugins.codegenerator.protocol.Protocol
create mode 100644 protocols/genericcan/src/main/resources/protocols/can/genericcan.mspec
copy {plc4j/transports => protocols/socketcan}/pom.xml (67%)
create mode 100644 protocols/socketcan/src/main/java/org/apache/plc4x/protocol/socketcan/SocketCANProtocol.java
create mode 100644 protocols/socketcan/src/main/resources/META-INF/services/org.apache.plc4x.plugins.codegenerator.protocol.Protocol
create mode 100644 protocols/socketcan/src/main/resources/protocols/can/socketcan.mspec
create mode 100644 src/site/asciidoc/users/protocols/can.adoc
create mode 100644 src/site/asciidoc/users/protocols/genericcan.adoc
create mode 100644 src/site/asciidoc/users/transports/can.adoc