Moved the USB VID/PID stuff back into Kconfig. Users have no business…

… touching those, vendors should use .conf files for those.
zmkfirmware · Oct 15, 2024 · 1f047bb · 1f047bb
1 parent 0c8913d
commit 1f047bb
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 21 deletions.
diff --git a/app/Kconfig b/app/Kconfig
@@ -16,9 +16,27 @@ config USB_DEVICE_PRODUCT
 config BT_DEVICE_NAME
     default ZMK_KEYBOARD_NAME
 
+config USB_DEVICE_VID
+    default 0x1D50
+
+config USB_DEVICE_PID
+    default 0x615E
+
+config USB_DEVICE_MANUFACTURER
+    default "ZMK Project"
+
+config BT_DIS_PNP_VID
+    default 0x1D50
+
+config BT_DIS_PNP_PID
+    default 0x615E
+
 config BT_DIS_MODEL
     default ZMK_KEYBOARD_NAME
 
+config BT_DIS_MANUF
+    default "ZMK Project"
+
 # Hardware specific overrides
 
 if SOC_SERIES_NRF52X

diff --git a/app/Kconfig.defaults b/app/Kconfig.defaults
@@ -1,27 +1,6 @@
 # Copyright (c) 2024 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 
-# Basic Keyboard Setup
-
-# IDs can be overridden if vendor obtains a USB VID
-config USB_DEVICE_VID
-    default 0x1D50
-
-config USB_DEVICE_PID
-    default 0x615E
-
-config USB_DEVICE_MANUFACTURER
-    default "ZMK Project"
-
-config BT_DIS_PNP_VID
-    default 0x1D50
-
-config BT_DIS_PNP_PID
-    default 0x615E
-
-config BT_DIS_MANUF
-    default "ZMK Project"
-
 # HID
 if ZMK_HID_REPORT_TYPE_HKRO