From 86e4405c712bafced67c7ee6667c3ebd04d3e645 Mon Sep 17 00:00:00 2001 From: Steve Karg Date: Wed, 12 Nov 2025 07:45:20 -0600 Subject: [PATCH] Fixed WPM workaround for BTL Specified Test 9.23.2.X5 by reverting. (#1140) --- CHANGELOG.md | 5 +++-- src/bacnet/basic/service/h_wpm.c | 9 --------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 48af8938..365a4c5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -146,8 +146,9 @@ The git repositories are hosted at the following sites: ### Fixed -* Added CHANNEL_VALUE_ALL define and fixed the API integration for the - additional datatypes now supported in the Channel object. (#1135) +* Fixed WPM workaround for BTL Specified Test 9.23.2.X5 by reverting.(#1140) +* Fixed the API integration for the additional datatypes now supported + in the Channel object by adding CHANNEL_VALUE_ALL to enable and test. (#1135) * Fixed the error class returned for AlarmAcknowledgment (#1131) * Fixed object creation failure when create is called before init. (#1122) * Fixed octetstring_copy_value() and added unit tests. (#1121) diff --git a/src/bacnet/basic/service/h_wpm.c b/src/bacnet/basic/service/h_wpm.c index 6c2dc3c7..c40ac968 100644 --- a/src/bacnet/basic/service/h_wpm.c +++ b/src/bacnet/basic/service/h_wpm.c @@ -77,15 +77,6 @@ static int write_property_multiple_decode( } if (device_write_property) { if (device_write_property(wp_data) == false) { - /* Workaround BTL Specified Test 9.23.2.X5 */ - if ((wp_data->error_class == - ERROR_CLASS_PROPERTY) && - (wp_data->error_code == - ERROR_CODE_INVALID_DATA_TYPE)) { - wp_data->error_class = ERROR_CLASS_SERVICES; - wp_data->error_code = - ERROR_CODE_INVALID_TAG; - } return BACNET_STATUS_ERROR; } }