Changed WhoHas and I-Have to use CharacterString instead of forcing ANSI X34 and C Strings. Affected all demos and ports object name, so I changed the object name function name to make sure it was noticed.
This commit is contained in:
@@ -952,7 +952,7 @@ typedef enum {
|
||||
} BACNET_VT_CLASS;
|
||||
|
||||
typedef enum {
|
||||
CHARACTER_ANSI_X34 = 0,
|
||||
CHARACTER_ANSI_X34 = 0, /* deprecated */
|
||||
CHARACTER_UTF8 = 0,
|
||||
CHARACTER_MS_DBCS = 1,
|
||||
CHARACTER_JISC_6226 = 2,
|
||||
|
||||
@@ -153,6 +153,8 @@ extern "C" {
|
||||
BACNET_CHARACTER_STRING * char_string);
|
||||
bool characterstring_printable(
|
||||
BACNET_CHARACTER_STRING * char_string);
|
||||
bool characterstring_valid(
|
||||
BACNET_CHARACTER_STRING * char_string);
|
||||
|
||||
/* returns false if the string exceeds capacity
|
||||
initialize by using length=0 */
|
||||
|
||||
@@ -97,7 +97,7 @@ extern "C" {
|
||||
uint32_t device_id,
|
||||
BACNET_OBJECT_TYPE object_type,
|
||||
uint32_t object_instance,
|
||||
const char *object_name);
|
||||
BACNET_CHARACTER_STRING *object_name);
|
||||
|
||||
int Send_UCOV_Notify(
|
||||
uint8_t * buffer,
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
typedef struct BACnet_Who_Has_Data {
|
||||
int32_t low_limit; /* deviceInstanceRange */
|
||||
int32_t high_limit;
|
||||
bool object_name; /* true if a string */
|
||||
bool is_object_name; /* true if a string */
|
||||
union {
|
||||
BACNET_OBJECT_ID identifier;
|
||||
BACNET_CHARACTER_STRING name;
|
||||
@@ -79,14 +79,14 @@ extern "C" {
|
||||
/** @defgroup DMDOB Device Management-Dynamic Object Binding (DM-DOB)
|
||||
* @ingroup RDMS
|
||||
* 16.9 Who-Has and I-Have Services <br>
|
||||
* The Who-Has service is used by a sending BACnet-user to identify the device
|
||||
* object identifiers and network addresses of other BACnet devices whose local
|
||||
* databases contain an object with a given Object_Name or a given Object_Identifier.
|
||||
* The I-Have service is used to respond to Who-Has service requests or to
|
||||
* advertise the existence of an object with a given Object_Name or
|
||||
* Object_Identifier. The I-Have service request may be issued at any time and
|
||||
* does not need to be preceded by the receipt of a Who-Has service request.
|
||||
* The Who-Has service is used by a sending BACnet-user to identify the device
|
||||
* object identifiers and network addresses of other BACnet devices whose local
|
||||
* databases contain an object with a given Object_Name or a given Object_Identifier.
|
||||
* The I-Have service is used to respond to Who-Has service requests or to
|
||||
* advertise the existence of an object with a given Object_Name or
|
||||
* Object_Identifier. The I-Have service request may be issued at any time and
|
||||
* does not need to be preceded by the receipt of a Who-Has service request.
|
||||
* The Who-Has and I-Have services are unconfirmed services.
|
||||
*
|
||||
*
|
||||
*/
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user