Skip to content

Commit 7d57037

Browse files
skargskarg
authored
Merge pull request #17 from bacnet-stack/bugfix/sample-profile-b-ss-3.7
Changed for BACNET_PROPERTY_ARRAY_LISTS removal, access-rule refactoring, and use of property_test.c in object test.
2 parents 5dc54f2 + e147f72 commit 7d57037

File tree

43 files changed

+50
-14
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+50
-14
lines changed

‎zephyr/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,6 @@ zephyr_compile_definitions(
495495
# library features
496496
$<$<BOOL:${CONFIG_BACNET_BASIC_OBJECTS}>:BACNET_BASIC_OBJECTS>
497497
$<$<BOOL:${CONFIG_BACNET_PROPERTY_LISTS}>:BACNET_PROPERTY_LISTS=1>
498-
$<$<BOOL:${CONFIG_BACNET_PROPERTY_ARRAY_LISTS}>:BACNET_PROPERTY_ARRAY_LISTS=1>
499498
$<$<BOOL:${CONFIG_BACNET_ROUTING}>:BACNET_ROUTING>
500499
$<$<BOOL:${CONFIG_BACAPP_PRINT_ENABLED}>:BACAPP_PRINT_ENABLED=1>
501500
$<$<BOOL:${CONFIG_BACAPP_SNPRINTF_ENABLED}>:BACAPP_SNPRINTF_ENABLED=1>

‎zephyr/Kconfig‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,6 @@ config BACNET_PROPERTY_LISTS
5050
help
5151
Enable BACnet Property Lists
5252

53-
config BACNET_PROPERTY_ARRAY_LISTS
54-
bool "BACnetARRAY Property Lists"
55-
default true
56-
help
57-
Enable BACnetARRAY Property Lists
58-
5953
config BACDL_ETHERNET
6054
bool "BACnet Ethernet datalink"
6155
help

‎zephyr/samples/profiles/b-ss/prj.conf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ CONFIG_BACNETSTACK_BACNET_BASIC=y
2828
CONFIG_BACNET_MAX_CHARACTER_STRING_BYTES=128
2929
CONFIG_BACAPP_MINIMAL=y
3030
CONFIG_BACAPP_HOST_N_PORT=y
31-
CONFIG_BACNET_PROPERTY_ARRAY_LISTS=y
3231
# BACnet Library - objects
3332
CONFIG_BACNET_BASIC_OBJECT_NETWORK_PORT=y
3433
CONFIG_BACNET_BASIC_OBJECT_ANALOG_INPUT=y

‎zephyr/tests/bacnet/bacapp/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ if(BOARD STREQUAL unit_testing)
3131

3232
get_filename_component(BACNET_SRC ${BACNET_SRC_PATH} PATH)
3333
list(APPEND SOURCES
34+
${BACNET_SRC}/access_rule.c
3435
${BACNET_SRC}/bacaction.c
3536
${BACNET_SRC}/bacaddr.c
3637
${BACNET_SRC}/bacdcode.c

‎zephyr/tests/bacnet/basic/object/acc/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ if(BOARD STREQUAL unit_testing)
3333
get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
3434
get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
3535
list(APPEND SOURCES
36+
${BACNET_SRC}/access_rule.c
3637
${BACNET_SRC}/bacaction.c
3738
${BACNET_SRC}/bacaddr.c
3839
${BACNET_SRC}/bacapp.c

‎zephyr/tests/bacnet/basic/object/access_credential/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ if(BOARD STREQUAL unit_testing)
3333
get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
3434
get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
3535
list(APPEND SOURCES
36+
${BACNET_SRC}/access_rule.c
3637
${BACNET_SRC}/bacaction.c
3738
${BACNET_SRC}/bacaddr.c
3839
${BACNET_SRC}/bacapp.c

‎zephyr/tests/bacnet/basic/object/access_door/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ if(BOARD STREQUAL unit_testing)
3333
get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
3434
get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
3535
list(APPEND SOURCES
36+
${BACNET_SRC}/access_rule.c
3637
${BACNET_SRC}/bacaction.c
3738
${BACNET_SRC}/bacaddr.c
3839
${BACNET_SRC}/bacapp.c

‎zephyr/tests/bacnet/basic/object/access_point/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ if(BOARD STREQUAL unit_testing)
3333
get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
3434
get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
3535
list(APPEND SOURCES
36+
${BACNET_SRC}/access_rule.c
3637
${BACNET_SRC}/bacaction.c
3738
${BACNET_SRC}/bacaddr.c
3839
${BACNET_SRC}/bacapp.c

‎zephyr/tests/bacnet/basic/object/access_rights/CMakeLists.txt‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,24 @@ get_filename_component(BACNET_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME)
2121
# Update include path for this module
2222
list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
2323

24+
set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object/test)
25+
list(APPEND TEST_OBJECT_INCLUDE ${TEST_OBJECT_SRC})
26+
2427
if(BOARD STREQUAL unit_testing)
2528
file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src)
26-
list(APPEND INCLUDE ${BACNET_INCLUDE})
29+
file(RELATIVE_PATH TEST_OBJECT_INCLUDE $ENV{ZEPHYR_BASE} ${TEST_OBJECT_SRC})
30+
list(APPEND INCLUDE ${BACNET_INCLUDE} ${TEST_OBJECT_INCLUDE})
2731
list(APPEND SOURCES
2832
${BACNET_SRC_PATH}.c
2933
${BACNET_TEST_PATH}/src/main.c
34+
${TEST_OBJECT_SRC}/property_test.c
3035
)
3136

3237
get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH)
3338
get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
3439
get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
3540
list(APPEND SOURCES
41+
${BACNET_SRC}/access_rule.c
3642
${BACNET_SRC}/bacaction.c
3743
${BACNET_SRC}/bacaddr.c
3844
${BACNET_SRC}/bacapp.c
@@ -48,8 +54,8 @@ if(BOARD STREQUAL unit_testing)
4854
${BACNET_SRC}/bactext.c
4955
${BACNET_SRC}/indtext.c
5056
${BACNET_SRC}/lighting.c
57+
${BACNET_SRC}/proplist.c
5158
${BACNET_SRC}/wp.c
52-
${BACNET_SRC}/access_rule.c
5359
${BACNET_SRC}/hostnport.c
5460
${BACNET_SRC}/dailyschedule.c
5561
${BACNET_SRC}/weeklyschedule.c
@@ -66,9 +72,12 @@ else()
6672
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
6773
project(${BACNET_NAME})
6874

69-
target_include_directories(app PRIVATE ${BACNET_INCLUDE})
75+
target_include_directories(app PRIVATE
76+
${BACNET_INCLUDE}
77+
${TEST_OBJECT_INCLUDE})
7078
target_sources(app PRIVATE
7179
${BACNET_TEST_PATH}/src/main.c
80+
${TEST_OBJECT_SRC}/property_test.c
7281
)
7382
endif()
7483

‎zephyr/tests/bacnet/basic/object/access_user/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ if(BOARD STREQUAL unit_testing)
3333
get_filename_component(BACNET_BASIC_SRC ${BACNET_OBJECT_SRC} PATH)
3434
get_filename_component(BACNET_SRC ${BACNET_BASIC_SRC} PATH)
3535
list(APPEND SOURCES
36+
${BACNET_SRC}/access_rule.c
3637
${BACNET_SRC}/bacaction.c
3738
${BACNET_SRC}/bacaddr.c
3839
${BACNET_SRC}/bacapp.c

0 commit comments

Comments
 (0)