You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by jf...@apache.org on 2019/01/15 20:39:31 UTC

[incubator-plc4x] branch develop updated (dc22e1c -> 704f989)

This is an automated email from the ASF dual-hosted git repository.

jfeinauer pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.


    from dc22e1c  - Cleaned up the properties - Made the CMakeLists.txt no longer contain two versions of the include path - Integrated the C++ module into the main build (but is only included, if the "with-cpp" profile is manually enabled)
     add 46d5d93  S7: fix of array acquirement, fix of String aquirement, added additional scraper yml
     add 704f989  Merge pull request #43 from timbo2k/s7_array_stuff

No new revisions were added by this update.

Summary of changes:
 .../java/base/messages/DefaultPlcReadResponse.java | 13 ++++++---
 .../org/apache/plc4x/java/s7/model/S7Field.java    | 21 +++++++++++++++
 .../org/apache/plc4x/java/s7/netty/S7Protocol.java |  8 +++---
 .../s7/netty/model/types/DataTransportSize.java    |  4 +--
 .../java/s7/netty/model/types/TransportSize.java   |  6 ++---
 .../strategies/DefaultS7MessageProcessor.java      |  2 +-
 .../{example.yml => example_with_strings.yml}      | 31 ++++++++++------------
 7 files changed, 54 insertions(+), 31 deletions(-)
 copy plc4j/utils/scraper/src/test/resources/{example.yml => example_with_strings.yml} (67%)