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 2022/04/20 10:38:45 UTC
[plc4x] branch develop updated: feat(bacnet): added helper for string data types
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new b34ce11a7d feat(bacnet): added helper for string data types
b34ce11a7d is described below
commit b34ce11a7de289024c7f5ccf2c2569f89d5f140b
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Wed Apr 20 12:38:38 2022 +0200
feat(bacnet): added helper for string data types
---
.../bacnetip/readwrite/model/StaticHelper.go | 20 +++++++++++
.../bacnetip/readwrite/utils/StaticHelper.java | 40 ++++++++++++++++------
2 files changed, 50 insertions(+), 10 deletions(-)
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/StaticHelper.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/StaticHelper.go
index 41fdf846cb..86bc2b712b 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/StaticHelper.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/StaticHelper.go
@@ -550,6 +550,26 @@ func CreateBACnetContextTagDouble(tagNumber uint8, value float64) *BACnetContext
return NewBACnetContextTagDouble(NewBACnetTagPayloadDouble(value), header, tagNumber, true)
}
+func CreateBACnetApplicationTagOctetString(value string) *BACnetApplicationTagOctetString {
+ header := CreateBACnetTagHeaderBalanced(false, uint8(BACnetDataType_OCTET_STRING), uint32(len(value)))
+ return NewBACnetApplicationTagOctetString(NewBACnetTagPayloadOctetString(value, uint32(len(value))), header)
+}
+
+func CreateBACnetContextTagOctetString(tagNumber uint8, value string) *BACnetContextTagOctetString {
+ header := CreateBACnetTagHeaderBalanced(true, tagNumber, uint32(len(value)))
+ return NewBACnetContextTagOctetString(NewBACnetTagPayloadOctetString(value, uint32(len(value))), header, tagNumber, true)
+}
+
+func CreateBACnetApplicationTagCharacterString(baCnetCharacterEncoding BACnetCharacterEncoding, value string) *BACnetApplicationTagCharacterString {
+ header := CreateBACnetTagHeaderBalanced(false, uint8(BACnetDataType_CHARACTER_STRING), uint32(len(value)))
+ return NewBACnetApplicationTagCharacterString(NewBACnetTagPayloadCharacterString(baCnetCharacterEncoding, value, uint32(len(value))), header)
+}
+
+func CreateBACnetContextTagCharacterString(tagNumber uint8, baCnetCharacterEncoding BACnetCharacterEncoding, value string) *BACnetContextTagCharacterString {
+ header := CreateBACnetTagHeaderBalanced(true, tagNumber, uint32(len(value)))
+ return NewBACnetContextTagCharacterString(NewBACnetTagPayloadCharacterString(baCnetCharacterEncoding, value, uint32(len(value))), header, tagNumber, true)
+}
+
func requiredLength(value uint) uint32 {
var length uint32
switch {
diff --git a/plc4j/drivers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/readwrite/utils/StaticHelper.java b/plc4j/drivers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/readwrite/utils/StaticHelper.java
index 8e83331fc4..e4037f5ac3 100644
--- a/plc4j/drivers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/readwrite/utils/StaticHelper.java
+++ b/plc4j/drivers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/readwrite/utils/StaticHelper.java
@@ -468,6 +468,16 @@ public class StaticHelper {
return Pair.of(length, payload);
}
+ public static BACnetApplicationTagBoolean createBACnetApplicationTagBoolean(boolean value) {
+ BACnetTagHeader header = createBACnetTagHeaderBalanced(false, BACnetDataType.BOOLEAN.getValue(), value ? 1L : 0L);
+ return new BACnetApplicationTagBoolean(header, new BACnetTagPayloadBoolean(value ? 1L : 0L));
+ }
+
+ public static BACnetContextTagBoolean createBACnetContextTagBoolean(byte tagNumber, boolean value) {
+ BACnetTagHeader header = createBACnetTagHeaderBalanced(true, tagNumber, 1);
+ return new BACnetContextTagBoolean(header, (short) (value ? 1 : 0), new BACnetTagPayloadBoolean(value ? 1L : 0L), (short) tagNumber, true);
+ }
+
public static BACnetApplicationTagUnsignedInteger createBACnetApplicationTagUnsignedInteger(long value) {
Pair<Long, BACnetTagPayloadUnsignedInteger> lengthPayload = createUnsignedPayload(value);
BACnetTagHeader header = createBACnetTagHeaderBalanced(false, BACnetDataType.UNSIGNED_INTEGER.getValue(), lengthPayload.getLeft());
@@ -542,16 +552,6 @@ public class StaticHelper {
return Pair.of(length, payload);
}
- public static BACnetApplicationTagBoolean createBACnetApplicationTagBoolean(boolean value) {
- BACnetTagHeader header = createBACnetTagHeaderBalanced(false, BACnetDataType.BOOLEAN.getValue(), value ? 1L : 0L);
- return new BACnetApplicationTagBoolean(header, new BACnetTagPayloadBoolean(value ? 1L : 0L));
- }
-
- public static BACnetContextTagBoolean createBACnetContextTagBoolean(byte tagNumber, boolean value) {
- BACnetTagHeader header = createBACnetTagHeaderBalanced(true, tagNumber, 1);
- return new BACnetContextTagBoolean(header, (short) (value ? 1 : 0), new BACnetTagPayloadBoolean(value ? 1L : 0L), (short) tagNumber, true);
- }
-
public static BACnetApplicationTagReal createBACnetApplicationTagReal(float value) {
BACnetTagHeader header = createBACnetTagHeaderBalanced(false, BACnetDataType.REAL.getValue(), 4);
return new BACnetApplicationTagReal(header, new BACnetTagPayloadReal(value));
@@ -572,6 +572,26 @@ public class StaticHelper {
return new BACnetContextTagDouble(header, new BACnetTagPayloadDouble(value), (short) tagNumber, true);
}
+ public static BACnetApplicationTagOctetString createBACnetApplicationTagOctetString(String value) {
+ BACnetTagHeader header = createBACnetTagHeaderBalanced(false, BACnetDataType.OCTET_STRING.getValue(), value.length());
+ return new BACnetApplicationTagOctetString(header, new BACnetTagPayloadOctetString(value, (long) value.length()));
+ }
+
+ public static BACnetContextTagOctetString createBACnetContextTagOctetString(byte tagNumber, String value) {
+ BACnetTagHeader header = createBACnetTagHeaderBalanced(true, tagNumber, value.length());
+ return new BACnetContextTagOctetString(header, new BACnetTagPayloadOctetString(value, (long) value.length()), (short) tagNumber, true);
+ }
+
+ public static BACnetApplicationTagCharacterString createBACnetApplicationTagCharacterString(BACnetCharacterEncoding baCnetCharacterEncoding, String value) {
+ BACnetTagHeader header = createBACnetTagHeaderBalanced(false, BACnetDataType.CHARACTER_STRING.getValue(), value.length());
+ return new BACnetApplicationTagCharacterString(header, new BACnetTagPayloadCharacterString(baCnetCharacterEncoding, value, (long) value.length()));
+ }
+
+ public static BACnetContextTagCharacterString createBACnetContextTagCharacterString(byte tagNumber, BACnetCharacterEncoding baCnetCharacterEncoding, String value) {
+ BACnetTagHeader header = createBACnetTagHeaderBalanced(true, tagNumber, value.length());
+ return new BACnetContextTagCharacterString(header, new BACnetTagPayloadCharacterString(baCnetCharacterEncoding, value, (long) value.length()), (short) tagNumber, true);
+ }
+
private static long requiredLength(long value) {
long length;
if (value < 0x100)