diff --git a/CHANGELOG.md b/CHANGELOG.md index a29a0ac7..8df54fbe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -43,6 +43,10 @@ The git repositories are hosted at the following sites: ### Fixed +* Fixed the missing BACnetObjectPropertyReference, + BACnetSCFailedConnectionRequest, BACnetSCHubFunctionConnection, + BACnetSCDirectConnection,BACnetSCHubConnection, BACnetTimerStateChangeValue, + and BACnetAddressBinding text used in debugging.(#1166) * Fixed the units to/from ASCII to function for other units properties. (#1165) * Fixed datetime integer overflow on 8-bit AVR compiler (#1162) * Fixed the ports/linux BACnet/IP cache netmask for accurate subnet diff --git a/src/bacnet/bacapp.c b/src/bacnet/bacapp.c index 7484814c..da01effa 100644 --- a/src/bacnet/bacapp.c +++ b/src/bacnet/bacapp.c @@ -4390,7 +4390,7 @@ bacnet_shed_level_from_ascii(BACNET_SHED_LEVEL *value, const char *argv) #if defined(BACAPP_DEVICE_OBJECT_PROPERTY_REFERENCE) /** * @brief Parse a string into a BACnetDeviceObjectPropertyReference value - * @param value [out] The BACnetObjectPropertyReference value + * @param value [out] The BACnetDeviceObjectPropertyReference value * @param argv [in] The string to parse * @return true on success, else false */ @@ -4432,7 +4432,7 @@ static bool device_object_property_reference_from_ascii( #if defined(BACAPP_DEVICE_OBJECT_REFERENCE) /** * @brief Parse a string into a BACnetDeviceObjectReference value - * @param value [out] The BACnetObjectPropertyReference value + * @param value [out] The BACnetDeviceObjectReference value * @param argv [in] The string to parse * @return true on success, else false */ @@ -4482,7 +4482,7 @@ static bool object_property_reference_from_ascii( if (!value || !argv) { return false; } - /* analog-output:4194303,present-value,-1,device:4194303 */ + /* analog-output:4194303,present-value,-1 */ count = sscanf( argv, "%4lu:%7lu,%lu,%ld", &object_type, &object_instance, &property_id, &array_index); diff --git a/src/bacnet/bacenum.h b/src/bacnet/bacenum.h index 1d0a9fd7..bc4c1cb0 100644 --- a/src/bacnet/bacenum.h +++ b/src/bacnet/bacenum.h @@ -1663,13 +1663,13 @@ typedef enum { BACNET_APPLICATION_TAG_XY_COLOR, /* BACnetColorCommand */ BACNET_APPLICATION_TAG_COLOR_COMMAND, - /* BACNET_SC_FAILED_CONNECTION_REQUEST */ + /* BACnetSCFailedConnectionRequest */ BACNET_APPLICATION_TAG_SC_FAILED_CONNECTION_REQUEST, - /* BACNET_SC_HUB_FUNCTION_CONNECTION_STATUS */ + /* BACnetSCHubFunctionConnection */ BACNET_APPLICATION_TAG_SC_HUB_FUNCTION_CONNECTION_STATUS, - /* BACNET_SC_DIRECT_CONNECTION_STATUS */ + /* BACnetSCDirectConnection */ BACNET_APPLICATION_TAG_SC_DIRECT_CONNECTION_STATUS, - /* BACNET_SC_HUB_CONNECTION_STATUS */ + /* BACnetSCHubConnection */ BACNET_APPLICATION_TAG_SC_HUB_CONNECTION_STATUS, /* BACnetBDTEntry */ BACNET_APPLICATION_TAG_BDT_ENTRY, diff --git a/src/bacnet/bactext.c b/src/bacnet/bactext.c index 3750be89..8ac36ca2 100644 --- a/src/bacnet/bactext.c +++ b/src/bacnet/bactext.c @@ -142,6 +142,8 @@ INDTEXT_DATA bacnet_application_tag_names[] = { "BACnetDeviceObjectPropertyReference" }, { BACNET_APPLICATION_TAG_DEVICE_OBJECT_REFERENCE, "BACnetDeviceObjectReference" }, + { BACNET_APPLICATION_TAG_OBJECT_PROPERTY_REFERENCE, + "BACnetObjectPropertyReference" }, { BACNET_APPLICATION_TAG_DESTINATION, "BACnetDestination" }, { BACNET_APPLICATION_TAG_RECIPIENT, "BACnetRecipient" }, { BACNET_APPLICATION_TAG_COV_SUBSCRIPTION, "BACnetCOVSubscription" }, @@ -154,6 +156,14 @@ INDTEXT_DATA bacnet_application_tag_names[] = { { BACNET_APPLICATION_TAG_HOST_N_PORT, "BACnetHostNPort" }, { BACNET_APPLICATION_TAG_XY_COLOR, "BACnetxyColor" }, { BACNET_APPLICATION_TAG_COLOR_COMMAND, "BACnetColorCommand" }, + { BACNET_APPLICATION_TAG_SC_FAILED_CONNECTION_REQUEST, + "BACnetSCFailedConnectionRequest" }, + { BACNET_APPLICATION_TAG_SC_HUB_FUNCTION_CONNECTION_STATUS, + "BACnetSCHubFunctionConnection" }, + { BACNET_APPLICATION_TAG_SC_DIRECT_CONNECTION_STATUS, + "BACnetSCDirectConnection" }, + { BACNET_APPLICATION_TAG_SC_HUB_CONNECTION_STATUS, + "BACnetSCHubConnection" }, { BACNET_APPLICATION_TAG_BDT_ENTRY, "BACnetBDTEntry" }, { BACNET_APPLICATION_TAG_FDT_ENTRY, "BACnetFDTEntry" }, { BACNET_APPLICATION_TAG_ACTION_COMMAND, "BACnetActionCommand" }, @@ -163,7 +173,8 @@ INDTEXT_DATA bacnet_application_tag_names[] = { { BACNET_APPLICATION_TAG_CHANNEL_VALUE, "BACnetChannelValue" }, { BACNET_APPLICATION_TAG_LOG_RECORD, "BACnetLogRecord" }, { BACNET_APPLICATION_TAG_PROPERTY_VALUE, "BACnetPropertyValue" }, - { BACNET_APPLICATION_TAG_LOG_RECORD, "BACnetLogRecord" }, + { BACNET_APPLICATION_TAG_TIMER_VALUE, "BACnetTimerStateChangeValue" }, + { BACNET_APPLICATION_TAG_ADDRESS_BINDING, "BACnetAddressBinding" }, { BACNET_APPLICATION_TAG_NO_VALUE, "BACnetNoValue" }, { BACNET_APPLICATION_TAG_ABSTRACT_SYNTAX, "ABSTRACT-SYNTAX" }, { 0, NULL }