Fixed init and thread priorities for BACnet Basic samples.

Author: skarg

zephyr/subsys/bacnet_basic/CMakeLists.txt

@@ -6,8 +6,8 @@
 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_INIT_PRIORITY \"${CONFIG_BACNET_BASIC_SERVER_INIT_PRIORITY}\"")
+message(STATUS "BACNET BASIC: CONFIG_BACNET_BASIC_SERVER_THREAD_PRIORITY \"${CONFIG_BACNET_BASIC_SERVER_THREAD_PRIORITY}\"")
 message(STATUS "BACNET BASIC: CONFIG_BACNET_BASIC_SERVER_KSLEEP \"${CONFIG_BACNET_BASIC_SERVER_KSLEEP}\"")
 
 zephyr_library_include_directories(include)

zephyr/subsys/bacnet_basic/Kconfig

@@ -49,17 +49,19 @@ 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_INIT_PRIORITY
+		int "Initialization priority"
+		default APPLICATION_INIT_PRIORITY
+		range 0 99
+		help
+		  Initialization priority in the main thread for BACnet Basic Server where 0 is the highest priority.
 
-    config BACNET_BASIC_SERVER_PRIORITY
-        int "BACnet server thread priority"
-        default 50
+    config BACNET_BASIC_SERVER_THREAD_PRIORITY
+        int "Thread priority"
+		default 10
+		range 0 NUM_PREEMPT_PRIORITIES
         help
-          This sets the execution priority of the thread.
+          This sets the thread priority of the BACnet Basic Server where 0 is the highest priority.
 
     config BACNET_BASIC_SERVER_STACK_SIZE
         int "BACnet server stack size"

zephyr/subsys/bacnet_basic/server.c

@@ -25,14 +25,17 @@
 #define CONFIG_BACNET_BASIC_SERVER_STACK_SIZE 8192
 #endif
 
-#ifndef CONFIG_BACNET_BASIC_SERVER_PRIORITY
-#define CONFIG_BACNET_BASIC_SERVER_PRIORITY 10
+/* note: init runs in main thread with sub-priority of 0..99 */
+#ifndef CONFIG_BACNET_BASIC_SERVER_INIT_PRIORITY
+#define CONFIG_BACNET_BASIC_SERVER_INIT_PRIORITY 50
 #endif
 
-#ifndef CONFIG_BACNET_BASIC_SERVER_APP_PRIORITY
-#define CONFIG_BACNET_BASIC_SERVER_APP_PRIORITY 90
+/* note: thread preemptive priority 0..15 */
+#ifndef CONFIG_BACNET_BASIC_SERVER_THREAD_PRIORITY
+#define CONFIG_BACNET_BASIC_SERVER_THREAD_PRIORITY 10
 #endif
 
+/* note: sleep time in main loop in milliseconds */
 #ifndef CONFIG_BACNET_BASIC_SERVER_KSLEEP
 #define CONFIG_BACNET_BASIC_SERVER_KSLEEP 10
 #endif
@@ -67,7 +70,7 @@ static void server_thread(void)
     LOG_INF("Server: thread stack=%u bytes",
         CONFIG_BACNET_BASIC_SERVER_STACK_SIZE);
     LOG_INF("Server: thread priority=%u",
-        CONFIG_BACNET_BASIC_SERVER_PRIORITY);
+        CONFIG_BACNET_BASIC_SERVER_THREAD_PRIORITY);
     LOG_INF("Server: thread sleep=%u milliseconds",
         CONFIG_BACNET_BASIC_SERVER_KSLEEP);
     LOG_INF("Server: initialized");
@@ -86,12 +89,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_BACNET_BASIC_SERVER_PRIORITY), 0,
+                    K_PRIO_PREEMPT(CONFIG_BACNET_BASIC_SERVER_THREAD_PRIORITY), 0,
                     K_NO_WAIT);
     k_thread_name_set(&server_thread_data, "bacnet_server");
 
     return 0;
 }
 
 SYS_INIT(server_init, APPLICATION,
-         CONFIG_BACNET_BASIC_SERVER_APP_PRIORITY);
+         CONFIG_BACNET_BASIC_SERVER_INIT_PRIORITY);