From 835c971f78b5d995bb58f0889fac00aac348de52 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 20 Aug 2022 10:39:35 +1000 Subject: Move keyboard USB IDs and strings to data driven, pass 2: J-L (#18080) --- keyboards/jadookb/jkb65/config.h | 9 --------- keyboards/jadookb/jkb65/info.json | 6 +++++- keyboards/jadookb/jkb65/r1/config.h | 20 ++++++++++++++++++++ keyboards/jadookb/jkb65/r1/info.json | 6 ++++++ keyboards/jadookb/jkb65/r1/rules.mk | 0 keyboards/jadookb/jkb65/r2/config.h | 9 +-------- keyboards/jadookb/jkb65/r2/info.json | 6 ++++++ keyboards/jadookb/jkb65/r2/rules.mk | 0 keyboards/jadookb/jkb65/rules.mk | 2 ++ 9 files changed, 40 insertions(+), 18 deletions(-) create mode 100644 keyboards/jadookb/jkb65/r1/config.h create mode 100644 keyboards/jadookb/jkb65/r1/info.json create mode 100644 keyboards/jadookb/jkb65/r1/rules.mk create mode 100644 keyboards/jadookb/jkb65/r2/info.json create mode 100644 keyboards/jadookb/jkb65/r2/rules.mk (limited to 'keyboards/jadookb') diff --git a/keyboards/jadookb/jkb65/config.h b/keyboards/jadookb/jkb65/config.h index dae3cea49a..f7d09267fe 100644 --- a/keyboards/jadookb/jkb65/config.h +++ b/keyboards/jadookb/jkb65/config.h @@ -18,18 +18,9 @@ #include "config_common.h" -#define VENDOR_ID 0x4A4B -#define PRODUCT_ID 0xEF6A -#define DEVICE_VER 0x0001 -#define MANUFACTURER JadooKB -#define PRODUCT JKB65 RGB - #define MATRIX_ROWS 5 #define MATRIX_COLS 16 -#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 } -#define MATRIX_COL_PINS { F6,B1,F1,C7,C6,B6,B5,B4,D7,B3,D4,D5,D3,D2,D1,D0 } - #define UNUSED_PINS #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/jadookb/jkb65/info.json b/keyboards/jadookb/jkb65/info.json index 8bb0ab7524..394b53027a 100644 --- a/keyboards/jadookb/jkb65/info.json +++ b/keyboards/jadookb/jkb65/info.json @@ -1,7 +1,11 @@ { - "keyboard_name": "jkb65", + "manufacturer": "JadooKB", "url": "https://jadookb.com/", "maintainer": "Wizard-GG", + "usb": { + "vid": "0x4A4B", + "pid": "0xEF6A" + }, "layouts": { "LAYOUT_67_ansi": { "layout": [{"label":"Esc", "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":"Backspace", "x":13, "y":0, "w":2}, {"label":"~", "x":15, "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":"Delete", "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}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgUp", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"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":"\u2191", "x":14, "y":3}, {"label":"PgDn", "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}, {"x":3.75, "y":4, "w":6.25}, {"label":"Fn", "x":10, "y":4, "w":1.25}, {"label":"Menu", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}] diff --git a/keyboards/jadookb/jkb65/r1/config.h b/keyboards/jadookb/jkb65/r1/config.h new file mode 100644 index 0000000000..78f13414c9 --- /dev/null +++ b/keyboards/jadookb/jkb65/r1/config.h @@ -0,0 +1,20 @@ + /* Copyright 2022 Wizad-GG + * + * 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 . + */ + +#pragma once + +#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 } +#define MATRIX_COL_PINS { F6,B1,F1,C7,C6,B6,B5,B4,D7,B3,D4,D5,D3,D2,D1,D0 } \ No newline at end of file diff --git a/keyboards/jadookb/jkb65/r1/info.json b/keyboards/jadookb/jkb65/r1/info.json new file mode 100644 index 0000000000..4bfe3aa763 --- /dev/null +++ b/keyboards/jadookb/jkb65/r1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "JKB65 RGB R1", + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/jadookb/jkb65/r1/rules.mk b/keyboards/jadookb/jkb65/r1/rules.mk new file mode 100644 index 0000000000..e69de29bb2 diff --git a/keyboards/jadookb/jkb65/r2/config.h b/keyboards/jadookb/jkb65/r2/config.h index a0039001a8..5db93f75cb 100644 --- a/keyboards/jadookb/jkb65/r2/config.h +++ b/keyboards/jadookb/jkb65/r2/config.h @@ -16,12 +16,5 @@ #pragma once -#undef DEVICE_VER -#define DEVICE_VER 0x0002 - -#undef PRODUCT -#define PRODUCT JKB65 RGB R2 - - -#undef MATRIX_COL_PINS +#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 } #define MATRIX_COL_PINS { F6,B0,F1,C7,C6,B6,B5,B4,D7,D6,D4,D5,D3,D2,D1,D0 } \ No newline at end of file diff --git a/keyboards/jadookb/jkb65/r2/info.json b/keyboards/jadookb/jkb65/r2/info.json new file mode 100644 index 0000000000..8a23a21d5f --- /dev/null +++ b/keyboards/jadookb/jkb65/r2/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "JKB65 RGB R2", + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/jadookb/jkb65/r2/rules.mk b/keyboards/jadookb/jkb65/r2/rules.mk new file mode 100644 index 0000000000..e69de29bb2 diff --git a/keyboards/jadookb/jkb65/rules.mk b/keyboards/jadookb/jkb65/rules.mk index 239ea39a74..f230e8ae9f 100644 --- a/keyboards/jadookb/jkb65/rules.mk +++ b/keyboards/jadookb/jkb65/rules.mk @@ -19,3 +19,5 @@ AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = WS2812 LTO_ENABLE = yes + +DEFAULT_FOLDER = jadookb/jkb65/r1 -- cgit v1.2.1