summaryrefslogtreecommitdiff
path: root/keyboards/ducky
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-07-30 03:03:14 +0000
committerQMK Bot <hello@qmk.fm>2022-07-30 03:03:14 +0000
commit7e172fd944ab3ca0a386d5d8c54d9cad7d8e3479 (patch)
treeed673cd3820ddbfdce00ab2341898ad8d2cd3dfa /keyboards/ducky
parent07f007de9ad23363e4d97367af11c7eaf078432f (diff)
parent306e50b84cdf0aaac01838c4519209b642dee113 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/ducky')
-rw-r--r--keyboards/ducky/one2mini/1861st/config.h7
-rw-r--r--keyboards/ducky/one2mini/1861st/info.json8
-rw-r--r--keyboards/ducky/one2sf/1967st/config.h7
-rw-r--r--keyboards/ducky/one2sf/1967st/info.json8
4 files changed, 14 insertions, 16 deletions
diff --git a/keyboards/ducky/one2mini/1861st/config.h b/keyboards/ducky/one2mini/1861st/config.h
index 3f5676280c..f1fcb4faa1 100644
--- a/keyboards/ducky/one2mini/1861st/config.h
+++ b/keyboards/ducky/one2mini/1861st/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x0416
-#define PRODUCT_ID 0x0123
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Ducky
-#define PRODUCT One2mini
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 15
diff --git a/keyboards/ducky/one2mini/1861st/info.json b/keyboards/ducky/one2mini/1861st/info.json
index 9e121fbf4b..364d803718 100644
--- a/keyboards/ducky/one2mini/1861st/info.json
+++ b/keyboards/ducky/one2mini/1861st/info.json
@@ -1,5 +1,11 @@
{
- "keyboard_name": "Ducky One 2 Mini",
+ "keyboard_name": "One 2 Mini",
+ "manufacturer": "Ducky",
+ "usb": {
+ "vid": "0x0416",
+ "pid": "0x0123",
+ "device_version": "0.0.1"
+ },
"layout_aliases": {
"LAYOUT_iso": "LAYOUT_60_iso"
},
diff --git a/keyboards/ducky/one2sf/1967st/config.h b/keyboards/ducky/one2sf/1967st/config.h
index 3d4022accc..f5d1904d8a 100644
--- a/keyboards/ducky/one2sf/1967st/config.h
+++ b/keyboards/ducky/one2sf/1967st/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x445B
-#define PRODUCT_ID 0x07AF
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Ducky
-#define PRODUCT One2sf
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 16
diff --git a/keyboards/ducky/one2sf/1967st/info.json b/keyboards/ducky/one2sf/1967st/info.json
index 1ba894e65b..5361dbd4a0 100644
--- a/keyboards/ducky/one2sf/1967st/info.json
+++ b/keyboards/ducky/one2sf/1967st/info.json
@@ -1,6 +1,12 @@
{
- "keyboard_name": "Ducky One 2 SF (DKON1967ST)",
+ "keyboard_name": "One 2 SF",
+ "manufacturer": "Ducky",
"maintainer": "f7urry",
+ "usb": {
+ "vid": "0x445B",
+ "pid": "0x07AF",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_all": {
"layout": [