Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions zephyr/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -451,11 +451,13 @@ set(BACNETSTACK_BASIC_SRCS
$<$<BOOL:${CONFIG_BACDL_BIP6}>:${BACNETSTACK_SRC}/bacnet/basic/bbmd6/h_bbmd6.c>
$<$<BOOL:${CONFIG_BACDL_BIP6}>:${BACNETSTACK_SRC}/bacnet/basic/bbmd6/vmac.c>
$<$<BOOL:${CONFIG_BACDL_ZIGBEE}>:${BACNETSTACK_SRC}/bacnet/basic/bzll/bzllvmac.c>
$<$<BOOL:${CONFIG_BACDL_ZIGBEE}>:${BACNETSTACK_SRC}/bacnet/basic/bzll/h_bzll.c>
$<$<BOOL:${CONFIG_BACNET_BASIC_SERVER}>:${BACNETSTACK_SRC}/bacnet/basic/server/bacnet_basic.c>
$<$<BOOL:${CONFIG_BACNET_BASIC_SERVER}>:${BACNETSTACK_SRC}/bacnet/basic/server/bacnet_device.c>
$<$<BOOL:${CONFIG_BACNET_BASIC_SERVER}>:${BACNETSTACK_SRC}/bacnet/basic/server/bacnet_port.c>
$<$<BOOL:${CONFIG_BACNET_BASIC_SERVER}>:${BACNETSTACK_SRC}/bacnet/basic/server/bacnet_port_ipv4.c>
$<$<BOOL:${CONFIG_BACNET_BASIC_SERVER}>:${BACNETSTACK_SRC}/bacnet/basic/server/bacnet_port_ipv4.c>
$<$<BOOL:${CONFIG_BACNET_BASIC_SERVER}>:${BACNETSTACK_SRC}/bacnet/basic/server/bacnet_port_bzll.c>
$<$<BOOL:${CONFIG_BACNET_BASIC_OBJECTS_ACCESS}>:${BACNETSTACK_SRC}/bacnet/basic/object/access_credential.c>
$<$<BOOL:${CONFIG_BACNET_BASIC_OBJECTS_ACCESS}>:${BACNETSTACK_SRC}/bacnet/basic/object/access_door.c>
$<$<BOOL:${CONFIG_BACNET_BASIC_OBJECTS_ACCESS}>:${BACNETSTACK_SRC}/bacnet/basic/object/access_point.c>
Expand Down Expand Up @@ -587,6 +589,8 @@ zephyr_compile_definitions(
BACNET_VENDOR_NAME="${CONFIG_BACNET_VENDOR_NAME}"
BACNET_PROTOCOL_REVISION=${CONFIG_BACNET_PROTOCOL_REVISION}
BACNET_STACK_DEPRECATED_DISABLE=1
$<$<BOOL:${CONFIG_BZLL_NODE_TIME_TO_LIVE_S}>:BZLL_NODE_TIME_TO_LIVE_S=${CONFIG_BZLL_NODE_TIME_TO_LIVE_S}>
$<$<BOOL:${CONFIG_BZLL_SCAN_NODES_INTERVAL_S}>:BZLL_SCAN_NODES_INTERVAL_S=${CONFIG_BZLL_SCAN_NODES_INTERVAL_S}>
# datalink API
$<$<BOOL:${CONFIG_BACDL_NONE}>:BACDL_NONE>
$<$<BOOL:${CONFIG_BACDL_ALL}>:BACAPP_ALL>
Expand Down
1 change: 1 addition & 0 deletions zephyr/subsys/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

comment "BACnet Subsystems"

rsource "bacnet_datalink/Kconfig"
rsource "bacnet_settings/Kconfig"
rsource "bacnet_shell/Kconfig"
rsource "object/Kconfig"
Expand Down
26 changes: 26 additions & 0 deletions zephyr/subsys/bacnet_datalink/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Kconfig - Subsystem configuration options
#
# @author Luiz Santana <luiz.santana@dsr-corporation.com>
# @date May 2026
# @copyright SPDX-License-Identifier: Apache-2.0
menuconfig BACNET_DATALINK_SETTINGS
bool "BACNET_DATALINK_SETTINGS"
default y if BACNETSTACK
help
This option enables BACnet datalink settings.

if BACNET_DATALINK_SETTINGS

config BZLL_NODE_TIME_TO_LIVE_S
int "BZLL node time-to-live in the VMAC table"
default 600
help
Time in seconds to keep a node in the VMAC table before it must be updated.

config BZLL_SCAN_NODES_INTERVAL_S
int "BZLL interval for scanning the Zigbee network for BACnet nodes and updating the VMAC table"
default 3600
help
Time interval in seconds between scans of the Zigbee network for BACnet nodes to update the VMAC table.

endif # BACNET_DATALINK_SETTINGS
2 changes: 1 addition & 1 deletion zephyr/subsys/bacnet_settings/bacnet_settings.c
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ bool bacnet_settings_value_parse(
return false;
}
/* convert the string value into a tagged union value */
if (isalpha(value_string[0])) {
if (isalpha((unsigned char)value_string[0])) {
if (property_list_commandable_member(object_type, property_id) &&
(bacnet_strnicmp(value_string, "NULL", 4) == 0)) {
/* check for case insensitive NULL string */
Expand Down
1 change: 1 addition & 0 deletions zephyr/subsys/bacnet_settings/bacnet_storage_shell.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <errno.h>
#include <zephyr/shell/shell.h>
#include <bacnet_settings/bacnet_storage.h>
#include <stdio.h>

static const char Storage_Base_Name[] = CONFIG_BACNET_STORAGE_BASE_NAME;

Expand Down
2 changes: 1 addition & 1 deletion zephyr/subsys/bacnet_shell/bacnet_shell_property.c
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ int bacnet_shell_property_parse(
}
err = bacnet_shell_object_type_instance_parse(
sh, argc, argv, object_type, object_instance);
if (isalpha(argv[3][0])) {
if (isalpha((unsigned char)argv[3][0])) {
/* choose a property by name with optional [] to denote array */
scan_count = sscanf(argv[3], "%79[^[][%u]", name, &array_value);
if (scan_count < 1) {
Expand Down