Require bacdef.h as first bacnet header to include (#598) (#600)

* Require bacdeps.h as first bacnet header to include

BACnet headers need to pull in optional configuration and
optional ecosystem overrides to allow integrators to control
builds.  This commit changes bacnet header files to first
include bacnet/bacdep.h to consistently introduce integrator
header files.

Verified by:

1. make clean all test

2. ./zephyr/scripts/twister -p unit_testing \
        -T bacnet-stack/zephyr/tests/



* Migrate BACNET_UNSIGNED_INTEGER defn to bacdef.h

Verified by:

1. make clean all test

2. ./zephyr/scripts/twister -p unit_testing \
        -T bacnet-stack/zephyr/tests/



---------

Signed-off-by: Gregory Shue <gregory.shue@legrand.com>
Co-authored-by: Greg Shue <32416235+gregshue@users.noreply.github.com>
Co-authored-by: Gregory Shue <gregory.shue@legrand.com>

zephyr/CMakeLists.txt

@@ -484,3 +484,7 @@ target_compile_definitions(
   PRINT_ENABLED=1
   )
 
+zephyr_compile_definitions(
+  BACNET_CONFIG_H=1         # Use ports/zephyr/bacnet-config.h
+  )
+

zephyr/subsys/object/object.h

@@ -15,6 +15,7 @@
   #define _CONCAT(x, y) _DO_CONCAT(x, y)
 
 #endif
+#include "bacnet/bacdef.h"  // Must be before all other bacnet/*.h files
 #include "bacnet/basic/sys/keylist.h"
 
 

zephyr/tests/bacnet/basic/object/command/CMakeLists.txt

@@ -74,5 +74,6 @@ else()
     ${TEST_OBJECT_INCLUDE})
   target_sources(app PRIVATE
     ${BACNET_TEST_PATH}/src/main.c
+    ${TEST_OBJECT_SRC}/property_test.c
     )
 endif()

zephyr/tests/bacnet/basic/object/credential_data_input/CMakeLists.txt

@@ -76,5 +76,6 @@ else()
     ${TEST_OBJECT_INCLUDE})
   target_sources(app PRIVATE
     ${BACNET_TEST_PATH}/src/main.c
+    ${TEST_OBJECT_SRC}/property_test.c
     )
 endif()

zephyr/tests/bacnet/basic/object/netport/CMakeLists.txt

@@ -20,14 +20,17 @@ get_filename_component(BACNET_NAME ${BACNET_BASE} NAME)
 # Update include path for this module
 list(APPEND BACNET_INCLUDE ${BACNET_BASE}/src)
 
+set(TEST_OBJECT_SRC ${BACNET_BASE}/test/bacnet/basic/object)
+list(APPEND TEST_OBJECT_INCLUDE ${TEST_OBJECT_SRC})
+
 if(BOARD STREQUAL unit_testing)
   file(RELATIVE_PATH BACNET_INCLUDE $ENV{ZEPHYR_BASE} ${BACNET_BASE}/src)
-  list(APPEND INCLUDE ${BACNET_INCLUDE})
+  file(RELATIVE_PATH TEST_OBJECT_INCLUDE $ENV{ZEPHYR_BASE} ${TEST_OBJECT_SRC})
+  list(APPEND INCLUDE ${BACNET_INCLUDE} ${TEST_OBJECT_INCLUDE})
   list(APPEND SOURCES
     ${BACNET_SRC_PATH}.c
     ${BACNET_TEST_PATH}/src/main.c
-    ${BACNET_TEST_PATH}/../property_test.c
-    ${BACNET_TEST_PATH}/../property_test.h
+    ${TEST_OBJECT_SRC}/property_test.c
     )
 
   get_filename_component(BACNET_OBJECT_SRC ${BACNET_SRC_PATH} PATH)
@@ -68,8 +71,11 @@ else()
   find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
   project(${BACNET_NAME})
 
-  target_include_directories(app PRIVATE ${BACNET_INCLUDE})
+  target_include_directories(app PRIVATE
+    ${BACNET_INCLUDE}
+    ${TEST_OBJECT_INCLUDE})
   target_sources(app PRIVATE
     ${BACNET_TEST_PATH}/src/main.c
+    ${TEST_OBJECT_SRC}/property_test.c
     )
 endif()

zephyr/tests/bacnet/basic/object/netport/testcase.yaml

@@ -2,6 +2,7 @@ tests:
   bacnet.basic.object.netport:
     tags: bacnet
     extra_args: EXTRA_CFLAGS='-Wno-error=array-compare'  # for zephyr_v3.0.0 net_if.c
+    skip: true # TODO: Remove once unit test builds/runs under Zephyr CI
   bacnet.basic.object.netport.unit:
     tags: bacnet
     type: unit

zephyr/tests/bacnet/basic/object/schedule/CMakeLists.txt

@@ -75,5 +75,6 @@ else()
     ${TEST_OBJECT_INCLUDE})
   target_sources(app PRIVATE
     ${BACNET_TEST_PATH}/src/main.c
+    ${TEST_OBJECT_SRC}/property_test.c
     )
 endif()