Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix/plc4j-protocol-ads #286

Merged
merged 1 commit into from
Dec 3, 2021
Merged

Fix/plc4j-protocol-ads #286

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 7 additions & 11 deletions ...tocols/ads/src/main/java/org/apache/plc4x/java/ads/protocol/util/LittleEndianEncoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,20 +187,16 @@ private static Stream<byte[]> encodeLong(AdsDataType adsDataType, Stream<Long> l
}

private static Stream<byte[]> encodeBigInteger(AdsDataType adsDataType, Stream<BigInteger> bigIntegerStream) {
// TODO: add boundchecks and add optional extension
return bigIntegerStream
.peek(value -> {
if (value.longValue() < adsDataType.getLowerBound().longValue() || value.longValue() > adsDataType.getUpperBound().longValue())
throw new PlcRuntimeException(value + " not within bounds of " + adsDataType);
})
.map(bigIntValue -> {
byte[] bytes = bigIntValue.toByteArray();
if (bytes.length > 1 && bytes[0] == 0x0) {
byte[] subArray = Arrays.copyOf(ArrayUtils.subarray(bytes, 1, bytes.length), adsDataType.getTargetByteSize());
ArrayUtils.reverse(subArray);
return subArray;
} else {
ArrayUtils.reverse(Arrays.copyOf(bytes, adsDataType.getTargetByteSize()));
return bytes;
}
})
.map(bytes -> Arrays.copyOf(bytes, adsDataType.getTargetByteSize()));
ArrayUtils.reverse(bytes); /* reverse first, so we don't truncate the wrong end */
return Arrays.copyOf(bytes, adsDataType.getTargetByteSize());
});
}

private static Stream<byte[]> encodeLocalTime(AdsDataType adsDataType, Stream<LocalTime> localTimeStream) {
Expand Down