You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2018/03/16 17:41:50 UTC
[incubator-plc4x] branch master updated: simplified crc calculation
in serial frames
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
The following commit(s) were added to refs/heads/master by this push:
new eacca90 simplified crc calculation in serial frames
eacca90 is described below
commit eacca90e2908c10b4689e50f9742ed585df33419
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Fri Mar 16 18:41:47 2018 +0100
simplified crc calculation in serial frames
---
.../org/apache/plc4x/java/ads/api/serial/AmsSerialAcknowledgeFrame.java | 2 +-
.../main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialFrame.java | 2 +-
.../java/org/apache/plc4x/java/ads/api/serial/AmsSerialResetFrame.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialAcknowledgeFrame.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialAcknowledgeFrame.java
index f56dc83..16911b8 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialAcknowledgeFrame.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialAcknowledgeFrame.java
@@ -79,7 +79,7 @@ public class AmsSerialAcknowledgeFrame implements ByteReadable {
this.receiverAddress = receiverAddress;
this.fragmentNumber = fragmentNumber;
this.userDataLength = UserDataLength.of((byte) 0);
- this.crc = CRC.of(DigestUtil.calculateCrc16(() -> buildByteBuff(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength)));
+ this.crc = CRC.of(DigestUtil.calculateCrc16(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength));
}
public static AmsSerialAcknowledgeFrame of(MagicCookie magicCookie, TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber, UserDataLength userDataLength, CRC crc) {
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialFrame.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialFrame.java
index 1ec50b5..a0f1feb 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialFrame.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialFrame.java
@@ -96,7 +96,7 @@ public class AmsSerialFrame implements ByteReadable {
this.userDataLength = UserDataLength.of((byte) calculatedLength);
byte[] amsPacketBytes = userData.getBytes();
this.userData = UserData.of(amsPacketBytes);
- this.crc = CRC.of(DigestUtil.calculateCrc16(() -> buildByteBuff(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, userData)));
+ this.crc = CRC.of(DigestUtil.calculateCrc16(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength, userData));
}
public static AmsSerialFrame of(MagicCookie magicCookie, TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber, UserDataLength userDataLength, UserData userData, CRC crc) {
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialResetFrame.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialResetFrame.java
index 0ec5109..e815d68 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialResetFrame.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/serial/AmsSerialResetFrame.java
@@ -78,7 +78,7 @@ public class AmsSerialResetFrame implements ByteReadable {
this.receiverAddress = receiverAddress;
this.fragmentNumber = FragmentNumber.of((byte) 0);
this.userDataLength = UserDataLength.of((byte) 0);
- this.crc = CRC.of(DigestUtil.calculateCrc16(() -> buildByteBuff(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength)));
+ this.crc = CRC.of(DigestUtil.calculateCrc16(magicCookie, transmitterAddress, receiverAddress, fragmentNumber, userDataLength));
}
public static AmsSerialResetFrame of(MagicCookie magicCookie, TransmitterAddress transmitterAddress, ReceiverAddress receiverAddress, FragmentNumber fragmentNumber, UserDataLength userDataLength, CRC crc) {
--
To stop receiving notification emails like this one, please contact
sruehl@apache.org.