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/06/23 20:46:29 UTC
[plc4x] branch develop updated: feat(bacnet): use typeSwitch inherit feature for tags
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 3694a28db feat(bacnet): use typeSwitch inherit feature for tags
3694a28db is described below
commit 3694a28db8f37822e036abf8e230685f930a3854
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Thu Jun 23 22:46:22 2022 +0200
feat(bacnet): use typeSwitch inherit feature for tags
---
.../resources/protocols/bacnetip/bacnet-tags.mspec | 54 +++++++++++-----------
1 file changed, 27 insertions(+), 27 deletions(-)
diff --git a/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnet-tags.mspec b/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnet-tags.mspec
index 14fff9474..9feddfe8f 100644
--- a/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnet-tags.mspec
+++ b/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnet-tags.mspec
@@ -40,61 +40,61 @@
[virtual uint 8 actualTagNumber 'header.actualTagNumber' ]
[virtual uint 32 actualLength 'header.actualLength' ]
[typeSwitch actualTagNumber
- ['0x0' BACnetApplicationTagNull
+ ['0x0' *Null
]
- ['0x1' BACnetApplicationTagBoolean(BACnetTagHeader header)
+ ['0x1' *Boolean(BACnetTagHeader header)
[simple BACnetTagPayloadBoolean('header.actualLength')
payload ]
[virtual bit actualValue 'payload.value' ]
]
- ['0x2' BACnetApplicationTagUnsignedInteger(BACnetTagHeader header)
+ ['0x2' *UnsignedInteger(BACnetTagHeader header)
[simple BACnetTagPayloadUnsignedInteger('header.actualLength')
payload ]
[virtual uint 64 actualValue 'payload.actualValue' ]
]
- ['0x3' BACnetApplicationTagSignedInteger(BACnetTagHeader header)
+ ['0x3' *SignedInteger(BACnetTagHeader header)
[simple BACnetTagPayloadSignedInteger('header.actualLength')
payload ]
[virtual uint 64 actualValue 'payload.actualValue' ]
]
- ['0x4' BACnetApplicationTagReal
+ ['0x4' *Real
[simple BACnetTagPayloadReal
payload ]
[virtual float 32 actualValue 'payload.value' ]
]
- ['0x5' BACnetApplicationTagDouble
+ ['0x5' *Double
[simple BACnetTagPayloadDouble
payload ]
[virtual float 64 actualValue 'payload.value' ]
]
- ['0x6' BACnetApplicationTagOctetString(BACnetTagHeader header)
+ ['0x6' *OctetString(BACnetTagHeader header)
[simple BACnetTagPayloadOctetString('header.actualLength')
payload ]
]
- ['0x7' BACnetApplicationTagCharacterString(BACnetTagHeader header)
+ ['0x7' *CharacterString(BACnetTagHeader header)
[simple BACnetTagPayloadCharacterString('header.actualLength')
payload ]
[virtual vstring value 'payload.value' ]
]
- ['0x8' BACnetApplicationTagBitString(BACnetTagHeader header)
+ ['0x8' *BitString(BACnetTagHeader header)
[simple BACnetTagPayloadBitString('header.actualLength')
payload ]
]
- ['0x9' BACnetApplicationTagEnumerated(BACnetTagHeader header)
+ ['0x9' *Enumerated(BACnetTagHeader header)
[simple BACnetTagPayloadEnumerated('header.actualLength')
payload ]
[virtual uint 32 actualValue 'payload.actualValue' ]
]
- ['0xA' BACnetApplicationTagDate
+ ['0xA' *Date
[simple BACnetTagPayloadDate
payload ]
]
- ['0xB' BACnetApplicationTagTime
+ ['0xB' *Time
[simple BACnetTagPayloadTime
payload ]
]
- ['0xC' BACnetApplicationTagObjectIdentifier
+ ['0xC' *ObjectIdentifier
[simple BACnetTagPayloadObjectIdentifier
payload ]
[virtual BACnetObjectType
@@ -116,64 +116,64 @@
[validation 'header.lengthValueType != 6 && header.lengthValueType != 7'
"length 6 and 7 reserved for opening and closing tag" shouldFail=false ]
[typeSwitch dataType
- ['NULL' BACnetContextTagNull(BACnetTagHeader header)
+ ['NULL' *Null(BACnetTagHeader header)
[validation 'header.actualLength == 0' "length field should be 0" ]
]
- ['BOOLEAN' BACnetContextTagBoolean(BACnetTagHeader header)
+ ['BOOLEAN' *Boolean(BACnetTagHeader header)
[validation 'header.actualLength == 1' "length field should be 1" ]
[simple uint 8 value ]
[simple BACnetTagPayloadBoolean('value')
payload ]
[virtual bit actualValue 'payload.value' ]
]
- ['UNSIGNED_INTEGER' BACnetContextTagUnsignedInteger(BACnetTagHeader header)
+ ['UNSIGNED_INTEGER' *UnsignedInteger(BACnetTagHeader header)
[simple BACnetTagPayloadUnsignedInteger('header.actualLength')
payload ]
[virtual uint 64 actualValue 'payload.actualValue' ]
]
- ['SIGNED_INTEGER' BACnetContextTagSignedInteger(BACnetTagHeader header)
+ ['SIGNED_INTEGER' *SignedInteger(BACnetTagHeader header)
[simple BACnetTagPayloadSignedInteger('header.actualLength')
payload ]
[virtual uint 64 actualValue 'payload.actualValue' ]
]
- ['REAL' BACnetContextTagReal
+ ['REAL' *Real
[simple BACnetTagPayloadReal
payload ]
[virtual float 32 actualValue 'payload.value' ]
]
- ['DOUBLE' BACnetContextTagDouble
+ ['DOUBLE' *Double
[simple BACnetTagPayloadDouble
payload ]
[virtual float 64 actualValue 'payload.value' ]
]
- ['OCTET_STRING' BACnetContextTagOctetString(BACnetTagHeader header)
+ ['OCTET_STRING' *OctetString(BACnetTagHeader header)
[simple BACnetTagPayloadOctetString('header.actualLength')
payload ]
]
- ['CHARACTER_STRING' BACnetContextTagCharacterString(BACnetTagHeader header)
+ ['CHARACTER_STRING' *CharacterString(BACnetTagHeader header)
[simple BACnetTagPayloadCharacterString('header.actualLength')
payload ]
[virtual vstring value 'payload.value' ]
]
- ['BIT_STRING' BACnetContextTagBitString(BACnetTagHeader header)
+ ['BIT_STRING' *BitString(BACnetTagHeader header)
[simple BACnetTagPayloadBitString('header.actualLength')
payload ]
]
- ['ENUMERATED' BACnetContextTagEnumerated(BACnetTagHeader header)
+ ['ENUMERATED' *Enumerated(BACnetTagHeader header)
[simple BACnetTagPayloadEnumerated('header.actualLength')
payload ]
[virtual uint 32 actualValue 'payload.actualValue' ]
]
- ['DATE' BACnetContextTagDate
+ ['DATE' *Date
[simple BACnetTagPayloadDate
payload ]
]
- ['TIME' BACnetContextTagTime
+ ['TIME' *Time
[simple BACnetTagPayloadTime
payload ]
]
- ['BACNET_OBJECT_IDENTIFIER' BACnetContextTagObjectIdentifier
+ ['BACNET_OBJECT_IDENTIFIER' *ObjectIdentifier
[simple BACnetTagPayloadObjectIdentifier
payload ]
[virtual BACnetObjectType
@@ -181,7 +181,7 @@
[virtual uint 22 instanceNumber
'payload.instanceNumber' ]
]
- ['UNKNOWN' BACnetContextTagUnknown(uint 32 actualLength)
+ ['UNKNOWN' *Unknown(uint 32 actualLength)
[array byte unknownData length 'actualLength' ]
]
]