Merge branch 'default' into feature/add-lighting-supervisor-sample-profile

Author: skarg

SECURITY.md

@@ -7,6 +7,7 @@ currently being supported with security updates.
 
 | Zephyr-OS  | BACnet-Stack | Supported          |
 | ---------- | ------------ | ------------------ |
+| 3.7.0      | 1.4.x        | :white_check_mark: |
 | 3.6.0      | 1.3.x        | :white_check_mark: |
 
 ## Reporting a Vulnerability

zephyr/CMakeLists.txt

@@ -39,6 +39,8 @@ if(NOT (CONFIG_BACDL_ETHERNET OR
   CONFIG_BACDL_ARCNET OR
   CONFIG_BACDL_BIP OR
   CONFIG_BACDL_BIP6 OR
+  CONFIG_BACDL_CUSTOM OR
+  CONFIG_BACDL_MULTIPLE OR
   CONFIG_BACDL_NONE OR
   CONFIG_BACAPP_ALL))
   set(CONFIG_BACDL_NONE YES)
@@ -49,6 +51,8 @@ message(STATUS "BACNETSTACK: BACDL_BIP \"${CONFIG_BACDL_BIP}\"")
 message(STATUS "BACNETSTACK: BACDL_ARCNET \"${CONFIG_BACDL_ARCNET}\"")
 message(STATUS "BACNETSTACK: BACDL_MSTP \"${CONFIG_BACDL_MSTP}\"")
 message(STATUS "BACNETSTACK: BACDL_ETHERNET \"${CONFIG_BACDL_ETHERNET}\"")
+message(STATUS "BACNETSTACK: BACDL_CUSTOM \"${CONFIG_BACDL_CUSTOM}\"")
+message(STATUS "BACNETSTACK: BACDL_MULTIPLE \"${CONFIG_BACDL_MULTIPLE}\"")
 message(STATUS "BACNETSTACK: BACDL_NONE \"${CONFIG_BACDL_NONE}\"")
 message(STATUS "BACNETSTACK: BACAPP_ALL \"${CONFIG_BACAPP_ALL}\"")
 

zephyr/Kconfig

@@ -100,6 +100,11 @@ config BACDL_ALL
 	help
 	  Enable BACnet with all datalinks enabled
 
+config BACDL_MULTIPLE
+	bool "BACnet with multiple datalinks enabled"
+	help
+	  Enable BACnet with multiple datalinks enabled
+
 config BACAPP_ALL
 	bool "BACnet data types supported for WriteProperty: all = minimal + extra"
 	default false