Increased BACnet Basic server application thread stack size to avoid stack overflow.

skarg · skarg · commit 0103ded30fa7 · 2024-12-03T17:42:05.000-06:00
diff --git a/zephyr/samples/profiles/b-ld/prj.conf b/zephyr/samples/profiles/b-ld/prj.conf
@@ -44,7 +44,7 @@ CONFIG_BACDL_BIP=y
 CONFIG_BACDL_BIP_PORT=47808
 # don't define index if you want to use the default interface
 # note: with DHCP and AutoIP enabled, index 0=AutoIP, 1=DHCP
-CONFIG_BACDL_BIP_ADDRESS_INDEX=1
+# CONFIG_BACDL_BIP_ADDRESS_INDEX=1
 
 # networking
 CONFIG_NETWORKING=y
@@ -62,7 +62,7 @@ CONFIG_NET_IF_MCAST_IPV4_ADDR_COUNT=2
 # Dynamic IP address
 CONFIG_NET_DHCPV4=y
 CONFIG_NET_DHCPV4_LOG_LEVEL_DBG=n
-CONFIG_NET_IPV4_AUTO=y
+CONFIG_NET_IPV4_AUTO=n
 CONFIG_NET_IPV4_AUTO_LOG_LEVEL_DBG=n
 CONFIG_NET_ICMPV4_LOG_LEVEL_DBG=n
 # read the MAC address from settings and set via net_mgmt()
diff --git a/zephyr/samples/profiles/b-ld/src/main.c b/zephyr/samples/profiles/b-ld/src/main.c
@@ -28,7 +28,10 @@
 #include "bacnet_osif/bacnet_log.h"
 LOG_MODULE_DECLARE(bacnet, CONFIG_BACNETSTACK_LOG_LEVEL);
 
-static const uint32_t Device_Instance = 260124;
+/* FIXME: get the device instance and name from settings! */
+static const uint32_t Device_Instance = 260125;
+static const char *Device_Name = "BACnet Lighting Device (B-LD)";
+/* object instances */
 static const uint32_t Lighting_Instance = 1;
 
 /**
@@ -70,6 +73,7 @@ static void BACnet_Lighting_Device_Init_Handler(void *context)
 	/* initialize objects for this basic sample */
 	Device_Init(NULL);
 	Device_Set_Object_Instance_Number(Device_Instance);
