diff --git a/zigbee/network_coordinator_dongle/CMakeLists.txt b/zigbee/network_coordinator_dongle/CMakeLists.txt index 2e6c804..5a0c733 100644 --- a/zigbee/network_coordinator_dongle/CMakeLists.txt +++ b/zigbee/network_coordinator_dongle/CMakeLists.txt @@ -6,6 +6,12 @@ cmake_minimum_required(VERSION 3.20.0) +set(CONF_FILE "prj.conf") + +if (EXISTS boards/${BOARD}.conf) + list(APPEND CONF_FILE boards/${BOARD}.conf) +endif() + find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) project("Zigbee coordinator") diff --git a/zigbee/network_coordinator_dongle/boards/nrf52840dongle_nrf52840.overlay b/zigbee/network_coordinator_dongle/boards/nrf52840dongle_nrf52840.overlay index b5f36b9..0f48d4b 100644 --- a/zigbee/network_coordinator_dongle/boards/nrf52840dongle_nrf52840.overlay +++ b/zigbee/network_coordinator_dongle/boards/nrf52840dongle_nrf52840.overlay @@ -4,9 +4,12 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ + + / { chosen { zephyr,entropy = &rng; + zephyr,shell-uart = &cdc_acm_uart0; }; buttons { @@ -21,3 +24,10 @@ rst0 = &rst_button0; }; }; + +&zephyr_udc0 { + cdc_acm_uart0: cdc_acm_uart0 { + compatible = "zephyr,cdc-acm-uart"; + label = "CDC_ACM_0"; + }; +}; diff --git a/zigbee/network_coordinator_dongle/prj.conf b/zigbee/network_coordinator_dongle/prj.conf index 42155ec..109e624 100644 --- a/zigbee/network_coordinator_dongle/prj.conf +++ b/zigbee/network_coordinator_dongle/prj.conf @@ -7,13 +7,8 @@ CONFIG_NCS_SAMPLES_DEFAULTS=y CONFIG_UART_INTERRUPT_DRIVEN=y -CONFIG_SERIAL=y CONFIG_GPIO=y -# Make sure printk is not printing to the UART console -CONFIG_CONSOLE=y -CONFIG_UART_CONSOLE=y - CONFIG_HEAP_MEM_POOL_SIZE=2048 CONFIG_MAIN_THREAD_PRIORITY=7 @@ -21,6 +16,10 @@ CONFIG_ZIGBEE=y CONFIG_ZIGBEE_APP_UTILS=y CONFIG_ZIGBEE_ROLE_COORDINATOR=y +# Shell +CONFIG_SHELL=y +CONFIG_ZIGBEE_SHELL=y + # Enable DK LED and Buttons library CONFIG_DK_LIBRARY=y diff --git a/zigbee/network_coordinator_dongle/src/main.c b/zigbee/network_coordinator_dongle/src/main.c index 3023f83..d45a9bc 100644 --- a/zigbee/network_coordinator_dongle/src/main.c +++ b/zigbee/network_coordinator_dongle/src/main.c @@ -10,6 +10,7 @@ #include #include +#include #include #include @@ -310,6 +311,9 @@ void main(void) LOG_INF("Starting ZBOSS Coordinator example"); + /* Enable USB */ + usb_enable(NULL); + /* Initialize */ configure_gpio();