diff options
author | Ryan <fauxpark@gmail.com> | 2022-08-20 10:45:28 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-20 01:45:28 +0100 |
commit | f4dcce7e5975276ef41d882a15e6a459b6b3689d (patch) | |
tree | 6c095afb488454a352a7d4cc9a23ecb1d44f6ecd /keyboards/mechlovin | |
parent | 201a914beb7a07d8e08b1cbfa8dd35a768f6ae3a (diff) |
Move keyboard USB IDs and strings to data driven, pass 2: M-O (#18090)
Diffstat (limited to 'keyboards/mechlovin')
64 files changed, 181 insertions, 195 deletions
diff --git a/keyboards/mechlovin/adelais/config.h b/keyboards/mechlovin/adelais/config.h index 035ffa8032..08df109685 100644 --- a/keyboards/mechlovin/adelais/config.h +++ b/keyboards/mechlovin/adelais/config.h @@ -19,11 +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 // "ML" -#define DEVICE_VER 0x0001 -#define MANUFACTURER Team.Mechlovin - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15
\ No newline at end of file diff --git a/keyboards/mechlovin/adelais/info.json b/keyboards/mechlovin/adelais/info.json index 7a858277e7..a583373c13 100644 --- a/keyboards/mechlovin/adelais/info.json +++ b/keyboards/mechlovin/adelais/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "Adelais", + "manufacturer": "Team.Mechlovin", "url": "", "maintainer": "mechlovin", + "usb": { + "vid": "0x4D4C", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_alice_split_bs" }, diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h index c0cae1600b..ab38809514 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h +++ b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h @@ -1,8 +1,5 @@ #pragma once -#define PRODUCT_ID 0xAEC1 -#define PRODUCT Adelais En Ciel - #define MATRIX_ROW_PINS { B1, A0, C13, A1, A2} #define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A15 } #define UNUSED_PINS diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json new file mode 100644 index 0000000000..92ee67be74 --- /dev/null +++ b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Adelais En Ciel", + "usb": { + "pid": "0xAEC1" + } +} diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h index cd290cdcd1..dbeb73cda2 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h +++ b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h @@ -1,8 +1,5 @@ #pragma once -#define PRODUCT_ID 0xAEC2 -#define PRODUCT Adelais En Ciel Rev2 - #define MATRIX_ROW_PINS { B1, A0, C13, A1, A2} #define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A7 } diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json new file mode 100644 index 0000000000..8af90a2c55 --- /dev/null +++ b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Adelais En Ciel Rev2", + "usb": { + "pid": "0xAEC2" + } +} diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h index 6efac57ee2..e16d5f2ce5 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h +++ b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h @@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define PRODUCT_ID 0xAEC3 -#define PRODUCT Adelais En Ciel Rev3 - #define MATRIX_ROW_PINS { A4, A3, C13, A1, A2} #define MATRIX_COL_PINS { B10, B11, B2, B1, B0, A6, A5, A10, A9, A15, B3, B4, B5, B8, B9 } diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json new file mode 100644 index 0000000000..2f963ec895 --- /dev/null +++ b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Adelais En Ciel Rev3", + "usb": { + "pid": "0xAEC3" + } +} diff --git a/keyboards/mechlovin/adelais/standard_led/arm/config.h b/keyboards/mechlovin/adelais/standard_led/arm/config.h index 4377405fc6..22b7999c06 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/config.h +++ b/keyboards/mechlovin/adelais/standard_led/arm/config.h @@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define PRODUCT Adelais - #define MATRIX_ROW_PINS { B1, A0, C13, A1, A2} #define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A15 } #define UNUSED_PINS diff --git a/keyboards/mechlovin/adelais/standard_led/arm/info.json b/keyboards/mechlovin/adelais/standard_led/arm/info.json new file mode 100644 index 0000000000..68e7b3d144 --- /dev/null +++ b/keyboards/mechlovin/adelais/standard_led/arm/info.json @@ -0,0 +1,3 @@ +{ + "keyboard_name": "Adelais" +} diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev2/config.h b/keyboards/mechlovin/adelais/standard_led/arm/rev2/config.h deleted file mode 100644 index 7c2c63ea21..0000000000 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev2/config.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#define PRODUCT_ID 0xAD01
\ No newline at end of file diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json new file mode 100644 index 0000000000..ce04dbb068 --- /dev/null +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0xAD01" + } +} diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev3/config.h b/keyboards/mechlovin/adelais/standard_led/arm/rev3/config.h index 4d56fedf05..69af2941a6 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev3/config.h +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev3/config.h @@ -1,7 +1,5 @@ #pragma once -#define PRODUCT_ID 0xAD02 - #define ENCODERS_PAD_A { A6, A4, B7 } #define ENCODERS_PAD_B { A5, A3, B6 } #define ENCODER_RESOLUTION 4 diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json new file mode 100644 index 0000000000..f3b66e9eb2 --- /dev/null +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0xAD02" + } +} diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/config.h b/keyboards/mechlovin/adelais/standard_led/arm/rev4/config.h index ca793f1fec..70fa00220b 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/config.h +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/config.h @@ -16,8 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -#define PRODUCT_ID 0xAD03 - #define ENCODERS_PAD_A { A6, A4, B7 } #define ENCODERS_PAD_B { A5, A3, B6 } #define ENCODER_RESOLUTION 4 diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json new file mode 100644 index 0000000000..f4c096143b --- /dev/null +++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0xAD03" + } +} diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h b/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h index 9093d262e4..fecdf4d110 100644 --- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h +++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h @@ -16,8 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -#define PRODUCT_ID 0xAD04 -#define PRODUCT Adelais AVR /* * Keyboard Matrix Assignments * diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json new file mode 100644 index 0000000000..d827607b81 --- /dev/null +++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Adelais AVR", + "usb": { + "pid": "0xAD04" + } +} diff --git a/keyboards/mechlovin/delphine/config.h b/keyboards/mechlovin/delphine/config.h index a642f37f9b..7d50bb4615 100644 --- a/keyboards/mechlovin/delphine/config.h +++ b/keyboards/mechlovin/delphine/config.h @@ -19,11 +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 MANUFACTURER Mechlovin -#define PRODUCT Mechlovin Delphine - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 4 diff --git a/keyboards/mechlovin/delphine/info.json b/keyboards/mechlovin/delphine/info.json index 38ae0a3beb..a3fe9fb200 100644 --- a/keyboards/mechlovin/delphine/info.json +++ b/keyboards/mechlovin/delphine/info.json @@ -1,7 +1,11 @@ { "keyboard_name": "Delphine", + "manufacturer": "Mechlovin", "url": "", "maintainer": "mechlovin", + "usb": { + "vid": "0x4D4C" + }, "layouts": { "LAYOUT_ortho_6x4": { "layout": [ diff --git a/keyboards/mechlovin/delphine/mono_led/config.h b/keyboards/mechlovin/delphine/mono_led/config.h index ead627937c..36923bb968 100644 --- a/keyboards/mechlovin/delphine/mono_led/config.h +++ b/keyboards/mechlovin/delphine/mono_led/config.h @@ -1,10 +1,6 @@ #pragma once -#define PRODUCT_ID 0xDEF1 -#define DEVICE_VER 0x0001 - - #ifdef BACKLIGHT_ENABLE #define BACKLIGHT_PIN B6 // #define BACKLIGHT_BREATHING diff --git a/keyboards/mechlovin/delphine/mono_led/info.json b/keyboards/mechlovin/delphine/mono_led/info.json new file mode 100644 index 0000000000..2665906b80 --- /dev/null +++ b/keyboards/mechlovin/delphine/mono_led/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0xDEF1", + "device_version": "0.0.1" + } +} diff --git a/keyboards/mechlovin/delphine/rgb_led/config.h b/keyboards/mechlovin/delphine/rgb_led/config.h index 0ed8721d23..0d5bfb57f9 100644 --- a/keyboards/mechlovin/delphine/rgb_led/config.h +++ b/keyboards/mechlovin/delphine/rgb_led/config.h @@ -1,8 +1,5 @@ #pragma once -#define PRODUCT_ID 0xDEF2 -#define DEVICE_VER 0x0001 - #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN E2 #define RGBLED_NUM 13 diff --git a/keyboards/mechlovin/delphine/rgb_led/info.json b/keyboards/mechlovin/delphine/rgb_led/info.json new file mode 100644 index 0000000000..0a8f1ab220 --- /dev/null +++ b/keyboards/mechlovin/delphine/rgb_led/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0xDEF2", + "device_version": "0.0.1" + } +} diff --git a/keyboards/mechlovin/foundation/config.h b/keyboards/mechlovin/foundation/config.h index e1e97ca873..35145c440b 100644 --- a/keyboards/mechlovin/foundation/config.h +++ b/keyboards/mechlovin/foundation/config.h @@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D4C -#define PRODUCT_ID 0x0180 -#define DEVICE_VER 0x0002 -#define MANUFACTURER Mechlovin Studio -#define PRODUCT Foundation FRL #define MATRIX_ROW_PINS { B12, B13, B14, A8, A2 } #define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A15, B9, B8, B7, B6, B5, B4, B3} diff --git a/keyboards/mechlovin/foundation/info.json b/keyboards/mechlovin/foundation/info.json index 03b6cf6ff2..aa4148a40a 100644 --- a/keyboards/mechlovin/foundation/info.json +++ b/keyboards/mechlovin/foundation/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Foundation", + "keyboard_name": "Foundation FRL", + "manufacturer": "Mechlovin Studio", "url": "", "maintainer": "Protozoa", + "usb": { + "vid": "0x4D4C", + "pid": "0x0180", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_all": { "layout": [{"label":"0,0", "x":0.5, "y":0}, {"label":"0,1", "x":2.25, "y":0}, {"label":"0,2", "x":3.25, "y":0}, {"label":"0,3", "x":4.25, "y":0}, {"label":"0,4", "x":5.25, "y":0}, {"label":"0,5", "x":6.25, "y":0}, {"label":"0,6", "x":7.25, "y":0}, {"label":"0,7", "x":8.25, "y":0}, {"label":"0,8", "x":9.25, "y":0}, {"label":"0,9", "x":10.25, "y":0}, {"label":"0,10", "x":11.25, "y":0}, {"label":"0,11", "x":12.25, "y":0}, {"label":"0,12", "x":13.25, "y":0}, {"label":"0,13", "x":14.25, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"2,15", "x":16.25, "y":0}, {"label":"0,15", "x":17.5, "y":0}, {"label":"0,16", "x":18.5, "y":0}, {"label":"0,17", "x":19.5, "y":0}, {"label":"1,0", "x":0.5, "y":1}, {"label":"1,1", "x":2.25, "y":1, "w":1.5}, {"label":"1,2", "x":3.75, "y":1}, {"label":"1,3", "x":4.75, "y":1}, {"label":"1,4", "x":5.75, "y":1}, {"label":"1,5", "x":6.75, "y":1}, {"label":"1,6", "x":7.75, "y":1}, {"label":"1,7", "x":8.75, "y":1}, {"label":"1,8", "x":9.75, "y":1}, {"label":"1,9", "x":10.75, "y":1}, {"label":"1,10", "x":11.75, "y":1}, {"label":"1,11", "x":12.75, "y":1}, {"label":"1,12", "x":13.75, "y":1}, {"label":"1,13", "x":14.75, "y":1}, {"label":"1,14", "x":15.75, "y":1, "w":1.5}, {"label":"1,15", "x":17.5, "y":1}, {"label":"1,16", "x":18.5, "y":1}, {"label":"1,17", "x":19.5, "y":1}, {"label":"2,0", "x":0.5, "y":2}, {"label":"2,1", "x":2.25, "y":2, "w":1.75}, {"label":"2,2", "x":4, "y":2}, {"label":"2,3", "x":5, "y":2}, {"label":"2,4", "x":6, "y":2}, {"label":"2,5", "x":7, "y":2}, {"label":"2,6", "x":8, "y":2}, {"label":"2,7", "x":9, "y":2}, {"label":"2,8", "x":10, "y":2}, {"label":"2,9", "x":11, "y":2}, {"label":"2,10", "x":12, "y":2}, {"label":"2,11", "x":13, "y":2}, {"label":"2,12", "x":14, "y":2}, {"label":"2,13", "x":15, "y":2}, {"label":"2,14", "x":16, "y":2, "w":1.25}, {"label":"3,0", "x":0.5, "y":3}, {"label":"3,1", "x":2.25, "y":3, "w":1.25}, {"label":"3,2", "x":3.5, "y":3}, {"label":"3,3", "x":4.5, "y":3}, {"label":"3,4", "x":5.5, "y":3}, {"label":"3,5", "x":6.5, "y":3}, {"label":"3,6", "x":7.5, "y":3}, {"label":"3,7", "x":8.5, "y":3}, {"label":"3,8", "x":9.5, "y":3}, {"label":"3,9", "x":10.5, "y":3}, {"label":"3,10", "x":11.5, "y":3}, {"label":"3,11", "x":12.5, "y":3}, {"label":"3,12", "x":13.5, "y":3}, {"label":"3,13", "x":14.5, "y":3, "w":1.75}, {"label":"3,14", "x":16.25, "y":3}, {"label":"3,16", "x":18.5, "y":3}, {"label":"4,0", "x":0.5, "y":4}, {"label":"4,1", "x":2.25, "y":4, "w":1.25}, {"label":"4,2", "x":3.5, "y":4, "w":1.25}, {"label":"4,3", "x":4.75, "y":4, "w":1.25}, {"label":"4,7", "x":6, "y":4, "w":6.25}, {"label":"4,11", "x":12.25, "y":4, "w":1.25}, {"label":"4,12", "x":13.5, "y":4, "w":1.25}, {"label":"4,13", "x":14.75, "y":4, "w":1.25}, {"label":"4,14", "x":16, "y":4, "w":1.25}, {"label":"4,15", "x":17.5, "y":4}, {"label":"4,16", "x":18.5, "y":4}, {"label":"4,17", "x":19.5, "y":4}] diff --git a/keyboards/mechlovin/hannah60rgb/config.h b/keyboards/mechlovin/hannah60rgb/config.h index 6acfa5d401..3a0aaa0eb9 100644 --- a/keyboards/mechlovin/hannah60rgb/config.h +++ b/keyboards/mechlovin/hannah60rgb/config.h @@ -19,10 +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 // ML-Mechlovin -#define MANUFACTURER Team.Mechlovin - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 14 diff --git a/keyboards/mechlovin/hannah60rgb/rev1/config.h b/keyboards/mechlovin/hannah60rgb/rev1/config.h index 0f0c923fd0..9a84e78588 100644 --- a/keyboards/mechlovin/hannah60rgb/rev1/config.h +++ b/keyboards/mechlovin/hannah60rgb/rev1/config.h @@ -1,9 +1,5 @@ #pragma once -#define PRODUCT_ID 0x6001 -#define DEVICE_VER 0x0001 -#define PRODUCT Hannah60 RGB - #define RGB_DI_PIN A15 #ifdef RGB_MATRIX_ENABLE # define DRIVER_LED_TOTAL 72 diff --git a/keyboards/mechlovin/hannah60rgb/rev1/info.json b/keyboards/mechlovin/hannah60rgb/rev1/info.json index 48c878edb1..1e30b49c01 100644 --- a/keyboards/mechlovin/hannah60rgb/rev1/info.json +++ b/keyboards/mechlovin/hannah60rgb/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "hannah60rgb rev1", + "keyboard_name": "Hannah60 RGB", + "manufacturer": "Team.Mechlovin", "url": "", "maintainer": "mechlovin", + "usb": { + "vid": "0x4D4C", + "pid": "0x6001", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/hannah60rgb/rev2/config.h b/keyboards/mechlovin/hannah60rgb/rev2/config.h index e96ca0002a..3a25680a20 100644 --- a/keyboards/mechlovin/hannah60rgb/rev2/config.h +++ b/keyboards/mechlovin/hannah60rgb/rev2/config.h @@ -1,9 +1,5 @@ #pragma once -#define PRODUCT_ID 0x6002 -#define DEVICE_VER 0x0001 -#define PRODUCT Hannah60 RGB Rev.2 - #ifdef RGBLIGHT_ENABLE # define RGB_DI_PIN A15 # define RGBLED_NUM 18 diff --git a/keyboards/mechlovin/hannah60rgb/rev2/info.json b/keyboards/mechlovin/hannah60rgb/rev2/info.json index 74490e03e3..4047982477 100644 --- a/keyboards/mechlovin/hannah60rgb/rev2/info.json +++ b/keyboards/mechlovin/hannah60rgb/rev2/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "hannah60rgb rev2", + "keyboard_name": "Hannah60 RGB Rev.2", + "manufacturer": "Team.Mechlovin", "url": "", "maintainer": "mechlovin", + "usb": { + "vid": "0x4D4C", + "pid": "0x6002", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/hannah65/config.h b/keyboards/mechlovin/hannah65/config.h index f0aa801396..c43d228cf4 100644 --- a/keyboards/mechlovin/hannah65/config.h +++ b/keyboards/mechlovin/hannah65/config.h @@ -19,10 +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 MANUFACTURER Team Mechlovin - #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/mechlovin/hannah65/rev1/haus/config.h b/keyboards/mechlovin/hannah65/rev1/haus/config.h deleted file mode 100644 index 204bf356e7..0000000000 --- a/keyboards/mechlovin/hannah65/rev1/haus/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2021 Mechlovin' Studio - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#pragma once - -#define PRODUCT_ID 0x6500 -#define DEVICE_VER 0x0001 -#define PRODUCT Haus Rev. 1
\ No newline at end of file diff --git a/keyboards/mechlovin/hannah65/rev1/info.json b/keyboards/mechlovin/hannah65/rev1/haus/info.json index 329c4040c8..55ddde0a58 100644 --- a/keyboards/mechlovin/hannah65/rev1/info.json +++ b/keyboards/mechlovin/hannah65/rev1/haus/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "hannah65-rev1", + "keyboard_name": "Haus Rev. 1", + "manufacturer": "Team Mechlovin", "url": "", "maintainer": "Team Mechlovin", + "usb": { + "vid": "0x4D4C", + "pid": "0x6500", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/hannah910/config.h b/keyboards/mechlovin/hannah910/config.h index cc2ac81bc5..f42451577b 100644 --- a/keyboards/mechlovin/hannah910/config.h +++ b/keyboards/mechlovin/hannah910/config.h @@ -19,11 +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 // ML-MechLovin' -#define MANUFACTURER Mechlovin -#define PRODUCT Mechlovin Hannah910 - /* key matrix size */ #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/mechlovin/hannah910/rev1/config.h b/keyboards/mechlovin/hannah910/rev1/config.h index 906e0c8846..7b793c75b9 100644 --- a/keyboards/mechlovin/hannah910/rev1/config.h +++ b/keyboards/mechlovin/hannah910/rev1/config.h @@ -1,6 +1,3 @@ #pragma once -#define PRODUCT_ID 0x9101 -#define DEVICE_VER 0x0001 - #define RGBLED_NUM 9
\ No newline at end of file diff --git a/keyboards/mechlovin/hannah910/rev1/info.json b/keyboards/mechlovin/hannah910/rev1/info.json index 1f130c6992..bbfdddf1ad 100644 --- a/keyboards/mechlovin/hannah910/rev1/info.json +++ b/keyboards/mechlovin/hannah910/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Hannah910", + "manufacturer": "Mechlovin", "url": "", "maintainer": "Mechlovin'", + "usb": { + "vid": "0x4D4C", + "pid": "0x9101", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Back", "x":13, "y":0}, {"label":"Delete", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"INS", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"HOME", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"Shift", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Up", "x":14, "y":3}, {"label":"END", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"label":"Space", "x":3.75, "y":4, "w":2.75}, {"label":"Space", "x":6.5, "y":4, "w":1.25}, {"label":"Space", "x":7.75, "y":4, "w":2.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Left", "x":13, "y":4}, {"label":"Down", "x":14, "y":4}, {"label":"Right", "x":15, "y":4}] diff --git a/keyboards/mechlovin/hannah910/rev2/config.h b/keyboards/mechlovin/hannah910/rev2/config.h index 3ae3cb65bc..c37c581ae6 100644 --- a/keyboards/mechlovin/hannah910/rev2/config.h +++ b/keyboards/mechlovin/hannah910/rev2/config.h @@ -1,6 +1,3 @@ #pragma once -#define PRODUCT_ID 0x9102 -#define DEVICE_VER 0x0002 - #define RGBLED_NUM 28
\ No newline at end of file diff --git a/keyboards/mechlovin/hannah910/rev2/info.json b/keyboards/mechlovin/hannah910/rev2/info.json index c2e5dd1a3e..d0eb8b208f 100644 --- a/keyboards/mechlovin/hannah910/rev2/info.json +++ b/keyboards/mechlovin/hannah910/rev2/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Hannah910 Rev.2", + "keyboard_name": "Hannah910", + "manufacturer": "Mechlovin", "url": "", "maintainer": "Team Mechlovin'", + "usb": { + "vid": "0x4D4C", + "pid": "0x9102", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/hannah910/rev3/config.h b/keyboards/mechlovin/hannah910/rev3/config.h index 5e377f4d79..fbb878ab6a 100644 --- a/keyboards/mechlovin/hannah910/rev3/config.h +++ b/keyboards/mechlovin/hannah910/rev3/config.h @@ -1,6 +1,3 @@ #pragma once -#define PRODUCT_ID 0x9103 -#define DEVICE_VER 0x0002 - #define RGBLED_NUM 28 diff --git a/keyboards/mechlovin/hannah910/rev3/info.json b/keyboards/mechlovin/hannah910/rev3/info.json index bb762dd589..44c797323b 100644 --- a/keyboards/mechlovin/hannah910/rev3/info.json +++ b/keyboards/mechlovin/hannah910/rev3/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "hannah910-rev3", + "keyboard_name": "Hannah910", + "manufacturer": "Mechlovin", "url": "", "maintainer": "Team Mechlovin'", + "usb": { + "vid": "0x4D4C", + "pid": "0x9103", + "device_version": "0.0.2" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/hex4b/config.h b/keyboards/mechlovin/hex4b/config.h index c8176d76b5..4126b720b7 100644 --- a/keyboards/mechlovin/hex4b/config.h +++ b/keyboards/mechlovin/hex4b/config.h @@ -19,11 +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 0x0675 //Hex-75 -#define MANUFACTURER Mechlovin Studio - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 15 diff --git a/keyboards/mechlovin/hex4b/info.json b/keyboards/mechlovin/hex4b/info.json index 686d79cc0e..2edd39b3e2 100644 --- a/keyboards/mechlovin/hex4b/info.json +++ b/keyboards/mechlovin/hex4b/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "Hex4B", + "manufacturer": "Mechlovin Studio", "url": "", "maintainer": "Hex-Keyboard&Mechlovin", + "usb": { + "vid": "0x4D4C", + "pid": "0x0675" + }, "layout_aliases": { "LAYOUT": "LAYOUT_split_bs", "LAYOUT_all": "LAYOUT_split_bs" diff --git a/keyboards/mechlovin/hex4b/rev1/config.h b/keyboards/mechlovin/hex4b/rev1/config.h index 014209cefd..7dcdb6b3a4 100644 --- a/keyboards/mechlovin/hex4b/rev1/config.h +++ b/keyboards/mechlovin/hex4b/rev1/config.h @@ -19,10 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0001 -#define PRODUCT Hex-4B Rev.1 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/mechlovin/hex4b/rev1/info.json b/keyboards/mechlovin/hex4b/rev1/info.json new file mode 100644 index 0000000000..b2dfdec696 --- /dev/null +++ b/keyboards/mechlovin/hex4b/rev1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Hex-4B Rev.1", + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/mechlovin/hex4b/rev2/config.h b/keyboards/mechlovin/hex4b/rev2/config.h index af956f3ec0..70207ed481 100644 --- a/keyboards/mechlovin/hex4b/rev2/config.h +++ b/keyboards/mechlovin/hex4b/rev2/config.h @@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "config_common.h" -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0002 -#define PRODUCT Hex-4B Rev.2 - - - /* * Keyboard Matrix Assignments * diff --git a/keyboards/mechlovin/hex4b/rev2/info.json b/keyboards/mechlovin/hex4b/rev2/info.json new file mode 100644 index 0000000000..da18a2ce4b --- /dev/null +++ b/keyboards/mechlovin/hex4b/rev2/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Hex-4B Rev.2", + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/mechlovin/infinity87/config.h b/keyboards/mechlovin/infinity87/config.h index a344c98b8f..6692b78292 100644 --- a/keyboards/mechlovin/infinity87/config.h +++ b/keyboards/mechlovin/infinity87/config.h @@ -18,11 +18,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x4D4C // ML - -#define MANUFACTURER Mechlovin.Studio - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/config.h b/keyboards/mechlovin/infinity87/rev1/rogue87/config.h deleted file mode 100644 index 3415f3add9..0000000000 --- a/keyboards/mechlovin/infinity87/rev1/rogue87/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2020 Team Mechlovin' - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#define PRODUCT_ID 0x8704 -#define DEVICE_VER 0x0001 -#define PRODUCT Rogue87 Rev.1
\ No newline at end of file diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/info.json b/keyboards/mechlovin/infinity87/rev1/rogue87/info.json index 3ffa181666..b9906b410b 100644 --- a/keyboards/mechlovin/infinity87/rev1/rogue87/info.json +++ b/keyboards/mechlovin/infinity87/rev1/rogue87/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Rogue87", + "keyboard_name": "Rogue87 Rev.1", + "manufacturer": "Mechlovin.Studio", "url": "", "maintainer": "Mechlovin' Studio", + "usb": { + "vid": "0x4D4C", + "pid": "0x8704", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/config.h b/keyboards/mechlovin/infinity87/rev1/rouge87/config.h deleted file mode 100644 index 786da387bc..0000000000 --- a/keyboards/mechlovin/infinity87/rev1/rouge87/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2020 Team Mechlovin' - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#define PRODUCT_ID 0x8703 -#define DEVICE_VER 0x0001 -#define PRODUCT Rouge87 Rev.1 diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/info.json b/keyboards/mechlovin/infinity87/rev1/rouge87/info.json index 8faaa83fd1..2957247ad4 100644 --- a/keyboards/mechlovin/infinity87/rev1/rouge87/info.json +++ b/keyboards/mechlovin/infinity87/rev1/rouge87/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Rouge87", + "keyboard_name": "Rouge87 Rev.1", + "manufacturer": "Mechlovin.Studio", "url": "", "maintainer": "Mechlovin' Studio", + "usb": { + "vid": "0x4D4C", + "pid": "0x8703", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/infinity87/rev1/standard/config.h b/keyboards/mechlovin/infinity87/rev1/standard/config.h index b3ae5a7717..c7e4f601e1 100644 --- a/keyboards/mechlovin/infinity87/rev1/standard/config.h +++ b/keyboards/mechlovin/infinity87/rev1/standard/config.h @@ -16,10 +16,6 @@ #pragma once -#define PRODUCT_ID 0x8701 -#define DEVICE_VER 0x0001 -#define PRODUCT Infinity 87 rev1 - #define RGB_DI_PIN A15 #define RGBLED_NUM 26 #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ diff --git a/keyboards/mechlovin/infinity87/rev1/standard/info.json b/keyboards/mechlovin/infinity87/rev1/standard/info.json index da67c40c39..e19d4dbe7d 100644 --- a/keyboards/mechlovin/infinity87/rev1/standard/info.json +++ b/keyboards/mechlovin/infinity87/rev1/standard/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "infinity87", + "keyboard_name": "infinity87 Rev.1", + "manufacturer": "Mechlovin.Studio", "url": "", "maintainer": "Team Mechlovin'", + "usb": { + "vid": "0x4D4C", + "pid": "0x8701", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/infinity87/rev2/config.h b/keyboards/mechlovin/infinity87/rev2/config.h index 575e826a9b..412816a0d4 100644 --- a/keyboards/mechlovin/infinity87/rev2/config.h +++ b/keyboards/mechlovin/infinity87/rev2/config.h @@ -16,10 +16,6 @@ #pragma once -#define PRODUCT_ID 0x8702 -#define DEVICE_VER 0x0001 -#define PRODUCT Infinity87 rev.2 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/mechlovin/infinity87/rev2/info.json b/keyboards/mechlovin/infinity87/rev2/info.json index fa6073912c..609f6b1700 100644 --- a/keyboards/mechlovin/infinity87/rev2/info.json +++ b/keyboards/mechlovin/infinity87/rev2/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "infinity87 Rev.2", + "keyboard_name": "Infinity87 Rev.2", + "manufacturer": "Mechlovin.Studio", "url": "", "maintainer": "Mechlovin' Studio", + "usb": { + "vid": "0x4D4C", + "pid": "0x8702", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/config.h b/keyboards/mechlovin/infinity87/rgb_rev1/config.h index 5b1a68308b..3c2ffd4b9f 100644 --- a/keyboards/mechlovin/infinity87/rgb_rev1/config.h +++ b/keyboards/mechlovin/infinity87/rgb_rev1/config.h @@ -16,10 +16,6 @@ #pragma once -#define PRODUCT_ID 0x8710 -#define DEVICE_VER 0x0001 -#define PRODUCT Infinity 87 RGB rev1 - #define MATRIX_ROW_PINS { A10, A13, A14, C13, A4, A3 } #define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A9, B11, B10, B2, B1, B0, A7, A6, A5, A2, A1, A0 } diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/info.json b/keyboards/mechlovin/infinity87/rgb_rev1/info.json index da67c40c39..0589e3f712 100644 --- a/keyboards/mechlovin/infinity87/rgb_rev1/info.json +++ b/keyboards/mechlovin/infinity87/rgb_rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "infinity87", + "keyboard_name": "Infinity87 RGB Rev1", + "manufacturer": "Mechlovin.Studio", "url": "", "maintainer": "Team Mechlovin'", + "usb": { + "vid": "0x4D4C", + "pid": "0x8710", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/mechlovin9/config.h b/keyboards/mechlovin/mechlovin9/config.h index 669d79ac91..6795046f8b 100644 --- a/keyboards/mechlovin/mechlovin9/config.h +++ b/keyboards/mechlovin/mechlovin9/config.h @@ -19,10 +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 MANUFACTURER Mechlovin Studio - #define MATRIX_ROWS 5 #define MATRIX_COLS 15 diff --git a/keyboards/mechlovin/mechlovin9/info.json b/keyboards/mechlovin/mechlovin9/info.json index 6fea78aecc..c0a64b984a 100644 --- a/keyboards/mechlovin/mechlovin9/info.json +++ b/keyboards/mechlovin/mechlovin9/info.json @@ -1,7 +1,10 @@ { - "keyboard_name": "mechlovin9", + "manufacturer": "Mechlovin Studio", "url": "", "maintainer": "Team Mechlovin", + "usb": { + "vid": "0x4D4C" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/mechlovin9/rev1/config.h b/keyboards/mechlovin/mechlovin9/rev1/config.h index 2a9c335d73..236529e243 100644 --- a/keyboards/mechlovin/mechlovin9/rev1/config.h +++ b/keyboards/mechlovin/mechlovin9/rev1/config.h @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define PRODUCT_ID 0x6509 -#define DEVICE_VER 0x0001 -#define PRODUCT Mechlovin9 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/mechlovin/mechlovin9/rev1/info.json b/keyboards/mechlovin/mechlovin9/rev1/info.json new file mode 100644 index 0000000000..2153f0ad17 --- /dev/null +++ b/keyboards/mechlovin/mechlovin9/rev1/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Mechlovin9", + "usb": { + "pid": "0x6509", + "device_version": "0.0.1" + } +} diff --git a/keyboards/mechlovin/mechlovin9/rev2/config.h b/keyboards/mechlovin/mechlovin9/rev2/config.h index ed11fafa83..c06295dfde 100644 --- a/keyboards/mechlovin/mechlovin9/rev2/config.h +++ b/keyboards/mechlovin/mechlovin9/rev2/config.h @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define PRODUCT_ID 0x6509 -#define DEVICE_VER 0x0002 -#define PRODUCT Mechlovin9 Rev2 - /* * Keyboard Matrix Assignments * diff --git a/keyboards/mechlovin/mechlovin9/rev2/info.json b/keyboards/mechlovin/mechlovin9/rev2/info.json new file mode 100644 index 0000000000..2c92773e6d --- /dev/null +++ b/keyboards/mechlovin/mechlovin9/rev2/info.json @@ -0,0 +1,7 @@ +{ + "keyboard_name": "Mechlovin9 Rev2", + "usb": { + "pid": "0x6509", + "device_version": "0.0.2" + } +} |