Merge pull request #14 from bacnet-stack/bugfix/sample-profile-b-ss-3.7

gregshue · web-flow · commit 5dc54f2356c8 · 2024-10-12T11:19:39.000-07:00
Updated sample-profile-b-ss to function with Zephyr 3.7.0
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
@@ -32,6 +32,7 @@ message(STATUS "BACNETSTACK: MAX_TSM_TRANSACTIONS \"${CONFIG_BACNET_MAX_TSM_TRAN
 message(STATUS "BACNETSTACK: MAX_ADDRESS_CACHE \"${CONFIG_BACNET_MAX_ADDRESS_CACHE}\"")
 message(STATUS "BACNETSTACK: MAX_CHARACTER_STRING_BYTES \"${CONFIG_BACNET_MAX_CHARACTER_STRING_BYTES}\"")
 message(STATUS "BACNETSTACK: MAX_OCTET_STRING_BYTES \"${CONFIG_BACNET_MAX_OCTET_STRING_BYTES}\"")
+message(STATUS "BACNETSTACK: CONFIG_BACNETSTACK_LOG_LEVEL \"${CONFIG_BACNETSTACK_LOG_LEVEL}\"")
 
 if(NOT (CONFIG_BACDL_ETHERNET OR
   CONFIG_BACDL_MSTP OR
diff --git a/zephyr/Kconfig b/zephyr/Kconfig
@@ -75,15 +75,17 @@ config BACDL_BIP
 	bool "BACnet BIP datalink"
 	select NETWORKING
 	select NET_SOCKETS
+	select NET_SOCKETS_POSIX_NAMES
 	select NET_UDP
 	select NET_IPV4
 	help
 	  Enable BACnet BIP datalink
 
 config BACDL_BIP6
-	bool "BACnet BIP6"
+	bool "BACnet BIP6 datalink"
 	select NETWORKING
 	select NET_SOCKETS
+	select NET_SOCKETS_POSIX_NAMES
 	select NET_UDP
 	select NET_IPV6
 	help
diff --git a/zephyr/include/bacnet-config.h b/zephyr/include/bacnet-config.h
@@ -1,13 +1,9 @@
 /**
  * @file
  * @brief Port specific configuration for BACnet Stack for Zephyr OS
- * @author Steve Karg
+ * @author Steve Karg <skarg@users.sourceforge.net>
  * @date 2024
- * @section LICENSE
- *
- * Copyright (C) 2024 Steve Karg <skarg@users.sourceforge.net>
- *
- * SPDX-License-Identifier: MIT
+ * @copyright SPDX-License-Identifier: Apache-2.0
  */
 #ifndef BACNET_PORTS_ZEPHYR_BACNET_CONFIG_H
 #define BACNET_PORTS_ZEPHYR_BACNET_CONFIG_H
@@ -18,5 +14,4 @@
 
 /* provides platform specific define for ARRAY_SIZE */
 #include <zephyr/sys/util.h>
-
 #endif
diff --git a/zephyr/include/bacnet_basic/bacnet_basic.h b/zephyr/include/bacnet_basic/bacnet_basic.h
@@ -17,11 +17,11 @@ extern "C" {
 #endif /* __cplusplus */
 
 void bacnet_basic_init(void);
-void bacnet_basic_init_callback_set(bacnet_basic_callback callback, 
+void bacnet_basic_init_callback_set(bacnet_basic_callback callback,
     void *context);
 
 void bacnet_basic_task(void);
-void bacnet_basic_task_callback_set(bacnet_basic_callback callback, 
+void bacnet_basic_task_callback_set(bacnet_basic_callback callback,
     void *context);
 
 unsigned long bacnet_basic_uptime_seconds(void);
diff --git a/zephyr/include/bacnet_basic/bacnet_port.h b/zephyr/include/bacnet_basic/bacnet_port.h
@@ -1,10 +1,10 @@
 /**
  * @file
- * @brief The BACnet datalink tasks for handling the device specific 
+ * @brief The BACnet datalink tasks for handling the device specific
  *  data link network port layer
  * @author Steve Karg <skarg@users.sourceforge.net>
  * @date April 2024
- * @copyright SPDX-License-Identifier: MIT
+ * @copyright SPDX-License-Identifier: Apache-2.0
  */
 #ifndef BACNET_PORT_H
 #define BACNET_PORT_H
diff --git a/zephyr/include/bacnet_basic/bacnet_port_ipv4.h b/zephyr/include/bacnet_basic/bacnet_port_ipv4.h
@@ -1,10 +1,10 @@
 /**
  * @file
- * @brief API for the BACnet datalink tasks for handling the device specific 
+ * @brief API for the BACnet datalink tasks for handling the device specific
  *  data link network port layer
  * @author Steve Karg <skarg@users.sourceforge.net>
  * @date April 2024
- * @copyright SPDX-License-Identifier: MIT
+ * @copyright SPDX-License-Identifier: Apache-2.0
  */
 #ifndef BACNET_PORT_IPV4_H
 #define BACNET_PORT_IPV4_H
diff --git a/zephyr/include/bacnet_basic/bacnet_port_ipv6.h b/zephyr/include/bacnet_basic/bacnet_port_ipv6.h
@@ -1,10 +1,10 @@
 /**
  * @file
- * @brief The BACnet/IPv6 datalink tasks for handling the device specific 
+ * @brief The BACnet/IPv6 datalink tasks for handling the device specific
  *  data link network port layer
  * @author Steve Karg <skarg@users.sourceforge.net>
  * @date April 2024
- * @copyright SPDX-License-Identifier: MIT
+ * @copyright SPDX-License-Identifier: Apache-2.0
  */
 #ifndef BACNET_PORT_IPV6_H
 #define BACNET_PORT_IPV6_H
diff --git a/zephyr/include/bacnet_osif/bacnet_log.h b/zephyr/include/bacnet_osif/bacnet_log.h
@@ -0,0 +1,17 @@
+/**
+ * @file
+ * @brief Logging level configuration for BACnet Stack for Zephyr OS
+ * @author Steve Karg <skarg@users.sourceforge.net>
+ * @date April 2024
+ * @copyright SPDX-License-Identifier: Apache-2.0
+ */
+#ifndef BACNET_OSIF_BACNET_LOG_H
+#define BACNET_OSIF_BACNET_LOG_H
+#include <zephyr/logging/log.h>
+#include <zephyr/logging/log_ctrl.h>
+
+#ifndef CONFIG_BACNETSTACK_LOG_LEVEL
+#define CONFIG_BACNETSTACK_LOG_LEVEL LOG_LEVEL_NONE
+#endif
+
+#endif
diff --git a/zephyr/include/bacnet_settings/bacnet_settings.h b/zephyr/include/bacnet_settings/bacnet_settings.h
@@ -3,7 +3,7 @@
  * @brief API for Get/Set of BACnet application encoded settings handlers
  * @author Steve Karg <skarg@users.sourceforge.net>
  * @date May 2024
- * @copyright SPDX-License-Identifier: MIT
+ * @copyright SPDX-License-Identifier: Apache-2.0
  */
 #ifndef BACNET_SETTINGS_H
 #define BACNET_SETTINGS_H
diff --git a/zephyr/include/bacnet_settings/bacnet_storage.h b/zephyr/include/bacnet_settings/bacnet_storage.h
@@ -4,7 +4,7 @@
  *  non-volatile object data
  * @author Steve Karg <skarg@users.sourceforge.net>
  * @date May 2024
- * @copyright SPDX-License-Identifier: MIT
+ * @copyright SPDX-License-Identifier: Apache-2.0
  */
 #ifndef BACNET_STORAGE_H
 #define BACNET_STORAGE_H
diff --git a/zephyr/samples/profiles/b-ss/prj.conf b/zephyr/samples/profiles/b-ss/prj.conf
@@ -22,6 +22,7 @@ CONFIG_INIT_STACKS=y
 
 # BACnet Library
 CONFIG_BACNETSTACK=y
+CONFIG_BACNETSTACK_LOG_LEVEL=3
 CONFIG_BACNETSTACK_BACNET_BASIC=y
 # BACnet Library - options
 CONFIG_BACNET_MAX_CHARACTER_STRING_BYTES=128
@@ -38,11 +39,10 @@ CONFIG_BACNET_BASIC_DEVICE_SHELL=y
 #CONFIG_BACNET_SETTINGS=y
 #CONFIG_BACNET_SETTINGS_SHELL=y
 
-# BIP6 Options
+# BACnet Datalink Options
 CONFIG_BACDL_BIP=y
 CONFIG_BACDL_BIP_PORT=47808
 CONFIG_BACDL_BIP_ADDRESS_INDEX=0
-CONFIG_NET_IPV4=y
 
 # networking
 CONFIG_NETWORKING=y
@@ -51,6 +51,18 @@ CONFIG_NETWORKING=y
 CONFIG_NET_UDP=y
 CONFIG_NET_SHELL=y
 CONFIG_NET_SOCKETS=y
+# 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"
+# Network debug config
+CONFIG_NET_LOG=y
+CONFIG_NET_SHELL=y
 
 #CONFIG_DNS_RESOLVER=y
 #CONFIG_SLIP_STATISTICS=n
@@ -70,24 +82,25 @@ CONFIG_DEVICE_SHELL=y
 #CONFIG_POSIX_CLOCK=y
 #CONFIG_DATE_SHELL=y
 CONFIG_LOG=y
+CONFIG_LOG_BACKEND_UART=y
+CONFIG_SHELL_LOG_BACKEND=n
 #CONFIG_LOG_STRDUP_BUF_COUNT=4
 #CONFIG_LOG_STRDUP_MAX_STRING=96
 #CONFIG_NET_CONN_LOG_LEVEL_DEFAULT=n
 #CONFIG_NET_CONN_LOG_LEVEL_DBG=y
 #CONFIG_NET_IF_LOG_LEVEL_DEFAULT=n
-CONFIG_NET_IF_LOG_LEVEL_DBG=y
+CONFIG_NET_IF_LOG_LEVEL_DBG=n
 CONFIG_NET_LOG=y
-CONFIG_BACNETSTACK_LOG_LEVEL_DBG=y
 
 # enable the thread, stack, and runtime stats
-#CONFIG_THREAD_ANALYZER=y
-#CONFIG_THREAD_STACK_INFO=y
-#CONFIG_THREAD_RUNTIME_STATS=y
+CONFIG_THREAD_ANALYZER=y
+CONFIG_THREAD_STACK_INFO=y
+CONFIG_THREAD_RUNTIME_STATS=y
 #CONFIG_THREAD_RUNTIME_STATS_USE_TIMING_FUNCTIONS=n
 #CONFIG_SCHED_THREAD_USAGE=y
 #CONFIG_SCHED_THREAD_USAGE_ANALYSIS=y
-#CONFIG_STATS=y
-#CONFIG_STATS_SHELL=y
+CONFIG_STATS=y
+CONFIG_STATS_SHELL=y
 
 #
 # Storage
diff --git a/zephyr/samples/profiles/b-ss/src/main.c b/zephyr/samples/profiles/b-ss/src/main.c
@@ -24,14 +24,19 @@
 #include "bacnet_basic/bacnet_basic.h"
 
 /* Logging module registration is already done in ports/zephyr/main.c */
-#include <zephyr/logging/log.h>
+#include "bacnet_osif/bacnet_log.h"
 LOG_MODULE_DECLARE(bacnet, CONFIG_BACNETSTACK_LOG_LEVEL);
 
 static const uint32_t Device_Instance = 260123;
 static const uint32_t Sensor_Instance = 1;
 /* timer for Sensor Update Interval */
 static struct mstimer Sensor_Update_Timer;
 
+static void BACnet_Smart_Sensor_Datalink_Init(void)
+{
+
+}
+
 /**
  * @brief BACnet Project Initialization Handler
  * @param context [in] The context to pass to the callback function
@@ -41,6 +46,7 @@ static void BACnet_Smart_Sensor_Init_Handler(void *context)
 {
     (void)context;
     LOG_INF("BACnet Stack Initialized");
+    BACnet_Smart_Sensor_Datalink_Init();
     /* initialize objects for this basic sample */
     Device_Init(NULL);
     Device_Set_Object_Instance_Number(Device_Instance);
@@ -78,7 +84,7 @@ static void BACnet_Smart_Sensor_Task_Handler(void *context)
 
 int main(void)
 {
-	LOG_INF("\n*** BACnet Profile B-SS Sample ***\n");
+	LOG_INF("*** BACnet Profile B-SS Sample ***");
 	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/device.c b/zephyr/subsys/bacnet_basic/device.c
@@ -614,7 +614,7 @@ bool Device_Object_Name(
     return status;
 }
 
-bool Device_Set_Object_Name(BACNET_CHARACTER_STRING *object_name)
+bool Device_Set_Object_Name(const BACNET_CHARACTER_STRING *object_name)
 {
     bool status = false; /*return value */
 
@@ -820,7 +820,7 @@ int Device_Object_List_Element_Encode(
  * Object.
  * @return True on success or else False if not found.
  */
-bool Device_Valid_Object_Name(BACNET_CHARACTER_STRING *object_name1,
+bool Device_Valid_Object_Name(const BACNET_CHARACTER_STRING *object_name1,
     BACNET_OBJECT_TYPE *object_type,
     uint32_t *object_instance)
 {
diff --git a/zephyr/subsys/bacnet_basic/server.c b/zephyr/subsys/bacnet_basic/server.c
@@ -33,12 +33,8 @@
 #define CONFIG_BACNETSTACK_BACNET_SERVER_APP_PRIORITY 90
 #endif
 
-#ifndef CONFIG_BACNETSTACK_LOG_LEVEL
-#define CONFIG_BACNETSTACK_LOG_LEVEL LOG_LEVEL_INF
-#endif
-
-/* Logging module registration is already done in ports/zephyr/main.c */
-#include <zephyr/logging/log.h>
+/* Logging module registration is done in OSIF */
+#include "bacnet_osif/bacnet_log.h"
 LOG_MODULE_DECLARE(bacnet, CONFIG_BACNETSTACK_LOG_LEVEL);
 
 static struct k_thread server_thread_data;
diff --git a/zephyr/subsys/bacnet_datalink/CMakeLists.txt b/zephyr/subsys/bacnet_datalink/CMakeLists.txt
@@ -1,7 +1,12 @@
 # Copyright (c) 2024 Legrand North America, LLC.
 # SPDX-License-Identifier: Apache-2.0
 
-zephyr_sources(
-  $<$<BOOL:${CONFIG_BACDL_BIP}>:bip-init.c>
-  $<$<BOOL:${CONFIG_BACDL_BIP6}>:bip6-init.c>
+zephyr_sources_ifdef(
+  CONFIG_BACDL_BIP
+  bip-init.c
+)
+
+zephyr_sources_ifdef(
+  CONFIG_BACDL_BIP6
+  bip6-init.c
 )
diff --git a/zephyr/subsys/bacnet_datalink/bip-init.c b/zephyr/subsys/bacnet_datalink/bip-init.c
@@ -11,6 +11,7 @@
 #include <zephyr/init.h>
 #include <zephyr/kernel.h>
 #include <zephyr/sys/printk.h>
+#include <zephyr/net/net_if.h>
 #include <zephyr/net/net_ip.h>
 #include <zephyr/net/socket.h>
 #include <zephyr/net/socket_select.h>
@@ -24,9 +25,7 @@
 #include "bacnet/basic/bbmd/h_bbmd.h"
 
 /* Logging module registration is already done in ports/zephyr/main.c */
-#include <zephyr/logging/log.h>
-#include <zephyr/logging/log_ctrl.h>
-
+#include "bacnet_osif/bacnet_log.h"
 LOG_MODULE_DECLARE(bacnet, CONFIG_BACNETSTACK_LOG_LEVEL);
 
 #define THIS_FILE "bip-init.c"
@@ -150,7 +149,7 @@ void bip_get_broadcast_address(BACNET_ADDRESS *dest)
  * @param addr - network IPv4 address
  * @return true if the address was set
  */
-bool bip_set_addr(BACNET_IP_ADDRESS *addr)
+bool bip_set_addr(const BACNET_IP_ADDRESS *addr)
 {
     if (addr) {
         memcpy(&BIP_Address.s_addr, &addr->address[0], IP_ADDRESS_MAX);
@@ -180,7 +179,7 @@ bool bip_get_addr(BACNET_IP_ADDRESS *addr)
  * @param addr - network IPv4 address
  * @return true if the address was set
  */
-bool bip_set_broadcast_addr(BACNET_IP_ADDRESS *addr)
+bool bip_set_broadcast_addr(const BACNET_IP_ADDRESS *addr)
 {
     if (addr) {
         memcpy(&BIP_Broadcast_Addr.s_addr, &addr->address[0], IP_ADDRESS_MAX);
@@ -249,7 +248,8 @@ uint8_t bip_get_subnet_prefix(void)
  * @return Upon successful completion, returns the number of bytes sent.
  *  Otherwise, -1 shall be returned and errno set to indicate the error.
  */
-int bip_send_mpdu(BACNET_IP_ADDRESS *dest, uint8_t *mtu, uint16_t mtu_len)
+int bip_send_mpdu(const BACNET_IP_ADDRESS *dest, const uint8_t *mtu,
+    uint16_t mtu_len)
 {
     struct sockaddr_in bip_dest = { 0 };
 
@@ -404,7 +404,7 @@ int bip_send_pdu(BACNET_ADDRESS *dest,
  * @param ifname [in] The named interface to use for the network layer.
  *        Eg, for Linux, ifname is eth0, ath0, arc0, and others.
  */
-void bip_set_interface(char *ifname)
+void bip_set_interface(const char *ifname)
 {
     struct net_if *iface = 0;
     int index = -1;
@@ -474,11 +474,11 @@ void bip_set_interface(char *ifname)
         }
         LOG_INF("Using IPv4 address at index %d", index);
         /* Build the broadcast address from the unicast and netmask */
-        struct net_if_addr *if_addr = &iface->config.ip.ipv4->unicast[index];
+        struct net_if_addr_ipv4 *if_addr = &iface->config.ip.ipv4->unicast[index];
         for (x = 0; x < IP_ADDRESS_MAX; x++) {
-            unicast.address[x] = if_addr->address.in_addr.s4_addr[x];
-            broadcast.address[x] = if_addr->address.in_addr.s4_addr[x] |
-                ~iface->config.ip.ipv4->netmask.s4_addr[x];
+            unicast.address[x] = if_addr->ipv4.address.in_addr.s4_addr[x];
+            broadcast.address[x] = if_addr->ipv4.address.in_addr.s4_addr[x] |
+                ~if_addr->netmask.s4_addr[x];
         }
         bip_set_addr(&unicast);
         bip_set_broadcast_addr(&broadcast);
diff --git a/zephyr/subsys/bacnet_datalink/bip6-init.c b/zephyr/subsys/bacnet_datalink/bip6-init.c
@@ -25,9 +25,7 @@
 #include "bacnet/basic/bbmd6/h_bbmd6.h"
 
 /* Logging module registration is already done in ports/zephyr/main.c */
-#include <zephyr/logging/log.h>
-#include <zephyr/logging/log_ctrl.h>
-
+#include "bacnet_osif/bacnet_log.h"
 LOG_MODULE_DECLARE(bacnet, CONFIG_BACNETSTACK_LOG_LEVEL);
 
 #define THIS_FILE "bip6-init.c"
diff --git a/zephyr/subsys/bacnet_osif/bacnet_log.c b/zephyr/subsys/bacnet_osif/bacnet_log.c
@@ -14,6 +14,7 @@
 #include <zephyr/sys/printk.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/kernel.h>
+#include "bacnet_osif/bacnet_log.h"
 
 #define LOG_LEVEL CONFIG_BACNETSTACK_LOG_LEVEL
 #include <zephyr/logging/log.h>
diff --git a/zephyr/subsys/bacnet_settings/bacnet_storage.c b/zephyr/subsys/bacnet_settings/bacnet_storage.c
@@ -29,7 +29,7 @@
 #endif
 
 /* Logging module registration is already done in bacnet/ports/zephyr/main.c */
-#include <zephyr/logging/log.h>
+#include "bacnet_osif/bacnet_log.h"
 LOG_MODULE_DECLARE(bacnet, CONFIG_BACNETSTACK_LOG_LEVEL);
 #define FAIL_MSG "fail (err %d)"
 
diff --git a/zephyr/subsys/server/server.c b/zephyr/subsys/server/server.c
