You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2019/08/26 09:09:20 UTC
[plc4x] branch develop updated (79d81d9 -> 04c9bf2)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git.
from 79d81d9 - Fixed some problems after pulling in latest changes from develop
add 98fdbb1 Current Implementation.
add 84fa760 Added first draft of Netty NIO Implementation for Serial Port communication + little documentation about writing drivers.
add acfbbf4 Some improvements.
add bbafb67 Fixed Test.
add 1a8d378 [DF1] Added Initial Setup.
add cf3f001 DLC-207
add a2a1322 DLC-207
add f486e5b DLC-207
add 54502ab DLC-207 first mspec definition
add dae710b - Some major tweaking of how the mspec handles discriminator types - Added arguments to the serialize methods, the same way they were added to the parse methods - made the mspec parser allow array index expressions
add 679fe99 DLC-207 first mspec definition
add 163b239 - Tweaked the mspec for the DF1 protocol - Started implementing a PLC4X driver based on the generated code
add 3efabc6 Fixed minor build issues.
add 2186536 Added TestClass EndtoEnt. Added dependency to HelloPlc4X.
add 8fd5434 Matching pattern tests for serial/DF1 added
add 34263e0 Plc4XDf1Protocol
add 841ab88 pom modified for asciidoc
add 3311ed8 - Simplified the mspec for the DF1 protocol - Added a "terminated" type of arrayField - Made the ReadBuffer endianness aware - Made the testsuite endianness aware
add d5346b1 - Updated the current Netty driver prototype to work with the latest code generation updates.
add e68af1b - Try to make sonar run on sonarcloud
add 44d3a14 - Added some additional field types: - "checksum" (throws error during parsing, if the checksum is invalid) - "padding" (allows adding additional padding bytes if a condition evaluates to true) - Started implementing field types: - "manual" (Like a simple field, but we have full control over the parsing and serialization) - "manualArray" (Like a array field, but we have full control over the parsing and serialization) - Renamed some of the field types: - "field [...]
add 1eebf3e - Renamed the ArrayField and ManualArrayFields "lengthType" and "lengthExpression" to "loopType" and "loopExpression" because the ManualArrayField needed a "lengthExpression" - Implemented the code-generation for "manual" and "manualArray" types
add 875ac8b - Changed the driver to initialize the buffer with the correct size.
add 908d263 - Disabled the sonarcloud analysis until I get my hands on some infra-guys (Were unresponsive for almost a day now)
add e7a5a55 - Reactivated the sonarcloud analysis
add d1b08a0 - Tried to get the syntax right
add 2c1afbc - Continued working on the Jenkinsfile
add 4ba253f - Re-enabled the ADS driver and temporarily commented out the broken code parts.
add 99354f0 - Continued working on the Jenkinsfile
add e7f0299 - Commented out the test to get the build running again
add e8cbfd2 - Commented out the test to get the build running again
add 90fb9ba - Removed the entire test, as ignoring didn't seem to hlep
add 554ad75 - Continued working on the Jenkinsfile
add 66e148d - Continued working on the Jenkinsfile
add bcc7434 - Continued working on the Jenkinsfile
add 2165809 - Continued working on the Jenkinsfile
add 1233d50 - Re-enabled the full build after enabling the sonarcloud analysis
add 4f5cebd Added .vscode to .gitignore
add 45a6326 Removed settings file from .vscode (should not be in the repo)
add 3465ec7 PLC4X-90: scraper Refactoring *added TriggerCollector (collect and execute all triggerRequests) *added date datatypes (DateAndTime,Date and TimeOfDay) (PLC4X-104) *trigger comparison extended to previous value instead of only static value (PLC4X-109) *fixed bug for strings >127chars (PLC4X-141) *improved functionality *fixed several minor bugs *api modification for scraper usage *renaming
add 1e6336f - Added/corected Javadoc comments to prevent errors in the javadoc execution.
add bcfd6a5 - Activated the "apache-release" profile to ensure everything required during a release is actually checked (It appears javadoc issues would have caused errors as they weren't detected)
add 86e64af - Added some stricter rules regarding dependency convergence and including duplicate classes
add b660eda - Tried to find out why the build fails randomly.
add 7efd022 - Removed the apache-release profile as Jenkins cannot sign artifacts
add 812e3e5 - Fix some of the groovy libraries to fixed versions
add 26cfae2 [DF1] Implemented some handling in Plc4XDf1Protocol.java
add c99e7bd [DF1] Added some more details.
add b588b7d ToDos
add 5aebf21 ToDos
add f96e81b df1field
add 24820e8 data type handling
add 2616bf9 Fixed somme rat issues.
add 52fa884 pom modified for asciidoc
add d2d01f5 - Fix some of the groovy libraries to fixed versions
add 7961434 [DF1] Implemented some handling in Plc4XDf1Protocol.java
add 2a7fdf5 Merge remote-tracking branch 'official/feature/implement-df1-driver' into merge-julian-branch
add 6ad15c0 [DF1] Added some more details.
add 42cb153 Merge remote-tracking branch 'official/feature/implement-df1-driver' into merge-julian-branch
add a17849f ToDos
add 74fbc13 ToDos
add e28a21d df1field
add 3db1bae data type handling
add 6db8070 Merge branch 'merge-julian-branch' of https://github.com/vemmert/plc4x into merge-julian-branch
add 81ef718 Implemented doRead contract right.
add 583fe37 Fixed Netty Dependency Version.
add 262a6c4 data type handling
add 496e1c8 Implemented Flush.
add 184e9d9 Added write Support.
add 5144b49 Fixed Write Exception.
add 8246c56 data type handling
add 855b388 - Working on refactoring the Kafka Connect configuration.
add de4a0ff - Removed the kafka connect sink
add e023f2c - Fix some more versions to managed versions
add c5231c6 - Fix dependencyVersion problems
add c34a6bd - Fix dependencyVersion problems
add 5e74907 - Added a "rules" element to make the plugin happy on some maven versions.
add 58d8c54 - Continued working on the scraper based Kafka Connect plugin
add 063d66b - Continued working on the scraper based Kafka Connect plugin - Added an assembly that also merges the services files
add 8519070 - Got a first working scraper-based Kafka Connect Source working
add f6e1a4f Raw Socket works now reasonaly well, I think.
add a918adb Cherry Picked some of the changes regarding Raw-Sockets: Raw Socket works now reasonaly well, I think.
add c428fac Cherry Picked some of the changes regarding Raw-Sockets: Raw Socket works now reasonaly well, I think.
add 66dc66f Tried to make the test run on the nodes without "en0" device by going through the list of devices looking for the loopback device and using this.
add 2c11269 - Continued fine-tuning the raw sockets.
add c8c1530 - Fixed things I broke :-}
add 6ea2f88 - Added Passive mode templates and an sandbox passive mode s7 driver
add 4b5bf42 PLC4X-86 - Fix and re-enable tests that were disabled for Java 11 support
add a1125b9 - Implement a first partially working passive S7 driver. - Fixed some issues in the S7 mspec - Fixed some issues with optional fields in the code generation - Extended the mspec antlr4 grammar to support "/" and "*" operations
add 04ba600 - Fixed a dependency usage problem.
add ddc5375 - Removed some invalid configuration options raw sockets don't support.
add fd26d80 - Increasing the timeout to 24 hours as Jenkins seems to be rather slow at the moment ...
add fbb68e3 - Changed the deploy phase to run on a node labeled: nexus-deploy
add fc1e77f - Finished a first fully operational version of the Kafka Connect Source
add 023f2c0 - Fixed some problems after pulling in latest changes from develop
new 04c9bf2 Merge branches 'develop' and 'merge-julian-branch' of https://gitbox.apache.org/repos/asf/plc4x into develop
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
plc4j/drivers/ads/pom.xml | 5 -
.../ads/connection/AdsSerialPlcConnectionTest.java | 4 +-
plc4j/drivers/modbus/pom.xml | 5 -
.../connection/ModbusSerialPlcConnectionTest.java | 4 +-
plc4j/examples/hello-world-plc4x/pom.xml | 6 -
plc4j/protocols/driver-bases/serial/pom.xml | 23 +-
.../plc4x/java/base/connection/SerialChannel.java | 636 +++++++++++++++++++++
.../java/base/connection/SerialChannelFactory.java | 34 +-
.../java/base/connection/SerialChannelHandler.java | 172 ++++++
.../base/connection/SerialPollingSelector.java | 179 ++++++
.../java/base/connection/SerialSelectionKey.java | 81 +++
.../base/connection/SerialSelectorProvider.java | 68 +++
.../java/base/connection/SerialSocketAddress.java} | 34 +-
.../java/base/connection/SerialSocketChannel.java | 158 +++++
.../base/connection/SerialChannelFactoryTest.java | 108 ++++
pom.xml | 12 +-
sandbox/test-java-df1-driver/pom.xml | 12 +-
.../org/apache/plc4x/java/df1/DF1PlcDriver.java | 1 +
.../java/org/apache/plc4x/java/df1/Df1Field.java | 15 +-
.../org/apache/plc4x/java/df1/fields/DataType.java | 31 +-
.../plc4x/java/df1/protocol/Df1Protocol.java | 94 +--
.../plc4x/java/df1/protocol/Plc4XDf1Protocol.java | 127 +++-
.../org/apache/plc4x/java/df1/util/DF1Utils.java | 68 ++-
.../plc4x/protocol/df1/BenchmarkManualDf1.java | 30 +-
.../apache/plc4x/protocol/df1/EndToEndTest.java | 11 +-
.../developers/writing-driver/writing-driver.adoc | 57 ++
26 files changed, 1793 insertions(+), 182 deletions(-)
create mode 100644 plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/base/connection/SerialChannel.java
create mode 100644 plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/base/connection/SerialChannelHandler.java
create mode 100644 plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/base/connection/SerialPollingSelector.java
create mode 100644 plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/base/connection/SerialSelectionKey.java
create mode 100644 plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/base/connection/SerialSelectorProvider.java
copy plc4j/protocols/driver-bases/{test/src/main/java/org/apache/plc4x/java/mock/MockField.java => serial/src/main/java/org/apache/plc4x/java/base/connection/SerialSocketAddress.java} (54%)
create mode 100644 plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/base/connection/SerialSocketChannel.java
create mode 100644 plc4j/protocols/driver-bases/serial/src/test/java/org/apache/plc4x/java/base/connection/SerialChannelFactoryTest.java
create mode 100644 src/site/asciidoc/developers/writing-driver/writing-driver.adoc
[plc4x] 01/01: Merge branches 'develop' and 'merge-julian-branch'
of https://gitbox.apache.org/repos/asf/plc4x into develop
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 04c9bf2abaa6c143d0a4cb22a983d27a46cea55e
Merge: 79d81d9 023f2c0
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Mon Aug 26 10:59:37 2019 +0200
Merge branches 'develop' and 'merge-julian-branch' of https://gitbox.apache.org/repos/asf/plc4x into develop
Conflicts:
plc4j/protocols/driver-bases/serial/src/main/java/org/apache/plc4x/java/base/connection/SerialChannelFactory.java
pom.xml
plc4j/drivers/ads/pom.xml | 5 -
.../ads/connection/AdsSerialPlcConnectionTest.java | 4 +-
plc4j/drivers/modbus/pom.xml | 5 -
.../connection/ModbusSerialPlcConnectionTest.java | 4 +-
plc4j/examples/hello-world-plc4x/pom.xml | 6 -
plc4j/protocols/driver-bases/serial/pom.xml | 23 +-
.../plc4x/java/base/connection/SerialChannel.java | 636 +++++++++++++++++++++
.../java/base/connection/SerialChannelFactory.java | 34 +-
.../java/base/connection/SerialChannelHandler.java | 172 ++++++
.../base/connection/SerialPollingSelector.java | 179 ++++++
.../java/base/connection/SerialSelectionKey.java | 81 +++
.../base/connection/SerialSelectorProvider.java | 68 +++
.../java/base/connection/SerialSocketAddress.java | 36 +-
.../java/base/connection/SerialSocketChannel.java | 158 +++++
.../base/connection/SerialChannelFactoryTest.java | 108 ++++
pom.xml | 12 +-
sandbox/test-java-df1-driver/pom.xml | 12 +-
.../org/apache/plc4x/java/df1/DF1PlcDriver.java | 1 +
.../java/org/apache/plc4x/java/df1/Df1Field.java | 15 +-
.../org/apache/plc4x/java/df1/fields/DataType.java | 31 +-
.../plc4x/java/df1/protocol/Df1Protocol.java | 94 +--
.../plc4x/java/df1/protocol/Plc4XDf1Protocol.java | 127 +++-
.../org/apache/plc4x/java/df1/util/DF1Utils.java | 68 ++-
.../plc4x/protocol/df1/BenchmarkManualDf1.java | 30 +-
.../apache/plc4x/protocol/df1/EndToEndTest.java | 11 +-
.../developers/writing-driver/writing-driver.adoc | 57 ++
26 files changed, 1793 insertions(+), 184 deletions(-)