+	Device_Object_Name_ANSI_Init(Device_Name);
 	Lighting_Output_Create(Lighting_Instance);
 	Lighting_Output_Name_Set(Lighting_Instance, "Light-1");
 	Lighting_Output_Write_Present_Value_Callback_Set(
@@ -92,7 +96,7 @@ static void BACnet_Lighting_Device_Task_Handler(void *context)
 
 int main(void)
 {
-	LOG_INF("*** BACnet Lighting Device (B-LD) ***");
+	LOG_INF("BACnet Device: %s", Device_Name);
 	LOG_INF("BACnet Stack Version " BACNET_VERSION_TEXT);
 	LOG_INF("BACnet Stack Max APDU: %d", MAX_APDU);
 	bacnet_basic_init_callback_set(BACnet_Lighting_Device_Init_Handler,
diff --git a/zephyr/samples/profiles/b-ls/prj.conf b/zephyr/samples/profiles/b-ls/prj.conf
@@ -27,7 +27,7 @@ CONFIG_BACNETSTACK_BACNET_BASIC=y
 # BACnet Library - options
 CONFIG_BACNET_MAX_CHARACTER_STRING_BYTES=128
 CONFIG_BACAPP_MINIMAL=y
-# BACnet Library - objects
+# BACnet Library - basic objects
 CONFIG_BACNET_BASIC_OBJECT_NETWORK_PORT=y
 CONFIG_BACAPP_HOST_N_PORT=y
 CONFIG_BACNET_BASIC_OBJECT_LIGHTING_OUTPUT=y
@@ -50,13 +50,12 @@ CONFIG_BACDL_BIP=y
 CONFIG_BACDL_BIP_PORT=47808
 # don't define index if you want to use the default interface
 # note: with DHCP and AutoIP enabled, index 0=AutoIP, 1=DHCP
-CONFIG_BACDL_BIP_ADDRESS_INDEX=1
+# CONFIG_BACDL_BIP_ADDRESS_INDEX=1
 
 # networking
 CONFIG_NETWORKING=y
 CONFIG_NET_L2_ETHERNET=y
-#CONFIG_NET_ARP=y
-#CONFIG_NET_TCP=y
+CONFIG_NET_ARP=y
 CONFIG_NET_UDP=y
 CONFIG_NET_SHELL=y
 CONFIG_NET_SOCKETS=y
@@ -68,7 +67,7 @@ CONFIG_NET_IF_MCAST_IPV4_ADDR_COUNT=2
 # Dynamic IP address
 CONFIG_NET_DHCPV4=y
 CONFIG_NET_DHCPV4_LOG_LEVEL_DBG=n
-CONFIG_NET_IPV4_AUTO=y
+CONFIG_NET_IPV4_AUTO=n
 CONFIG_NET_IPV4_AUTO_LOG_LEVEL_DBG=n
 CONFIG_NET_ICMPV4_LOG_LEVEL_DBG=n
 # read the MAC address from settings and set via net_mgmt()
diff --git a/zephyr/samples/profiles/b-ls/src/main.c b/zephyr/samples/profiles/b-ls/src/main.c
@@ -33,8 +33,10 @@
 #include "bacnet_osif/bacnet_log.h"
 LOG_MODULE_DECLARE(bacnet, CONFIG_BACNETSTACK_LOG_LEVEL);
 
+/* FIXME: get the device instance and name from settings! */
+static const uint32_t Device_Instance = 260126;
+static const char *Device_Name = "BACnet Lighting Supervisor (B-LS)";
 /* instances for our objects */
-static const uint32_t Device_Instance = 260124;
 static const uint32_t Lighting_Instance = 1;
 static const uint32_t Binary_Lighting_Instance = 1;
 static const uint32_t Channel_Instance = 1;
@@ -115,6 +117,7 @@ static void BACnet_Lighting_Device_Init_Handler(void *context)
 	/* initialize objects for this basic sample */
 	Device_Init(NULL);
 	Device_Set_Object_Instance_Number(Device_Instance);
+	Device_Object_Name_ANSI_Init(Device_Name);
 	/* lighting output object */
 	Lighting_Output_Create(Lighting_Instance);
 	Lighting_Output_Name_Set(Lighting_Instance, "Light-1");
@@ -172,7 +175,7 @@ static void BACnet_Lighting_Device_Task_Handler(void *context)
 
 int main(void)
 {
-	LOG_INF("*** BACnet Lighting Device (B-LD) ***");
+	LOG_INF("BACnet Device: %s", Device_Name);
 	LOG_INF("BACnet Stack Version " BACNET_VERSION_TEXT);
 	LOG_INF("BACnet Stack Max APDU: %d", MAX_APDU);
 	bacnet_basic_init_callback_set(BACnet_Lighting_Device_Init_Handler,
diff --git a/zephyr/samples/profiles/b-sa/prj.conf b/zephyr/samples/profiles/b-sa/prj.conf
@@ -43,7 +43,7 @@ CONFIG_BACDL_BIP=y
 CONFIG_BACDL_BIP_PORT=47808
 # don't define index if you want to use the default interface
 # note: with DHCP and AutoIP enabled, index 0=AutoIP, 1=DHCP
-CONFIG_BACDL_BIP_ADDRESS_INDEX=1
+# CONFIG_BACDL_BIP_ADDRESS_INDEX=1
 
 # networking
 CONFIG_NETWORKING=y
@@ -61,19 +61,14 @@ CONFIG_NET_IF_MCAST_IPV4_ADDR_COUNT=2
 # Dynamic IP address
 CONFIG_NET_DHCPV4=y
 CONFIG_NET_DHCPV4_LOG_LEVEL_DBG=n
-CONFIG_NET_IPV4_AUTO=y
+CONFIG_NET_IPV4_AUTO=n
 CONFIG_NET_IPV4_AUTO_LOG_LEVEL_DBG=n
 CONFIG_NET_ICMPV4_LOG_LEVEL_DBG=n
 # read the MAC address from settings and set via net_mgmt()
 CONFIG_NET_MGMT_EVENT=y
 CONFIG_NET_L2_ETHERNET_MGMT=y
 CONFIG_NET_CONNECTION_MANAGER=y
 
-# Static IP address pre-configuration
-#CONFIG_NET_CONFIG_SETTINGS=y
-#CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
-#CONFIG_NET_CONFIG_MY_IPV4_NETMASK="255.255.255.0"
-#CONFIG_NET_CONFIG_MY_IPV4_GW="192.0.2.2"
 # Network debug config
 CONFIG_NET_LOG=y
 CONFIG_NET_SHELL=y
diff --git a/zephyr/samples/profiles/b-sa/src/main.c b/zephyr/samples/profiles/b-sa/src/main.c
@@ -28,7 +28,10 @@
 #include "bacnet_osif/bacnet_log.h"
 LOG_MODULE_DECLARE(bacnet, CONFIG_BACNETSTACK_LOG_LEVEL);
 
-static const uint32_t Device_Instance = 260123;
+/* FIXME: get the device instance and name from settings! */
+static const uint32_t Device_Instance = 260124;
+static const char *Device_Name = "BACnet Smart Actuator (B-SA)";
+/* object instances */
 static const uint32_t Actuator_Instance = 1;
 /* timer for Actuator Update Interval */
 static struct mstimer Actuator_Update_Timer;
@@ -50,6 +53,7 @@ static void BACnet_Smart_Actuator_Init_Handler(void *context)
 	/* initialize objects for this basic sample */
 	Device_Init(NULL);
 	Device_Set_Object_Instance_Number(Device_Instance);
+	Device_Object_Name_ANSI_Init(Device_Name);
 	Analog_Output_Create(Actuator_Instance);
 	Analog_Output_Name_Set(Actuator_Instance, "Actuator");
 	Analog_Output_Units_Set(Actuator_Instance, UNITS_PERCENT);
@@ -88,7 +92,7 @@ static void BACnet_Smart_Actuator_Task_Handler(void *context)
 
 int main(void)
 {
-	LOG_INF("*** BACnet Smart Actuator (B-SA) ***");
+	LOG_INF("BACnet Device: %s", Device_Name);
 	LOG_INF("BACnet Stack Version " BACNET_VERSION_TEXT);
 	LOG_INF("BACnet Stack Max APDU: %d", MAX_APDU);
 	bacnet_basic_init_callback_set(BACnet_Smart_Actuator_Init_Handler,
diff --git a/zephyr/samples/profiles/b-ss/prj.conf b/zephyr/samples/profiles/b-ss/prj.conf
@@ -41,24 +41,27 @@ CONFIG_BACNET_BASIC_DEVICE_SHELL=y
 # BACnet Datalink Options
 CONFIG_BACDL_BIP=y
 CONFIG_BACDL_BIP_PORT=47808
-CONFIG_BACDL_BIP_ADDRESS_INDEX=0
+# don't define index if you want to use the default interface
+# note: with DHCP and AutoIP enabled, index 0=AutoIP, 1=DHCP
+# CONFIG_BACDL_BIP_ADDRESS_INDEX=1
 
 # networking
 CONFIG_NETWORKING=y
-#CONFIG_NET_ARP=y
-#CONFIG_NET_TCP=y
+CONFIG_NET_ARP=y
 CONFIG_NET_UDP=y
 CONFIG_NET_SHELL=y
 CONFIG_NET_SOCKETS=y
+CONFIG_NET_IPV4=y
+CONFIG_NET_IPV4_LOG_LEVEL_DBG=n
+CONFIG_NET_IF_MAX_IPV4_COUNT=2
+CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=2
+CONFIG_NET_IF_MCAST_IPV4_ADDR_COUNT=2
 # Dynamic IP address
 CONFIG_NET_DHCPV4=y
-CONFIG_NET_IPV4_AUTO=y
-CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=2
-# Static IP address pre-configuration
-#CONFIG_NET_CONFIG_SETTINGS=y
-#CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
-#CONFIG_NET_CONFIG_MY_IPV4_NETMASK="255.255.255.0"
-#CONFIG_NET_CONFIG_MY_IPV4_GW="192.0.2.2"
+CONFIG_NET_DHCPV4_LOG_LEVEL_DBG=n
+CONFIG_NET_IPV4_AUTO=n
+CONFIG_NET_IPV4_AUTO_LOG_LEVEL_DBG=n
+CONFIG_NET_ICMPV4_LOG_LEVEL_DBG=n
 # Network debug config
 CONFIG_NET_LOG=y
 CONFIG_NET_SHELL=y
diff --git a/zephyr/samples/profiles/b-ss/src/main.c b/zephyr/samples/profiles/b-ss/src/main.c
@@ -28,7 +28,10 @@
 #include "bacnet_osif/bacnet_log.h"
 LOG_MODULE_DECLARE(bacnet, CONFIG_BACNETSTACK_LOG_LEVEL);
 
+/* FIXME: get the device instance and name from settings! */
 static const uint32_t Device_Instance = 260123;
+static const char *Device_Name = "BACnet Smart Sensor (B-SS)";
+/* object instances */
 static const uint32_t Sensor_Instance = 1;
 /* timer for Sensor Update Interval */
 static struct mstimer Sensor_Update_Timer;
@@ -51,6 +54,7 @@ static void BACnet_Smart_Sensor_Init_Handler(void *context)
     /* initialize objects for this basic sample */
     Device_Init(NULL);
     Device_Set_Object_Instance_Number(Device_Instance);
+    Device_Object_Name_ANSI_Init(Device_Name);
     Analog_Input_Create(Sensor_Instance);
     Analog_Input_Name_Set(Sensor_Instance, "Sensor");
     Analog_Input_Present_Value_Set(Sensor_Instance, 25.0f);
@@ -85,7 +89,7 @@ static void BACnet_Smart_Sensor_Task_Handler(void *context)
 
 int main(void)
 {
-	LOG_INF("*** BACnet Smart Sensor (B-SS) ***");
+	LOG_INF("BACnet Device: %s", Device_Name);
 	LOG_INF("BACnet Stack Version " BACNET_VERSION_TEXT);
 	LOG_INF("BACnet Stack Max APDU: %d", MAX_APDU);
     bacnet_basic_init_callback_set(BACnet_Smart_Sensor_Init_Handler, NULL);
diff --git a/zephyr/subsys/bacnet_basic/CMakeLists.txt b/zephyr/subsys/bacnet_basic/CMakeLists.txt
@@ -5,6 +5,11 @@
 # @copyright SPDX-License-Identifier: Apache-2.0
 zephyr_library(bacnet_basic)
 
+message(STATUS "BACNET BASIC: CONFIG_BACNET_BASIC_SERVER_STACK_SIZE \"${CONFIG_BACNET_BASIC_SERVER_STACK_SIZE}\"")
+message(STATUS "BACNET BASIC: CONFIG_BACNET_BASIC_SERVER_PRIORITY \"${CONFIG_BACNET_BASIC_SERVER_PRIORITY}\"")
+message(STATUS "BACNET BASIC: CONFIG_BACNET_BASIC_SERVER_APP_PRIORITY \"${CONFIG_BACNET_BASIC_SERVER_APP_PRIORITY}\"")
+message(STATUS "BACNET BASIC: CONFIG_BACNET_BASIC_SERVER_KSLEEP \"${CONFIG_BACNET_BASIC_SERVER_KSLEEP}\"")
+
 zephyr_library_include_directories(include)
 
 zephyr_library_sources(
diff --git a/zephyr/subsys/bacnet_basic/Kconfig b/zephyr/subsys/bacnet_basic/Kconfig
@@ -49,5 +49,24 @@ if BACNETSTACK_BACNET_BASIC
 		help
 			BACnet Stack KSLEEP time in milliseconds
 
+    config BACNET_BASIC_SERVER_APP_PRIORITY
+        int "App init priority"
+        default 0
+        help
+          This sets the starting priority of the thread.
+
+    config BACNET_BASIC_SERVER_PRIORITY
+        int "BACnet server thread priority"
+        default 50
+        help
+          This sets the execution priority of the thread.
+
+    config BACNET_BASIC_SERVER_STACK_SIZE
+        int "BACnet server stack size"
+        default 8192
+        help
+          This sets the stack size of the thread.
+
+
 
 endif # BACNETSTACK_BACNET_SETTINGS
diff --git a/zephyr/subsys/bacnet_basic/device.c b/zephyr/subsys/bacnet_basic/device.c
@@ -882,6 +882,16 @@ bool Device_Object_Name(uint32_t object_instance,
 	return status;
 }
 
+/**
+ * @brief Initialize the Device Object Name with an ANSI C string
+ * @param value [in] The object name as a null-terminated string
+ * @return True on success, else False
+ */
+bool Device_Object_Name_ANSI_Init(const char *value)
+{
+    return characterstring_init_ansi(&My_Object_Name, value);
+}
+
 bool Device_Set_Object_Name(const BACNET_CHARACTER_STRING *object_name)
 {
 	bool status = false; /*return value */
diff --git a/zephyr/subsys/bacnet_basic/server.c b/zephyr/subsys/bacnet_basic/server.c
@@ -20,17 +20,17 @@
 #include "bacnet_settings/bacnet_storage.h"
 #endif
 
-/* note: stack is minimally 2x to 3x of MAX_APDU */
-#ifndef CONFIG_BACNETSTACK_BACNET_SERVER_STACK_SIZE
-#define CONFIG_BACNETSTACK_BACNET_SERVER_STACK_SIZE 4096
+/* note: stack is minimally 3x of MAX_APDU */
+#ifndef CONFIG_BACNET_BASIC_SERVER_STACK_SIZE
+#define CONFIG_BACNET_BASIC_SERVER_STACK_SIZE 8192
 #endif
 
-#ifndef CONFIG_BACNETSTACK_BACNET_SERVER_PRIO
-#define CONFIG_BACNETSTACK_BACNET_SERVER_PRIO 10
+#ifndef CONFIG_BACNET_BASIC_SERVER_PRIORITY
+#define CONFIG_BACNET_BASIC_SERVER_PRIORITY 10
 #endif
 
-#ifndef CONFIG_BACNETSTACK_BACNET_SERVER_APP_PRIORITY
-#define CONFIG_BACNETSTACK_BACNET_SERVER_APP_PRIORITY 90
+#ifndef CONFIG_BACNET_BASIC_SERVER_APP_PRIORITY
+#define CONFIG_BACNET_BASIC_SERVER_APP_PRIORITY 90
 #endif
 
 #ifndef CONFIG_BACNET_BASIC_SERVER_KSLEEP
@@ -43,7 +43,7 @@ LOG_MODULE_DECLARE(bacnet, CONFIG_BACNETSTACK_LOG_LEVEL);
 
 static struct k_thread server_thread_data;
 static K_THREAD_STACK_DEFINE(server_thread_stack,
-                             CONFIG_BACNETSTACK_BACNET_SERVER_STACK_SIZE);
+                             CONFIG_BACNET_BASIC_SERVER_STACK_SIZE);
 
 /**
  * @brief BACnet Server Thread
@@ -60,11 +60,17 @@ static void server_thread(void)
         if (bacnet_port_init()) {
             break;
         } else {
-            LOG_ERR("BACnet Server: port initialization failed");
+            LOG_ERR("Server: port initialization failed");
             k_sleep(K_MSEC(1000));
         }
     }
-    LOG_INF("BACnet Server: initialized");
+    LOG_INF("Server: thread stack=%u bytes",
+        CONFIG_BACNET_BASIC_SERVER_STACK_SIZE);
+    LOG_INF("Server: thread priority=%u",
+        CONFIG_BACNET_BASIC_SERVER_PRIORITY);
+    LOG_INF("Server: thread sleep=%u milliseconds",
+        CONFIG_BACNET_BASIC_SERVER_KSLEEP);
+    LOG_INF("Server: initialized");
     for (;;) {
         k_sleep(K_MSEC(CONFIG_BACNET_BASIC_SERVER_KSLEEP));
         bacnet_basic_task();
@@ -80,12 +86,12 @@ static int server_init(void)
     k_thread_create(&server_thread_data, server_thread_stack,
                     K_THREAD_STACK_SIZEOF(server_thread_stack),
                     (k_thread_entry_t)server_thread, NULL, NULL, NULL,
-                    K_PRIO_PREEMPT(CONFIG_BACNETSTACK_BACNET_SERVER_PRIO), 0,
+                    K_PRIO_PREEMPT(CONFIG_BACNET_BASIC_SERVER_PRIORITY), 0,
                     K_NO_WAIT);
     k_thread_name_set(&server_thread_data, "bacnet_server");
 
     return 0;
 }
 
 SYS_INIT(server_init, APPLICATION,
-         CONFIG_BACNETSTACK_BACNET_SERVER_APP_PRIORITY);
+         CONFIG_BACNET_BASIC_SERVER_APP_PRIORITY);
