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/29 14:24:46 UTC
[plc4x] branch develop updated: fix(bacnet/plc4go): use platform types to create integers
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 82cbcfe144 fix(bacnet/plc4go): use platform types to create integers
82cbcfe144 is described below
commit 82cbcfe144defcc94e2a4084b0840db9d6e8d782
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Fri Apr 29 16:24:40 2022 +0200
fix(bacnet/plc4go): use platform types to create integers
---
.../plc4go/bacnetip/readwrite/model/StaticHelper.go | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/plc4go/internal/plc4go/bacnetip/readwrite/model/StaticHelper.go b/plc4go/internal/plc4go/bacnetip/readwrite/model/StaticHelper.go
index 4b95d7e8c5..4cb70dcfaf 100644
--- a/plc4go/internal/plc4go/bacnetip/readwrite/model/StaticHelper.go
+++ b/plc4go/internal/plc4go/bacnetip/readwrite/model/StaticHelper.go
@@ -419,19 +419,19 @@ func CreateBACnetContextTagPropertyIdentifier(tagNum uint8, propertyType uint32)
return NewBACnetContextTagPropertyIdentifier(propertyTypeEnum, proprietaryValue, header, tagNum, true, 0)
}
-func CreateBACnetApplicationTagUnsignedInteger(value uint32) *BACnetApplicationTagUnsignedInteger {
+func CreateBACnetApplicationTagUnsignedInteger(value uint) *BACnetApplicationTagUnsignedInteger {
length, payload := CreateUnsignedPayload(value)
header := CreateBACnetTagHeaderBalanced(false, uint8(BACnetDataType_UNSIGNED_INTEGER), length)
return NewBACnetApplicationTagUnsignedInteger(payload, header)
}
-func CreateBACnetContextTagUnsignedInteger(tagNumber uint8, value uint32) *BACnetContextTagUnsignedInteger {
+func CreateBACnetContextTagUnsignedInteger(tagNumber uint8, value uint) *BACnetContextTagUnsignedInteger {
length, payload := CreateUnsignedPayload(value)
header := CreateBACnetTagHeaderBalanced(true, tagNumber, length)
return NewBACnetContextTagUnsignedInteger(payload, header, tagNumber, true)
}
-func CreateUnsignedPayload(value uint32) (uint32, *BACnetTagPayloadUnsignedInteger) {
+func CreateUnsignedPayload(value uint) (uint32, *BACnetTagPayloadUnsignedInteger) {
var length uint32
var valueUint8 *uint8
var valueUint16 *uint16
@@ -454,27 +454,29 @@ func CreateUnsignedPayload(value uint32) (uint32, *BACnetTagPayloadUnsignedInteg
length = 3
_valueUint24 := uint32(value)
valueUint24 = &_valueUint24
+ //TODO: support more than 32bit
default:
length = 4
- valueUint32 = &value
+ valueUint32_ := uint32(value)
+ valueUint32 = &valueUint32_
}
payload := NewBACnetTagPayloadUnsignedInteger(valueUint8, valueUint16, valueUint24, valueUint32, valueUint40, valueUint48, valueUint56, valueUint64, length)
return length, payload
}
-func CreateBACnetApplicationTagSignedInteger(value int32) *BACnetApplicationTagSignedInteger {
+func CreateBACnetApplicationTagSignedInteger(value int) *BACnetApplicationTagSignedInteger {
length, payload := CreateSignedPayload(value)
header := CreateBACnetTagHeaderBalanced(true, uint8(BACnetDataType_SIGNED_INTEGER), length)
return NewBACnetApplicationTagSignedInteger(payload, header)
}
-func CreateBACnetContextTagSignedInteger(tagNumber uint8, value int32) *BACnetContextTagSignedInteger {
+func CreateBACnetContextTagSignedInteger(tagNumber uint8, value int) *BACnetContextTagSignedInteger {
length, payload := CreateSignedPayload(value)
header := CreateBACnetTagHeaderBalanced(true, tagNumber, length)
return NewBACnetContextTagSignedInteger(payload, header, tagNumber, true)
}
-func CreateSignedPayload(value int32) (uint32, *BACnetTagPayloadSignedInteger) {
+func CreateSignedPayload(value int) (uint32, *BACnetTagPayloadSignedInteger) {
var length uint32
var valueInt8 *int8
var valueInt16 *int16
@@ -493,9 +495,11 @@ func CreateSignedPayload(value int32) (uint32, *BACnetTagPayloadSignedInteger) {
length = 3
_valueInt24 := int32(value)
valueInt24 = &_valueInt24
+ //TODO: support more than 32bit
default:
length = 4
- valueInt32 = &value
+ _valueInt32 := int32(value)
+ valueInt32 = &_valueInt32
}
payload := NewBACnetTagPayloadSignedInteger(valueInt8, valueInt16, valueInt24, valueInt32, nil, nil, nil, nil, length)
return length, payload