From 923eaf2313c42def0820a77c7bac350bdddcc805 Mon Sep 17 00:00:00 2001 From: Steve Karg Date: Wed, 24 Jul 2024 10:38:24 -0500 Subject: [PATCH] Added some dependency into zephyr kconfig for BACnet/IP builds. Updated simple sensor sample. --- tools/memap/requirements.txt | 6 ++++++ west.yml | 4 ++++ zephyr/Kconfig | 24 ++++++++++++++++++++++++ zephyr/samples/profiles/b-ss/src/main.c | 3 +++ zephyr/subsys/Kconfig | 15 +++++++++++++++ 5 files changed, 52 insertions(+) create mode 100644 tools/memap/requirements.txt diff --git a/tools/memap/requirements.txt b/tools/memap/requirements.txt new file mode 100644 index 00000000..fdfceda5 --- /dev/null +++ b/tools/memap/requirements.txt @@ -0,0 +1,6 @@ +prettytable>=3.10.2 +wcwidth>=0.2.13 +intelhex>=2.3.0 +future>=1.0.0 +jinja2>=3.1.4 +MarkupSafe>=2.0 diff --git a/west.yml b/west.yml index 96cb5c65..26b5df58 100644 --- a/west.yml +++ b/west.yml @@ -45,3 +45,7 @@ manifest: name-allowlist: - cmsis - picolibc + - hal_stm32 + - hal_microchip + - segger + - mcuboot diff --git a/zephyr/Kconfig b/zephyr/Kconfig index cff95d81..9c0404c8 100644 --- a/zephyr/Kconfig +++ b/zephyr/Kconfig @@ -67,6 +67,12 @@ config BACDL_ARCNET config BACDL_BIP bool "BACnet BIP datalink" + select NETWORKING + select NET_SOCKETS + select NET_UDP + select NET_IPV4 + select NET_DHCPV4 + select NET_IPV4_AUTO help Enable BACnet BIP datalink @@ -567,6 +573,24 @@ config BACNET_BASIC_OBJECT_TRENDLOG help Use the BACnet basic trendlog object +# MINIMAL CONFIG_NET_RX_STACK_SIZE +config NET_TX_STACK_SIZE + int + default 8192 if BACDL_BIP + +# MINIMAL CONFIG_NET_RX_STACK_SIZE +config NET_RX_STACK_SIZE + int + default 8192 if BACDL_BIP + +config NET_IF_UNICAST_IPV4_ADDR_COUNT + int + default 4 if BACDL_BIP + +config NET_IF_LOG_LEVEL_DGB + bool + default y if BACDL_BIP + rsource "subsys/Kconfig" endif # BACNETSTACK diff --git a/zephyr/samples/profiles/b-ss/src/main.c b/zephyr/samples/profiles/b-ss/src/main.c index ea74ebf9..d784b2bc 100644 --- a/zephyr/samples/profiles/b-ss/src/main.c +++ b/zephyr/samples/profiles/b-ss/src/main.c @@ -59,6 +59,9 @@ int main(void) bacnet_basic_init_callback_set(BACnet_Smart_Sensor_Init_Handler, NULL); bacnet_basic_task_callback_set(BACnet_Smart_Sensor_Task_Handler, NULL); /* work happens in server module */ + for (;;) { + k_sleep(K_MSEC(1000)); + } return 0; } diff --git a/zephyr/subsys/Kconfig b/zephyr/subsys/Kconfig index 086adfe9..6a79c0a9 100644 --- a/zephyr/subsys/Kconfig +++ b/zephyr/subsys/Kconfig @@ -9,3 +9,18 @@ rsource "bacnet_settings/Kconfig" rsource "bacnet_basic/Kconfig" rsource "object/Kconfig" rsource "server/Kconfig" + +config BACNET_SHELL + bool "BACnet Shell" + default n + select SHELL + select CONSOLE + select KERNEL_SHELL + select THREAD_MONITOR + select THREAD_NAME + select DEVICE_SHELL + select LOG + help + Enable BACnet Shell support + +