applications: connectivity_bridge: Align with USB changes

Align connectivity bridge app with USB changes.

Signed-off-by: Robert Lubos <[email protected]>

Author: rlubos

applications/connectivity_bridge/app.overlay

@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2021 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&zephyr_udc0 {
+	cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
+
+	cdc_acm_uart1 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_1";
+	};
+};

applications/connectivity_bridge/prj.conf

@@ -25,7 +25,6 @@ CONFIG_USB_DEVICE_PID=0x9100
 CONFIG_USB_DEVICE_SN="THINGY91 12PLACEHLDRS" # This is overridden at runtime
 CONFIG_USB_COMPOSITE_DEVICE=y
 CONFIG_USB_CDC_ACM_RINGBUF_SIZE=16384
-CONFIG_USB_CDC_ACM_DEVICE_COUNT=2
 
 # Disk and file system
 CONFIG_DISK_ACCESS=y

applications/connectivity_bridge/src/modules/usb_cdc_handler.c

@@ -17,8 +17,8 @@
 #include <logging/log.h>
 LOG_MODULE_REGISTER(MODULE, CONFIG_BRIDGE_CDC_LOG_LEVEL);
 
-#define CDC_DEVICE_COUNT CONFIG_USB_CDC_ACM_DEVICE_COUNT
-#define CDC_DEVICE_NAME_TEMPLATE CONFIG_USB_CDC_ACM_DEVICE_NAME "_%d"
+#define CDC_DEVICE_COUNT 2
+#define CDC_DEVICE_NAME_TEMPLATE "CDC_ACM_%d"
 
 #define USB_CDC_DTR_POLL_MS 500
 #define USB_CDC_RX_BLOCK_SIZE CONFIG_BRIDGE_BUF_SIZE