dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Create & Delete to Accumulator object (#1234)

Browse Source 
* Added CreateObject and DeleteObject for basic Accumulator objects.
 
* Added WriteProperty handling for object-name, scale, out-of-service, units, and max-pres-value.
This commit is contained in:
Steve Karg
2026-02-17 08:31:00 -06:00
committed by GitHub
parent b022d2bcbb
commit 6bd2b42334
5 changed files with 487 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/bacnet/basic/object/acc/CMakeLists.txt
+6 -1
View File
@@ -27,6 +27,7 @@ add_compile_definitions(
include_directories(
${SRC_DIR}
${TST_DIR}/bacnet/basic/object/test
${TST_DIR}/ztest/include
)
@@ -47,6 +48,9 @@ add_executable(${PROJECT_NAME}
${SRC_DIR}/bacnet/bacstr.c
${SRC_DIR}/bacnet/bactext.c
${SRC_DIR}/bacnet/basic/sys/bigend.c
${SRC_DIR}/bacnet/basic/sys/days.c
${SRC_DIR}/bacnet/basic/sys/debug.c
${SRC_DIR}/bacnet/basic/sys/keylist.c
${SRC_DIR}/bacnet/datetime.c
${SRC_DIR}/bacnet/indtext.c
${SRC_DIR}/bacnet/hostnport.c
@@ -55,7 +59,7 @@ add_executable(${PROJECT_NAME}
${SRC_DIR}/bacnet/shed_level.c
${SRC_DIR}/bacnet/timer_value.c
${SRC_DIR}/bacnet/timestamp.c
${SRC_DIR}/bacnet/basic/sys/days.c
${SRC_DIR}/bacnet/wp.c
${SRC_DIR}/bacnet/weeklyschedule.c
${SRC_DIR}/bacnet/bactimevalue.c
${SRC_DIR}/bacnet/dailyschedule.c
@@ -65,6 +69,7 @@ add_executable(${PROJECT_NAME}
${SRC_DIR}/bacnet/secure_connect.c
# Test and test library files
./src/main.c
${TST_DIR}/bacnet/basic/object/test/property_test.c
${ZTST_DIR}/ztest_mock.c
${ZTST_DIR}/ztest.c
)
test/bacnet/basic/object/acc/src/main.c
+55 -32
View File
@@ -8,6 +8,7 @@
#include <zephyr/ztest.h>
#include <bacnet/basic/object/acc.h>
#include <bacnet/bactext.h>
#include <property_test.h>
/**
* @addtogroup bacnet_tests
@@ -23,55 +24,77 @@ ZTEST(acc_tests, test_Accumulator)
static void test_Accumulator(void)
#endif
{
uint8_t apdu[MAX_APDU] = { 0 };
const uint32_t instance = 123;
unsigned count = 0;
unsigned index = 0;
int len = 0;
int test_len = 0;
uint32_t test_instance = 0;
uint8_t apdu[MAX_APDU] = { 0 };
BACNET_READ_PROPERTY_DATA rpdata = { 0 };
BACNET_APPLICATION_DATA_VALUE value = { 0 };
const int32_t *required_property = NULL;
BACNET_UNSIGNED_INTEGER unsigned_value = 1;
bool status = false;
const int32_t *writable_properties;
const int32_t skip_fail_property_list[] = { -1 };
char *sample_context = "context";
Accumulator_Init();
rpdata.application_data = &apdu[0];
rpdata.application_data_len = sizeof(apdu);
rpdata.object_type = OBJECT_ACCUMULATOR;
rpdata.object_instance = Accumulator_Index_To_Instance(0);
Accumulator_Property_Lists(&required_property, NULL, NULL);
while ((*required_property) >= 0) {
rpdata.object_property = *required_property;
rpdata.array_index = BACNET_ARRAY_ALL;
len = Accumulator_Read_Property(&rpdata);
zassert_true(len >= 0, NULL);
if (len >= 0) {
if (IS_CONTEXT_SPECIFIC(rpdata.application_data[0])) {
test_len = bacapp_decode_context_data(
rpdata.application_data, len, &value,
rpdata.object_property);
} else {
test_len = bacapp_decode_application_data(
rpdata.application_data, len, &value);
}
if (len != test_len) {
printf(
"property '%s': failed to decode!\n",
bactext_property_name(rpdata.object_property));
}
zassert_equal(len, test_len, NULL);
}
required_property++;
}
test_instance = Accumulator_Create(BACNET_MAX_INSTANCE + 1);
zassert_equal(test_instance, BACNET_MAX_INSTANCE, NULL);
test_instance = Accumulator_Create(BACNET_MAX_INSTANCE);
zassert_not_equal(test_instance, BACNET_MAX_INSTANCE, NULL);
status = Accumulator_Delete(test_instance);
zassert_true(status, NULL);
test_instance = Accumulator_Create(instance);
zassert_equal(test_instance, instance, NULL);
status = Accumulator_Valid_Instance(instance);
zassert_true(status, NULL);
status = Accumulator_Valid_Instance(instance - 1);
zassert_false(status, NULL);
index = Accumulator_Instance_To_Index(instance);
zassert_equal(index, 0, NULL);
test_instance = Accumulator_Index_To_Instance(index);
zassert_equal(instance, test_instance, NULL);
count = Accumulator_Count();
zassert_true(count > 0, NULL);
/* perform a general test for RP/WP */
bacnet_object_properties_read_write_test(
OBJECT_ACCUMULATOR, instance, Accumulator_Property_Lists,
Accumulator_Read_Property, Accumulator_Write_Property,
skip_fail_property_list);
/* test 1-bit to 64-bit encode/decode of present-value */
rpdata.object_type = OBJECT_ACCUMULATOR;
rpdata.object_instance = instance;
rpdata.object_property = PROP_PRESENT_VALUE;
rpdata.array_index = BACNET_ARRAY_ALL;
rpdata.error_class = ERROR_CLASS_PROPERTY;
rpdata.error_code = ERROR_CODE_SUCCESS;
rpdata.application_data = apdu;
rpdata.application_data_len = sizeof(apdu);
while (unsigned_value != BACNET_UNSIGNED_INTEGER_MAX) {
Accumulator_Present_Value_Set(0, unsigned_value);
Accumulator_Present_Value_Set(instance, unsigned_value);
len = Accumulator_Read_Property(&rpdata);
zassert_not_equal(len, 0, NULL);
test_len = bacapp_decode_application_data(
rpdata.application_data, len, &value);
zassert_equal(len, test_len, NULL);
zassert_equal(rpdata.error_code, ERROR_CODE_SUCCESS, NULL);
zassert_equal(value.tag, BACNET_APPLICATION_TAG_UNSIGNED_INT, NULL);
zassert_equal(value.type.Unsigned_Int, unsigned_value, NULL);
unsigned_value |= (unsigned_value << 1);
}
status = Accumulator_Description_Set(instance, "Test Accumulator");
zassert_true(status, NULL);
Accumulator_Writable_Property_List(instance, &writable_properties);
zassert_not_null(writable_properties, NULL);
/* context API */
Accumulator_Context_Set(instance, sample_context);
zassert_true(sample_context == Accumulator_Context_Get(instance), NULL);
zassert_true(NULL == Accumulator_Context_Get(instance + 1), NULL);
Accumulator_Delete(instance);
status = Accumulator_Valid_Instance(instance);
zassert_false(status, NULL);
return;
}