From f4dcce7e5975276ef41d882a15e6a459b6b3689d Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 20 Aug 2022 10:45:28 +1000 Subject: Move keyboard USB IDs and strings to data driven, pass 2: M-O (#18090) --- keyboards/mlego/m48/config.h | 5 ----- keyboards/mlego/m48/info.json | 6 +++++- keyboards/mlego/m48/rev1/config.h | 4 ---- keyboards/mlego/m48/rev1/info.json | 6 ++++++ keyboards/mlego/m60/config.h | 5 ----- keyboards/mlego/m60/info.json | 6 +++++- keyboards/mlego/m60/rev1/config.h | 4 ---- keyboards/mlego/m60/rev1/info.json | 6 ++++++ keyboards/mlego/m60_split/config.h | 5 ----- keyboards/mlego/m60_split/info.json | 6 +++++- keyboards/mlego/m60_split/rev1/config.h | 4 ---- keyboards/mlego/m60_split/rev1/info.json | 6 ++++++ keyboards/mlego/m60_split/rev2/config.h | 4 ---- keyboards/mlego/m60_split/rev2/info.json | 6 ++++++ keyboards/mlego/m65/config.h | 4 ---- keyboards/mlego/m65/info.json | 6 +++++- keyboards/mlego/m65/rev1/config.h | 3 --- keyboards/mlego/m65/rev1/info.json | 6 ++++++ keyboards/mlego/m65/rev2/config.h | 3 --- keyboards/mlego/m65/rev2/info.json | 6 ++++++ keyboards/mlego/m65/rev3/config.h | 3 --- keyboards/mlego/m65/rev3/info.json | 6 ++++++ keyboards/mlego/m65/rev4/config.h | 3 --- keyboards/mlego/m65/rev4/info.json | 6 ++++++ 24 files changed, 68 insertions(+), 51 deletions(-) create mode 100644 keyboards/mlego/m48/rev1/info.json create mode 100644 keyboards/mlego/m60/rev1/info.json create mode 100644 keyboards/mlego/m60_split/rev1/info.json create mode 100644 keyboards/mlego/m60_split/rev2/info.json create mode 100644 keyboards/mlego/m65/rev1/info.json create mode 100644 keyboards/mlego/m65/rev2/info.json create mode 100644 keyboards/mlego/m65/rev3/info.json create mode 100644 keyboards/mlego/m65/rev4/info.json (limited to 'keyboards/mlego') diff --git a/keyboards/mlego/m48/config.h b/keyboards/mlego/m48/config.h index 879108d238..29bc9f07e7 100644 --- a/keyboards/mlego/m48/config.h +++ b/keyboards/mlego/m48/config.h @@ -17,11 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xBABA -#define MANUFACTURER alin elena -#define PRODUCT m48 - #define MATRIX_ROWS 4 // Rows are doubled-up #define MATRIX_COLS 12 diff --git a/keyboards/mlego/m48/info.json b/keyboards/mlego/m48/info.json index d22cfc54fd..c67c06fb76 100644 --- a/keyboards/mlego/m48/info.json +++ b/keyboards/mlego/m48/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "mlego/m48", + "keyboard_name": "48", + "manufacturer": "alin elena", "url": "https://gitlab.com/m-lego/m48", "maintainer": "alin elena", + "usb": { + "vid": "0xBABA" + }, "layouts": { "LAYOUT_ortho_4x12": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}] diff --git a/keyboards/mlego/m48/rev1/config.h b/keyboards/mlego/m48/rev1/config.h index dcca34c95e..06aea015e9 100644 --- a/keyboards/mlego/m48/rev1/config.h +++ b/keyboards/mlego/m48/rev1/config.h @@ -17,10 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x6261 -#define DEVICE_VER 0x0001 - #define MATRIX_ROW_PINS \ { A6, A7, B0, B10 } #define MATRIX_COL_PINS \ diff --git a/keyboards/mlego/m48/rev1/info.json b/keyboards/mlego/m48/rev1/info.json new file mode 100644 index 0000000000..68c73096c4 --- /dev/null +++ b/keyboards/mlego/m48/rev1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x6261", + "device_version": "0.0.1" + } +} diff --git a/keyboards/mlego/m60/config.h b/keyboards/mlego/m60/config.h index abce0cb5f8..6cf70e5c41 100644 --- a/keyboards/mlego/m60/config.h +++ b/keyboards/mlego/m60/config.h @@ -17,11 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xBABA -#define MANUFACTURER alin elena -#define PRODUCT m60 - #define MATRIX_ROWS 5 #define MATRIX_COLS 12 diff --git a/keyboards/mlego/m60/info.json b/keyboards/mlego/m60/info.json index 12924b5ea6..fc1a46cc23 100644 --- a/keyboards/mlego/m60/info.json +++ b/keyboards/mlego/m60/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "mlego/m60", + "keyboard_name": "m60", + "manufacturer": "alin elena", "url": "https://gitlab.com/m-lego/m60", "maintainer": "alin elena", + "usb": { + "vid": "0xBABA" + }, "layouts": { "LAYOUT_ortho_5x12": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}] diff --git a/keyboards/mlego/m60/rev1/config.h b/keyboards/mlego/m60/rev1/config.h index 437e605149..47d10a7078 100644 --- a/keyboards/mlego/m60/rev1/config.h +++ b/keyboards/mlego/m60/rev1/config.h @@ -17,10 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x6161 -#define DEVICE_VER 0x0001 - #define LED_NUM_LOCK_PIN B12 #define LED_SCROLL_LOCK_PIN B13 #define LED_CAPS_LOCK_PIN C13 diff --git a/keyboards/mlego/m60/rev1/info.json b/keyboards/mlego/m60/rev1/info.json new file mode 100644 index 0000000000..865399a460 --- /dev/null +++ b/keyboards/mlego/m60/rev1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x6161", + "device_version": "0.0.1" + } +} diff --git a/keyboards/mlego/m60_split/config.h b/keyboards/mlego/m60_split/config.h index 7282886b0b..241ea77a22 100644 --- a/keyboards/mlego/m60_split/config.h +++ b/keyboards/mlego/m60_split/config.h @@ -17,11 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xBABA -#define MANUFACTURER alin elena -#define PRODUCT m60_split - #define MATRIX_ROWS 10 // Rows are doubled-up #define MATRIX_COLS 6 diff --git a/keyboards/mlego/m60_split/info.json b/keyboards/mlego/m60_split/info.json index c6c5ee480d..3212b0c613 100644 --- a/keyboards/mlego/m60_split/info.json +++ b/keyboards/mlego/m60_split/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "mlego/m60_split", + "keyboard_name": "m60_split", + "manufacturer": "alin elena", "url": "https://gitlab.com/m-lego/m65", "maintainer": "alin elena", + "usb": { + "vid": "0xBABA" + }, "layouts": { "LAYOUT_ortho_5x12": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}] diff --git a/keyboards/mlego/m60_split/rev1/config.h b/keyboards/mlego/m60_split/rev1/config.h index 0bbb56aee0..6798ee2377 100644 --- a/keyboards/mlego/m60_split/rev1/config.h +++ b/keyboards/mlego/m60_split/rev1/config.h @@ -17,10 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x6361 -#define DEVICE_VER 0x0001 - #define MATRIX_ROW_PINS \ { B0, A6, A7, B1, A5 } #define MATRIX_COL_PINS \ diff --git a/keyboards/mlego/m60_split/rev1/info.json b/keyboards/mlego/m60_split/rev1/info.json new file mode 100644 index 0000000000..90303c33c5 --- /dev/null +++ b/keyboards/mlego/m60_split/rev1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x6361", + "device_version": "0.0.1" + } +} diff --git a/keyboards/mlego/m60_split/rev2/config.h b/keyboards/mlego/m60_split/rev2/config.h index c5b011c437..ae3af649df 100644 --- a/keyboards/mlego/m60_split/rev2/config.h +++ b/keyboards/mlego/m60_split/rev2/config.h @@ -17,10 +17,6 @@ #include "config_common.h" -/* USB Device descriptor parameter */ -#define PRODUCT_ID 0x6362 -#define DEVICE_VER 0x0001 - #define MATRIX_ROW_PINS \ { B0, A6, A7, B1, A5 } #define MATRIX_COL_PINS \ diff --git a/keyboards/mlego/m60_split/rev2/info.json b/keyboards/mlego/m60_split/rev2/info.json new file mode 100644 index 0000000000..bee03f611f --- /dev/null +++ b/keyboards/mlego/m60_split/rev2/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x6362", + "device_version": "0.0.1" + } +} diff --git a/keyboards/mlego/m65/config.h b/keyboards/mlego/m65/config.h index 25d69d8b7a..7ac1f7271c 100644 --- a/keyboards/mlego/m65/config.h +++ b/keyboards/mlego/m65/config.h @@ -19,10 +19,6 @@ along with this program. If not, see . #include "config_common.h" -#define VENDOR_ID 0xBABA -#define MANUFACTURER Alin Elena -#define PRODUCT m65 - #define MATRIX_ROWS 5 #define MATRIX_COLS 13 diff --git a/keyboards/mlego/m65/info.json b/keyboards/mlego/m65/info.json index 175c6638c5..3c7d816d62 100644 --- a/keyboards/mlego/m65/info.json +++ b/keyboards/mlego/m65/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "M65", + "keyboard_name": "m65", + "manufacturer": "Alin Elena", "url": "https://gitlab.com/m-lego/m65", "maintainer": "alin elena", + "usb": { + "vid": "0xBABA" + }, "layouts": { "LAYOUT_ortho_5x13": { "layout": [ diff --git a/keyboards/mlego/m65/rev1/config.h b/keyboards/mlego/m65/rev1/config.h index 0e40ae2e3d..2d55ed86a0 100644 --- a/keyboards/mlego/m65/rev1/config.h +++ b/keyboards/mlego/m65/rev1/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -#define DEVICE_VER 0x0001 -#define PRODUCT_ID 0x6061 - #define LED_NUM_LOCK_PIN B12 #define LED_SCROLL_LOCK_PIN B13 #define LED_CAPS_LOCK_PIN C13 diff --git a/keyboards/mlego/m65/rev1/info.json b/keyboards/mlego/m65/rev1/info.json new file mode 100644 index 0000000000..e495c94992 --- /dev/null +++ b/keyboards/mlego/m65/rev1/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x6061", + "device_version": "0.0.1" + } +} diff --git a/keyboards/mlego/m65/rev2/config.h b/keyboards/mlego/m65/rev2/config.h index db13bbb2ad..11335a5d69 100644 --- a/keyboards/mlego/m65/rev2/config.h +++ b/keyboards/mlego/m65/rev2/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -#define DEVICE_VER 0x0002 -#define PRODUCT_ID 0x6061 - #define LED_NUM_LOCK_PIN B12 #define LED_SCROLL_LOCK_PIN B13 #define LED_CAPS_LOCK_PIN B2 diff --git a/keyboards/mlego/m65/rev2/info.json b/keyboards/mlego/m65/rev2/info.json new file mode 100644 index 0000000000..470262ed85 --- /dev/null +++ b/keyboards/mlego/m65/rev2/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x6061", + "device_version": "0.0.2" + } +} diff --git a/keyboards/mlego/m65/rev3/config.h b/keyboards/mlego/m65/rev3/config.h index a4b1ba3343..84a0c8a19f 100644 --- a/keyboards/mlego/m65/rev3/config.h +++ b/keyboards/mlego/m65/rev3/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -#define DEVICE_VER 0x0001 -#define PRODUCT_ID 0x6062 - #define LED_NUM_LOCK_PIN B12 #define LED_SCROLL_LOCK_PIN B13 #define LED_CAPS_LOCK_PIN C13 diff --git a/keyboards/mlego/m65/rev3/info.json b/keyboards/mlego/m65/rev3/info.json new file mode 100644 index 0000000000..e42ab50857 --- /dev/null +++ b/keyboards/mlego/m65/rev3/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x6062", + "device_version": "0.0.1" + } +} diff --git a/keyboards/mlego/m65/rev4/config.h b/keyboards/mlego/m65/rev4/config.h index 07dd0fefaa..b3187fbdb7 100644 --- a/keyboards/mlego/m65/rev4/config.h +++ b/keyboards/mlego/m65/rev4/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -#define DEVICE_VER 0x0002 -#define PRODUCT_ID 0x6062 - #define LED_NUM_LOCK_PIN B12 #define LED_SCROLL_LOCK_PIN B13 #define LED_CAPS_LOCK_PIN C13 diff --git a/keyboards/mlego/m65/rev4/info.json b/keyboards/mlego/m65/rev4/info.json new file mode 100644 index 0000000000..c94ea38e22 --- /dev/null +++ b/keyboards/mlego/m65/rev4/info.json @@ -0,0 +1,6 @@ +{ + "usb": { + "pid": "0x6062", + "device_version": "0.0.2" + } +} -- cgit v1.2.3