Moved west.yml to root; updated to zephyr v2.6.0 (#186)

Co-authored-by: Gregory Shue <gregory.shue@legrand.us>

west.yml

@@ -0,0 +1,44 @@
+# The default west manifest file for Cutter.
+#
+# The per-installation west configuration file, .west/config, sets the
+# path to the project containing this file in the [manifest] section's
+# "path" variable.
+#
+# This imports the latest upstream Zephyr manifest file.
+#
+# You can pass your manifest repositories to west init when creating a
+# new Zephyr installation. See the west documentation for more
+# information.
+#
+# Beginning with west 0.8, the following command-line options
+# can be used to initialize with a repository lacking a west.yml
+# file at the top level.
+#
+#   west init
+#     -m <repository>
+#     --mr <branch_name>
+#     --mf <manifest_pathname>
+#     <workspace>
+
+manifest:
+  version: 0.7  # This file uses syntax from west 0.7
+
+  remotes:
+    - name: bacnet-stack
+      url-base: https://github.com/zephyrproject-rtos
+    - name: zephyrproject-rtos
+      url-base: https://github.com/bacnet-stack
+
+  defaults:
+    remote: zephyrproject-rtos
+
+  self:
+    path: bacnet-stack
+
+  projects:
+    - name: zephyr
+      path: zephyr
+      revision: v2.6.0
+      remote: zephyrproject-rtos
+      west-commands: scripts/west-commands.yml
+      import: true

zephyr/CMakeLists.txt

@@ -254,7 +254,6 @@ set(BACNETSTACK_SRCS
     ${BACNETSTACK_SRC}/bacnet/datetime.h
     ${BACNETSTACK_SRC}/bacnet/dcc.c
     ${BACNETSTACK_SRC}/bacnet/dcc.h
-    ${BACNETSTACK_SRC}/bacnet/event.c
     ${BACNETSTACK_SRC}/bacnet/event.h
     ${BACNETSTACK_SRC}/bacnet/get_alarm_sum.c
     ${BACNETSTACK_SRC}/bacnet/get_alarm_sum.h
@@ -316,9 +315,7 @@ set(BACNETSTACK_BASIC_SRCS
     ${BACNETSTACK_SRC}/bacnet/basic/object/access_user.c
     ${BACNETSTACK_SRC}/bacnet/basic/object/access_zone.c
     ${BACNETSTACK_SRC}/bacnet/basic/object/acc.c
-    ${BACNETSTACK_SRC}/bacnet/basic/object/ai.c
     ${BACNETSTACK_SRC}/bacnet/basic/object/ao.c
-    ${BACNETSTACK_SRC}/bacnet/basic/object/av.c
     ${BACNETSTACK_SRC}/bacnet/basic/object/bacfile.c # Build error: fseek not supported in Zephyr
     ${BACNETSTACK_SRC}/bacnet/basic/object/bi.c
     ${BACNETSTACK_SRC}/bacnet/basic/object/bo.c
@@ -334,7 +331,6 @@ set(BACNETSTACK_BASIC_SRCS
     ${BACNETSTACK_SRC}/bacnet/basic/object/lc.c
     ${BACNETSTACK_SRC}/bacnet/basic/object/lo.c
     ${BACNETSTACK_SRC}/bacnet/basic/object/lsp.c
-    ${BACNETSTACK_SRC}/bacnet/basic/object/Makefile
     ${BACNETSTACK_SRC}/bacnet/basic/object/ms-input.c
     ${BACNETSTACK_SRC}/bacnet/basic/object/mso.c
     ${BACNETSTACK_SRC}/bacnet/basic/object/msv.c
@@ -402,6 +398,9 @@ list(
       $<$<BOOL:${CONFIG_BACDL_ETHERNET}>:${BACNETSTACK_PORT}/ethernet.c>
       ${BACNETSTACK_PORT}/main.c
       ${BACNETSTACK_PORT}/mstimer-init.c
+      ${BACNETSTACK_PORT}/ai.c
+      ${BACNETSTACK_PORT}/av.c
+      ${BACNETSTACK_PORT}/event.c
   )
 
 

zephyr/manifests/zp/zephyr/west.yml

@@ -1,35 +0,0 @@
-#
-# Copyright (c) 2020 Legrand North America, LLC.
-#
-# SPDX-License-Identifier: MIT
-
-# The west manifest file for upstream Zephyr Project's Zephyr repo.
-#
-# NOTE: Requires west 0.8.0a1 or later (pip3 install west==0.8.0a1)
-#
-# Usage (from top of workspace):
-#   west
-#     --zephyr-base zephyr
-#     init
-#       -m https://github.com/bacnet-stack/bacnet-stack
-#       --mr <desired repo branch>
-#       --mf zephyr/manifests/zp/zephyr/west.yml
-#       --zephyr-base zephyr
-#       $workspace
-#   cd $workspace
-#   west update
-#   source zephyr/zephyr-env.sh
-
-manifest:
-  version: 0.7
-  remotes:
-    - name: zephyrproject-rtos
-      url-base: https://github.com/zephyrproject-rtos
-  projects:
-    - name: zephyr
-      remote: zephyrproject-rtos
-      revision: v2.3.0  # Latest integrated release
-      import: true
-      path: zephyr
-  self:
-      path: bacnet-stack

zephyr/samples/hello_bacnet_stack/sample.yaml

@@ -10,6 +10,6 @@ common:
       regex:
         - "Hello BACnet-Stack! (.*)"
 tests:
-  sample.basic.hello_bacnet_stack:
+  bacnet-stack.sample.basic.hello_bacnet_stack:
-    platform_whitelist: native_posix
+    platform_allow: native_posix
     tags: introduction

zephyr/samples/profiles/b-ss/sample.yaml

@@ -2,6 +2,6 @@ sample:
   name: BACnet Profile B-SS Sample
 
 tests:
-  sample.profile.b-ss:
+  bacnet-stack.sample.profile.b-ss:
     tags: bacnet
-    platform_whitelist: qemu_x86 native_posix native_posix_64
+    platform_allow: qemu_x86 native_posix native_posix_64

zephyr/samples/profiles/b-ss/src/main.c

@@ -82,14 +82,14 @@ void main(void)
 	datalink_init(NULL);
 
 	/* configure the timeout values */
-	s64_t last_ms = k_uptime_get();
+	int64_t last_ms = k_uptime_get();
 
 	/* broadcast an I-Am on startup */
 	Send_I_Am(&Handler_Transmit_Buffer[0]);
 
-	s64_t address_binding_tmr = 0;
+	int64_t address_binding_tmr = 0;
 #if defined(INTRINSIC_REPORTING)
-	s64_t recipient_scan_tmr = 0;
+	int64_t recipient_scan_tmr = 0;
 #endif
 #if defined(BACNET_TIME_MASTER)
 	BACNET_DATE_TIME bdatetime = { 0 };
@@ -99,7 +99,7 @@ void main(void)
 		BACNET_ADDRESS src = { 0 }; /* address where message came from */
 		const unsigned timeout_ms = 1;
 
-		s64_t current_ms = k_uptime_get();
+		int64_t current_ms = k_uptime_get();
 
 		/* returns 0 bytes on timeout */
 		uint16_t const pdu_len = datalink_receive(&src, &Rx_Buf[0],