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 2018/10/10 14:37:58 UTC

[incubator-plc4x] branch master updated (62df682 -> 8aff258)

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

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


    from 62df682  - Added the Apache header back ...
     new 6a3e8c5  PLC4X-59 - [S7] Reading a UDINT with value 0x00000000 and non positive floating point values does not work - Fixed a copy+paste error (I hope)
     new 8aff258  PLC4X-61 - Installation fails plc4j-protocoll-ethernetip needs license

The 2 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:
 .../apache/plc4x/java/base/messages/items/DefaultLongFieldItem.java    | 2 +-
 pom.xml                                                                | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)


[incubator-plc4x] 01/02: PLC4X-59 - [S7] Reading a UDINT with value 0x00000000 and non positive floating point values does not work - Fixed a copy+paste error (I hope)

Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git

commit 6a3e8c5fabba1ad55942ada8879b8563ab594d55
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Wed Oct 10 16:34:53 2018 +0200

    PLC4X-59 - [S7] Reading a UDINT with value 0x00000000 and non positive floating point values does not work
    - Fixed a copy+paste error (I hope)
---
 .../org/apache/plc4x/java/base/messages/items/DefaultLongFieldItem.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultLongFieldItem.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultLongFieldItem.java
index 2fb238c..ff2e5e0 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultLongFieldItem.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/DefaultLongFieldItem.java
@@ -106,7 +106,7 @@ public class DefaultLongFieldItem extends FieldItem<Long> {
 
     @Override
     public Long getLong(int index) {
-        if (isValidFloat(index)) {
+        if (isValidLong(index)) {
             return getValue(index);
         }
         return null;


[incubator-plc4x] 02/02: PLC4X-61 - Installation fails plc4j-protocoll-ethernetip needs license

Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git

commit 8aff258e9d73ca18766abff98ab3ed1ac129c0b4
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Wed Oct 10 16:37:54 2018 +0200

    PLC4X-61 - Installation fails plc4j-protocoll-ethernetip needs license
    
    - Added an exclusion for "*.pcapng" files, even if it should be detected as binary and hereby ignored.
---
 pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pom.xml b/pom.xml
index 6c38b27..63d6ea7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -374,6 +374,9 @@
             <exclude>**/.idea/**</exclude>
             <exclude>**/*.iml</exclude>
 
+            <!-- Wireshark Captures -->
+            <exclude>**/*.pcapng</exclude>
+
             <!-- Asciidoctor generated files -->
             <exclude>**/.asciidoctor/**</exclude>