diff options
author | QMK Bot <[email protected]> | 2022-08-03 07:16:28 +0000 |
---|---|---|
committer | QMK Bot <[email protected]> | 2022-08-03 07:16:28 +0000 |
commit | d4f9eb5225feb7f2aad01d252b33401e3a80b870 (patch) | |
tree | f3b1f76a8d715e7c4f63d18f9fc3ae65141eb1fb /keyboards/mechlovin/olly | |
parent | bce4fb45748bacc8cb21cb61687d9bfd9faa4494 (diff) | |
parent | 3da6575e2480d46399be01c21270c57420e0f16d (diff) | |
download | qmk_firmware-d4f9eb5225feb7f2aad01d252b33401e3a80b870.tar.gz qmk_firmware-d4f9eb5225feb7f2aad01d252b33401e3a80b870.zip |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/mechlovin/olly')
-rw-r--r-- | keyboards/mechlovin/olly/bb/config.h | 7 | ||||
-rw-r--r-- | keyboards/mechlovin/olly/bb/info.json | 8 | ||||
-rw-r--r-- | keyboards/mechlovin/olly/jf/config.h | 7 | ||||
-rw-r--r-- | keyboards/mechlovin/olly/jf/info.json | 8 |
4 files changed, 14 insertions, 16 deletions
diff --git a/keyboards/mechlovin/olly/bb/config.h b/keyboards/mechlovin/olly/bb/config.h index 3110a9589c..52b1e77f6a 100644 --- a/keyboards/mechlovin/olly/bb/config.h +++ b/keyboards/mechlovin/olly/bb/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 0x4D4C -#define PRODUCT_ID 0xD181 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Mechlovin.Studio -#define PRODUCT Olly BB - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 19 diff --git a/keyboards/mechlovin/olly/bb/info.json b/keyboards/mechlovin/olly/bb/info.json index fbc9bae3eb..c37f167bdb 100644 --- a/keyboards/mechlovin/olly/bb/info.json +++ b/keyboards/mechlovin/olly/bb/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Mechlovin Olly", + "keyboard_name": "Olly BB", + "manufacturer": "Mechlovin.Studio", "url": "", "maintainer": "Mechlovin' Studio", + "usb": { + "vid": "0x4D4C", + "pid": "0xD181", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/olly/jf/config.h b/keyboards/mechlovin/olly/jf/config.h index f1c40cb365..d9d839b3b8 100644 --- a/keyboards/mechlovin/olly/jf/config.h +++ b/keyboards/mechlovin/olly/jf/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 0x4D4C -#define PRODUCT_ID 0xD180 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Mechlovin.Studio -#define PRODUCT Olly JF - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 19 diff --git a/keyboards/mechlovin/olly/jf/info.json b/keyboards/mechlovin/olly/jf/info.json index ab57d31787..96ea429cb9 100644 --- a/keyboards/mechlovin/olly/jf/info.json +++ b/keyboards/mechlovin/olly/jf/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Mechlovin Olly", + "keyboard_name": "Olly JF", + "manufacturer": "Mechlovin.Studio", "url": "", "maintainer": "Mechlovin' Studio", + "usb": { + "vid": "0x4D4C", + "pid": "0xD180", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ |