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

Schedule encoding/decoding (#319)

Browse Source 
* schedule: add decode_daily_schedule() and encode_daily_schedule()

* schedule: encode/decode implemented + add to bacapp

* add safe encode/decode functions for timevalue, schedule function renaming

* fix unit tests build failing

* add IDEA and test temporary files to .gitignore

* try to make "deprecated" work in MSVC

* add WeeklySchedule compare function

* add bacnet_weeklyschedule_context_decode()

* Add basic test for WeeklySchedule

* Fix WeeklySchedule parsing and snprintf, decoder verified with real hardware

* try to fix windows build

* improve boolean parsing in 'bacapp_parse_application_data'

* add parse function for weekly schedule

* allow types > 16 in bacwp, show the decoded value before sending

* add bacapp binaries to gitignore

* remove bacwp logging

* Add error checking to bacapp_parse_application_data

* try to fix windows build

* fix avr build

* Fix error handling in RP Ack

* add singleDay flag

* show day name in single day weeklyschedule snprintf

* show weeklyschedule inner tag in snprintf

* improve weeklyschedule parsing and printing, supports type names now

* add weekly schedule to bacapp_decode_data

* move bacnet/bacnet_plat_compat.h to bacnet/basic/sys/platform.h

* disable tag limit also in bacwpm

* add ifdef's around strtoX helper functions in bacapp

* move strtox to BACAPP_PRINT_ENABLED ifdef in bacapp

* fix stm32 makefiles

* fix at91sam7s build

* use BACNET_UNSIGNED_INTEGER in BACnet_Short_Application_Data_Value

* fix capitalization in BACnet_Daily_Schedule

* add name to BACNET_TIME_VALUE struct

* change bacwp bacwpm to use bacapp_known_property_tag()

* fix some macros in bacdcode missing parentheses

* Remove dummy fields from BACNET_SHORT_APPLICATION_DATA_VALUE, replace remaining uses of upcasting (adds extra overhead but is maybe safer), rename short DV to Primitive

* fix new ci warnings

* more fixes for ancient C

* fix tests no longer building

* primitive value renamed to shorter name
This commit is contained in:
Ondřej Hruška
2022-09-05 16:27:15 +02:00
committed by GitHub
parent bd40c51e19
commit 7cdab61d72
66 changed files with 1800 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/bacnet/bactimevalue/CMakeLists.txt
+2
View File
@@ -49,6 +49,8 @@ add_executable(${PROJECT_NAME}
${SRC_DIR}/bacnet/hostnport.c
${SRC_DIR}/bacnet/lighting.c
${SRC_DIR}/bacnet/timestamp.c
${SRC_DIR}/bacnet/weeklyschedule.c
${SRC_DIR}/bacnet/dailyschedule.c
# Test and test library files
./src/main.c
${ZTST_DIR}/ztest_mock.c
test/bacnet/bactimevalue/src/main.c
+12 -7
View File
@@ -16,6 +16,7 @@
#include <ztest.h>
#include "bacnet/bactimevalue.h"
#include "bacnet/datetime.h"
#include "bacnet/bacapp.h"
/**
@@ -35,26 +36,30 @@ static void test_BACnetTimeValue(BACNET_TIME_VALUE *value)
bool status = false;
uint8_t tag_number = 0;
len = bacapp_encode_time_value(apdu, value);
apdu_len = bacapp_decode_time_value(apdu, &test_value);
len = bacnet_time_value_encode(apdu, value);
apdu_len = bacnet_time_value_decode(apdu, len, &test_value);
zassert_true(len > 0, NULL);
zassert_true(apdu_len > 0, NULL);
diff = datetime_compare_time(&test_value.Time, &value->Time);
zassert_true(diff == 0, NULL);
status = bacapp_same_value(&test_value.Value, &value->Value);
status = bacapp_same_value(
(BACNET_APPLICATION_DATA_VALUE *) &test_value.Value,
(BACNET_APPLICATION_DATA_VALUE *) &value->Value);
zassert_true(status, NULL);
len = bacapp_encode_context_time_value(apdu, tag_number, value);
apdu_len = bacapp_decode_context_time_value(apdu, tag_number, &test_value);
len = bacnet_time_value_context_encode(apdu, tag_number, value);
apdu_len = bacnet_time_value_context_decode(apdu, len, tag_number, &test_value);
zassert_true(len > 0, NULL);
zassert_true(apdu_len > 0, NULL);
diff = datetime_compare_time(&test_value.Time, &value->Time);
zassert_true(diff == 0, NULL);
status = bacapp_same_value(&test_value.Value, &value->Value);
status = bacapp_same_value(
(BACNET_APPLICATION_DATA_VALUE *) &test_value.Value,
(BACNET_APPLICATION_DATA_VALUE *) &value->Value);
zassert_true(status, NULL);
/* negative testing */
tag_number++;
apdu_len = bacapp_decode_context_time_value(apdu, tag_number, &test_value);
apdu_len = bacnet_time_value_context_decode(apdu, len, tag_number, &test_value);
zassert_true(apdu_len < 0, NULL);
}