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/mechllama/g35/config.h | 5 ----- keyboards/mechllama/g35/info.json | 7 ++++++- keyboards/mechllama/g35/v1/config.h | 2 -- keyboards/mechllama/g35/v1/info.json | 5 +++++ keyboards/mechllama/g35/v2/config.h | 2 -- keyboards/mechllama/g35/v2/info.json | 5 +++++ 6 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 keyboards/mechllama/g35/v1/info.json create mode 100644 keyboards/mechllama/g35/v2/info.json (limited to 'keyboards/mechllama') diff --git a/keyboards/mechllama/g35/config.h b/keyboards/mechllama/g35/config.h index 9602bbd39b..3b5b7ea0e7 100644 --- a/keyboards/mechllama/g35/config.h +++ b/keyboards/mechllama/g35/config.h @@ -19,11 +19,6 @@ along with this program. If not, see . #include "config_common.h" -#define VENDOR_ID 0xCEEB -#define PRODUCT_ID 0x0035 -#define MANUFACTURER kaylynb -#define PRODUCT MechLlama G35 - #define MATRIX_ROWS 5 #define MATRIX_COLS 7 diff --git a/keyboards/mechllama/g35/info.json b/keyboards/mechllama/g35/info.json index c22c124fc8..465e145a97 100644 --- a/keyboards/mechllama/g35/info.json +++ b/keyboards/mechllama/g35/info.json @@ -1,7 +1,12 @@ { - "keyboard_name": "G35", + "keyboard_name": "MechLlama G35", + "manufacturer": "kaylynb", "url": "https://github.com/kaylynb/MechLlama-G35", "maintainer": "kaylynb", + "usb": { + "vid": "0xCEEB", + "pid": "0x0035" + }, "layouts": { "LAYOUT": { "layout": [{"label":"F1", "x":0, "y":0.5}, {"label":"Esc", "x":1, "y":0.5}, {"label":"1", "x":2, "y":0}, {"label":"2", "x":3, "y":0.15}, {"label":"3", "x":4, "y":0}, {"label":"4", "x":5, "y":0}, {"label":"5", "x":6, "y":0}, {"label":"F2", "x":0, "y":1.5}, {"label":"Tab", "x":1, "y":1.5}, {"label":"Q", "x":2, "y":1}, {"label":"W", "x":3, "y":1.15}, {"label":"E", "x":4, "y":1}, {"label":"R", "x":5, "y":1}, {"label":"T", "x":6, "y":1}, {"label":"F3", "x":0, "y":2.5}, {"label":"Shift", "x":1, "y":2.5}, {"label":"A", "x":2, "y":2}, {"label":"S", "x":3, "y":2.15}, {"label":"D", "x":4, "y":2}, {"label":"F", "x":5, "y":2}, {"label":"G", "x":6, "y":2}, {"label":"F4", "x":0, "y":3.5}, {"label":"Ctrl", "x":1, "y":3.5}, {"label":"Z", "x":2, "y":3}, {"label":"X", "x":3, "y":3.15}, {"label":"C", "x":4, "y":3}, {"label":"V", "x":5, "y":3}, {"label":"B", "x":6, "y":3}, {"label":"F5", "x":0, "y":4.5}, {"label":"Super", "x":1, "y":4.5}, {"label":"Alt", "x":2, "y":4, "h":1.5}, {"label":"Bksp", "x":3, "y":4.25, "h":1.25}, {"label":"Enter", "x":4, "y":4, "h":1.5}, {"label":"Space", "x":5, "y":4, "h":1.75}, {"label":"Fn", "x":6, "y":4, "h":1.75}] diff --git a/keyboards/mechllama/g35/v1/config.h b/keyboards/mechllama/g35/v1/config.h index 9e7be98ea1..fbda4b7db2 100644 --- a/keyboards/mechllama/g35/v1/config.h +++ b/keyboards/mechllama/g35/v1/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#define DEVICE_VER 0x0001 - #define MATRIX_ROW_PINS { F5, F6, F4, F1, D4 } #define MATRIX_COL_PINS { D6, D7, B4, B5, B6, F0, D5 } diff --git a/keyboards/mechllama/g35/v1/info.json b/keyboards/mechllama/g35/v1/info.json new file mode 100644 index 0000000000..90ac25f360 --- /dev/null +++ b/keyboards/mechllama/g35/v1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/mechllama/g35/v2/config.h b/keyboards/mechllama/g35/v2/config.h index 09d5f607d2..cd4d6e991c 100644 --- a/keyboards/mechllama/g35/v2/config.h +++ b/keyboards/mechllama/g35/v2/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#define DEVICE_VER 0x0002 - #define MATRIX_ROW_PINS { F5, F4, F1, F0, D4 } #define MATRIX_COL_PINS { D6, D7, B4, B5, B6, F6, D5 } diff --git a/keyboards/mechllama/g35/v2/info.json b/keyboards/mechllama/g35/v2/info.json new file mode 100644 index 0000000000..e557e4d307 --- /dev/null +++ b/keyboards/mechllama/g35/v2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.2" + } +} -- cgit v1.2.1