From 557e9337bccba5b8f7f49e3365205023842b09b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20H=C3=A4rtel?=
 <60009336+Haerteleric@users.noreply.github.com>
Date: Mon, 4 Dec 2023 09:48:44 +0100
Subject: [PATCH] Add CB3 descriptor to ZHA manifest (#104071)

---
 homeassistant/components/zha/manifest.json | 6 ++++++
 homeassistant/generated/usb.py             | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/homeassistant/components/zha/manifest.json b/homeassistant/components/zha/manifest.json
index cd53772777a..4c8a58a12cf 100644
--- a/homeassistant/components/zha/manifest.json
+++ b/homeassistant/components/zha/manifest.json
@@ -76,6 +76,12 @@
       "description": "*conbee*",
       "known_devices": ["Conbee II"]
     },
+    {
+      "vid": "0403",
+      "pid": "6015",
+      "description": "*conbee*",
+      "known_devices": ["Conbee III"]
+    },
     {
       "vid": "10C4",
       "pid": "8A2A",
diff --git a/homeassistant/generated/usb.py b/homeassistant/generated/usb.py
index f58936caf8d..2fdd032c2dd 100644
--- a/homeassistant/generated/usb.py
+++ b/homeassistant/generated/usb.py
@@ -81,6 +81,12 @@ USB = [
         "pid": "0030",
         "vid": "1CF1",
     },
+    {
+        "description": "*conbee*",
+        "domain": "zha",
+        "pid": "6015",
+        "vid": "0403",
+    },
     {
         "description": "*zigbee*",
         "domain": "zha",