diff options
author | QMK Bot <[email protected]> | 2022-08-06 05:50:30 +0000 |
---|---|---|
committer | QMK Bot <[email protected]> | 2022-08-06 05:50:30 +0000 |
commit | ec5186f0f9e2d1910331785f1410be5892058ee4 (patch) | |
tree | 3647aa4ca4bc826ec24fa1baf4e4a9e7cd79ccf5 /keyboards/weirdo | |
parent | 7bbc1b21dd97d0d1577b5ed288adc48475512497 (diff) | |
parent | 10ad2389442c00c32714f6e9a6766e9e7bdec2c2 (diff) | |
download | qmk_firmware-ec5186f0f9e2d1910331785f1410be5892058ee4.tar.gz qmk_firmware-ec5186f0f9e2d1910331785f1410be5892058ee4.zip |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/weirdo')
-rw-r--r-- | keyboards/weirdo/geminate60/config.h | 8 | ||||
-rw-r--r-- | keyboards/weirdo/geminate60/info.json | 8 | ||||
-rw-r--r-- | keyboards/weirdo/kelowna/rgb64/config.h | 7 | ||||
-rw-r--r-- | keyboards/weirdo/kelowna/rgb64/info.json | 6 | ||||
-rw-r--r-- | keyboards/weirdo/ls_60/config.h | 8 | ||||
-rw-r--r-- | keyboards/weirdo/ls_60/info.json | 6 | ||||
-rw-r--r-- | keyboards/weirdo/naiping/np64/config.h | 8 | ||||
-rw-r--r-- | keyboards/weirdo/naiping/np64/info.json | 8 | ||||
-rw-r--r-- | keyboards/weirdo/naiping/nphhkb/config.h | 8 | ||||
-rw-r--r-- | keyboards/weirdo/naiping/nphhkb/info.json | 8 | ||||
-rw-r--r-- | keyboards/weirdo/naiping/npminila/config.h | 8 | ||||
-rw-r--r-- | keyboards/weirdo/naiping/npminila/info.json | 8 | ||||
-rw-r--r-- | keyboards/weirdo/tiger910/config.h | 7 | ||||
-rw-r--r-- | keyboards/weirdo/tiger910/info.json | 6 |
14 files changed, 46 insertions, 58 deletions
diff --git a/keyboards/weirdo/geminate60/config.h b/keyboards/weirdo/geminate60/config.h index 6e13da06de..16e5170168 100644 --- a/keyboards/weirdo/geminate60/config.h +++ b/keyboards/weirdo/geminate60/config.h @@ -16,14 +16,6 @@ #pragma once #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7764 -#define PRODUCT_ID 0x676D -#define DEVICE_VER 0x0001 -#define MANUFACTURER Weirdo -#define PRODUCT Geminate60 - - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/weirdo/geminate60/info.json b/keyboards/weirdo/geminate60/info.json index ba34264f62..fd7170b6c1 100644 --- a/keyboards/weirdo/geminate60/info.json +++ b/keyboards/weirdo/geminate60/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "geminate60", + "keyboard_name": "Geminate60", + "manufacturer": "Weirdo", "url": "", "maintainer": "Weirdo-F", + "usb": { + "vid": "0x7764", + "pid": "0x676D", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT": "LAYOUT_all" }, diff --git a/keyboards/weirdo/kelowna/rgb64/config.h b/keyboards/weirdo/kelowna/rgb64/config.h index 906755d88a..b6045bc7d6 100644 --- a/keyboards/weirdo/kelowna/rgb64/config.h +++ b/keyboards/weirdo/kelowna/rgb64/config.h @@ -16,13 +16,6 @@ #pragma once #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7764 -#define PRODUCT_ID 0x4C64 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Weirdo -#define PRODUCT kelownaRGB64 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/weirdo/kelowna/rgb64/info.json b/keyboards/weirdo/kelowna/rgb64/info.json index 8dbb01a410..3aedc2d7c9 100644 --- a/keyboards/weirdo/kelowna/rgb64/info.json +++ b/keyboards/weirdo/kelowna/rgb64/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "kelownaRGB64", + "manufacturer": "Weirdo", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x7764", + "pid": "0x4C64", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_64_ansi": { "layout": [ diff --git a/keyboards/weirdo/ls_60/config.h b/keyboards/weirdo/ls_60/config.h index e7151ac10f..640664dd4a 100644 --- a/keyboards/weirdo/ls_60/config.h +++ b/keyboards/weirdo/ls_60/config.h @@ -16,14 +16,6 @@ #pragma once #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7764 -#define PRODUCT_ID 0x4c53 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Weirdo -#define PRODUCT LS_60 - - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/weirdo/ls_60/info.json b/keyboards/weirdo/ls_60/info.json index 20cb544b98..5268567433 100644 --- a/keyboards/weirdo/ls_60/info.json +++ b/keyboards/weirdo/ls_60/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "LS_60", + "manufacturer": "Weirdo", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x7764", + "pid": "0x4C53", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/weirdo/naiping/np64/config.h b/keyboards/weirdo/naiping/np64/config.h index ee4bdb8675..2044a9546b 100644 --- a/keyboards/weirdo/naiping/np64/config.h +++ b/keyboards/weirdo/naiping/np64/config.h @@ -16,14 +16,6 @@ #pragma once #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7764 -#define PRODUCT_ID 0x7064 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Weirdo -#define PRODUCT NP64 - - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/weirdo/naiping/np64/info.json b/keyboards/weirdo/naiping/np64/info.json index 8bf71afe0c..83a9c07193 100644 --- a/keyboards/weirdo/naiping/np64/info.json +++ b/keyboards/weirdo/naiping/np64/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "np64", + "keyboard_name": "NP64", + "manufacturer": "Weirdo", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x7764", + "pid": "0x7064", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT": "LAYOUT_64_ansi" }, diff --git a/keyboards/weirdo/naiping/nphhkb/config.h b/keyboards/weirdo/naiping/nphhkb/config.h index 26993eeb7f..25b4534a9a 100644 --- a/keyboards/weirdo/naiping/nphhkb/config.h +++ b/keyboards/weirdo/naiping/nphhkb/config.h @@ -16,14 +16,6 @@ #pragma once #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7764 -#define PRODUCT_ID 0x7068 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Weirdo -#define PRODUCT NPhhkb - - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/weirdo/naiping/nphhkb/info.json b/keyboards/weirdo/naiping/nphhkb/info.json index 4975aa3a41..8b69fcabb4 100644 --- a/keyboards/weirdo/naiping/nphhkb/info.json +++ b/keyboards/weirdo/naiping/nphhkb/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "NP_hhkb", + "keyboard_name": "NPhhkb", + "manufacturer": "Weirdo", "url": "", "maintainer": "weirdo-f", + "usb": { + "vid": "0x7764", + "pid": "0x7068", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT": "LAYOUT_60_tsangan_hhkb" }, diff --git a/keyboards/weirdo/naiping/npminila/config.h b/keyboards/weirdo/naiping/npminila/config.h index f18b36d8e7..29a8d9d2f3 100644 --- a/keyboards/weirdo/naiping/npminila/config.h +++ b/keyboards/weirdo/naiping/npminila/config.h @@ -16,14 +16,6 @@ #pragma once #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x7764 -#define PRODUCT_ID 0x706D -#define DEVICE_VER 0x0001 -#define MANUFACTURER Weirdo -#define PRODUCT NPminila - - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/weirdo/naiping/npminila/info.json b/keyboards/weirdo/naiping/npminila/info.json index 4dbe3127d3..be15116ed7 100644 --- a/keyboards/weirdo/naiping/npminila/info.json +++ b/keyboards/weirdo/naiping/npminila/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "NP_minila", + "keyboard_name": "NPminila", + "manufacturer": "Weirdo", "url": "", "maintainer": "qmk", + "usb": { + "vid": "0x7764", + "pid": "0x706D", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/weirdo/tiger910/config.h b/keyboards/weirdo/tiger910/config.h index 4f2541739a..baac392a40 100644 --- a/keyboards/weirdo/tiger910/config.h +++ b/keyboards/weirdo/tiger910/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 0x7764 -#define PRODUCT_ID 0x5447 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Weirdo -#define PRODUCT tiger910 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 16 diff --git a/keyboards/weirdo/tiger910/info.json b/keyboards/weirdo/tiger910/info.json index 1c4e706e37..50edcced1a 100644 --- a/keyboards/weirdo/tiger910/info.json +++ b/keyboards/weirdo/tiger910/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "tiger910", + "manufacturer": "Weirdo", "url": "", "maintainer": "Weirdo", + "usb": { + "vid": "0x7764", + "pid": "0x5447", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ |