diff options
Diffstat (limited to 'keyboards/idobao')
70 files changed, 1133 insertions, 1454 deletions
diff --git a/keyboards/idobao/id42/config.h b/keyboards/idobao/id42/config.h index b588cc2bf0..501fd1f996 100755 --- a/keyboards/idobao/id42/config.h +++ b/keyboards/idobao/id42/config.h @@ -3,13 +3,6 @@ #pragma once - -/* Other settings */ - -/* NKRO by default is required to be turned on. This forces it on - during keyboard startup regardless of EEPROM setting. */ -#define FORCE_NKRO - /* Change the USB polling rate [default = 1000Hz (1ms)] and * use larger value of keys per scan for elite games */ #define USB_POLLING_INTERVAL_MS 2 // 500Hz @@ -17,7 +10,6 @@ /* LED Matrix & Animations */ #ifdef RGB_MATRIX_ENABLE - #define RGB_DI_PIN B3 #define RGB_MATRIX_LED_COUNT 42 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended diff --git a/keyboards/idobao/id42/id42.c b/keyboards/idobao/id42/id42.c index 15cc0b41b0..5e76e4c5be 100755 --- a/keyboards/idobao/id42/id42.c +++ b/keyboards/idobao/id42/id42.c @@ -1,7 +1,7 @@ // Copyright 2022 Vino Rodrigues (@vinorodrigues) // SPDX-License-Identifier: GPL-2.0-or-later -#include "id42.h" +#include "quantum.h" #define __ NO_LED diff --git a/keyboards/idobao/id42/id42.h b/keyboards/idobao/id42/id42.h deleted file mode 100755 index d9bef6d021..0000000000 --- a/keyboards/idobao/id42/id42.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2022 Vino Rodrigues (@vinorodrigues) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" diff --git a/keyboards/idobao/id42/info.json b/keyboards/idobao/id42/info.json index 16670715f3..cc896ff236 100644 --- a/keyboards/idobao/id42/info.json +++ b/keyboards/idobao/id42/info.json @@ -14,6 +14,12 @@ "backlight": false, "rgblight": false }, + "ws2812": { + "pin": "B3" + }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["B4", "D7", "D6", "D4", "B5", "C7", "F0", "F7", "F6", "F1", "F4", "F5"], "rows": ["D5", "C6", "B6", "E6"] @@ -23,56 +29,57 @@ "usb": { "vid": "0x6964", "pid": "0x0042", - "device_version": "1.0.0" + "device_version": "1.0.0", + "force_nkro": true }, "layouts": { "LAYOUT": { "layout": [ - { "matrix": [0, 0], "label": "Esc", "x": 0, "y": 0 }, - { "matrix": [0, 1], "label": "Q", "x": 1, "y": 0 }, - { "matrix": [0, 2], "label": "W", "x": 2, "y": 0 }, - { "matrix": [0, 3], "label": "E", "x": 3, "y": 0 }, - { "matrix": [0, 4], "label": "R", "x": 4, "y": 0 }, - { "matrix": [0, 5], "label": "T", "x": 5, "y": 0 }, - { "matrix": [0, 6], "label": "Y", "x": 6, "y": 0 }, - { "matrix": [0, 7], "label": "U", "x": 7, "y": 0 }, - { "matrix": [0, 8], "label": "I", "x": 8, "y": 0 }, - { "matrix": [0, 9], "label": "O", "x": 9, "y": 0 }, - { "matrix": [0, 10], "label": "P", "x": 10, "y": 0 }, - { "matrix": [0, 11], "label": "BSpc", "x": 11, "y": 0 }, + {"matrix": [0, 0], "label": "Esc", "x": 0, "y": 0}, + {"matrix": [0, 1], "label": "Q", "x": 1, "y": 0}, + {"matrix": [0, 2], "label": "W", "x": 2, "y": 0}, + {"matrix": [0, 3], "label": "E", "x": 3, "y": 0}, + {"matrix": [0, 4], "label": "R", "x": 4, "y": 0}, + {"matrix": [0, 5], "label": "T", "x": 5, "y": 0}, + {"matrix": [0, 6], "label": "Y", "x": 6, "y": 0}, + {"matrix": [0, 7], "label": "U", "x": 7, "y": 0}, + {"matrix": [0, 8], "label": "I", "x": 8, "y": 0}, + {"matrix": [0, 9], "label": "O", "x": 9, "y": 0}, + {"matrix": [0, 10], "label": "P", "x": 10, "y": 0}, + {"matrix": [0, 11], "label": "BSpc", "x": 11, "y": 0}, - { "matrix": [1, 0], "label": "Tab", "x": 0, "y": 1, "w": 1.25 }, - { "matrix": [1, 1], "label": "A", "x": 1.25, "y": 1 }, - { "matrix": [1, 2], "label": "S", "x": 2.25, "y": 1 }, - { "matrix": [1, 3], "label": "D", "x": 3.25, "y": 1 }, - { "matrix": [1, 4], "label": "F", "x": 4.25, "y": 1 }, - { "matrix": [1, 5], "label": "G", "x": 5.25, "y": 1 }, - { "matrix": [1, 6], "label": "H", "x": 6.25, "y": 1 }, - { "matrix": [1, 7], "label": "J", "x": 7.25, "y": 1 }, - { "matrix": [1, 8], "label": "K", "x": 8.25, "y": 1 }, - { "matrix": [1, 9], "label": "L", "x": 9.25, "y": 1 }, - { "matrix": [1, 11], "label": "Ent", "x": 10.25, "y": 1, "w": 1.75 }, + {"matrix": [1, 0], "label": "Tab", "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "label": "A", "x": 1.25, "y": 1}, + {"matrix": [1, 2], "label": "S", "x": 2.25, "y": 1}, + {"matrix": [1, 3], "label": "D", "x": 3.25, "y": 1}, + {"matrix": [1, 4], "label": "F", "x": 4.25, "y": 1}, + {"matrix": [1, 5], "label": "G", "x": 5.25, "y": 1}, + {"matrix": [1, 6], "label": "H", "x": 6.25, "y": 1}, + {"matrix": [1, 7], "label": "J", "x": 7.25, "y": 1}, + {"matrix": [1, 8], "label": "K", "x": 8.25, "y": 1}, + {"matrix": [1, 9], "label": "L", "x": 9.25, "y": 1}, + {"matrix": [1, 11], "label": "Ent", "x": 10.25, "y": 1, "w": 1.75}, - { "matrix": [2, 0], "label": "Shft", "x": 0, "y": 2, "w": 1.75 }, - { "matrix": [2, 1], "label": "Z", "x": 1.75, "y": 2 }, - { "matrix": [2, 2], "label": "X", "x": 2.75, "y": 2 }, - { "matrix": [2, 3], "label": "C", "x": 3.75, "y": 2 }, - { "matrix": [2, 4], "label": "V", "x": 4.75, "y": 2 }, - { "matrix": [2, 5], "label": "B", "x": 5.75, "y": 2 }, - { "matrix": [2, 6], "label": "N", "x": 6.75, "y": 2 }, - { "matrix": [2, 7], "label": "M", "x": 7.75, "y": 2 }, - { "matrix": [2, 8], "label": "Shft", "x": 8.75, "y": 2, "w": 1.25 }, - { "matrix": [2, 10], "label": "\u21E7", "x": 10, "y": 2 }, - { "matrix": [2, 11], "label": "Del", "x": 11, "y": 2 }, + {"matrix": [2, 0], "label": "Shft", "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "label": "Z", "x": 1.75, "y": 2}, + {"matrix": [2, 2], "label": "X", "x": 2.75, "y": 2}, + {"matrix": [2, 3], "label": "C", "x": 3.75, "y": 2}, + {"matrix": [2, 4], "label": "V", "x": 4.75, "y": 2}, + {"matrix": [2, 5], "label": "B", "x": 5.75, "y": 2}, + {"matrix": [2, 6], "label": "N", "x": 6.75, "y": 2}, + {"matrix": [2, 7], "label": "M", "x": 7.75, "y": 2}, + {"matrix": [2, 8], "label": "Shft", "x": 8.75, "y": 2, "w": 1.25}, + {"matrix": [2, 10], "label": "\u21E7", "x": 10, "y": 2}, + {"matrix": [2, 11], "label": "Del", "x": 11, "y": 2}, - { "matrix": [3, 0], "label": "Ctrl", "x": 0, "y": 3, "w": 1.25 }, - { "matrix": [3, 1], "label": "Win", "x": 1.25, "y": 3 }, - { "matrix": [3, 2], "label": "Alt", "x": 2.25, "y": 3, "w": 1.25 }, - { "matrix": [3, 3], "label": "", "x": 3.5, "y": 3, "w": 2.75 }, - { "matrix": [3, 6], "label": "Fn", "x": 6.25, "y": 3, "w": 2.75 }, - { "matrix": [3, 9], "label": "\u21E6", "x": 9, "y": 3 }, - { "matrix": [3, 10], "label": "\u21E9", "x": 10, "y": 3 }, - { "matrix": [3, 11], "label": "\u21E8", "x": 11, "y": 3 } + {"matrix": [3, 0], "label": "Ctrl", "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "label": "Win", "x": 1.25, "y": 3}, + {"matrix": [3, 2], "label": "Alt", "x": 2.25, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "label": "", "x": 3.5, "y": 3, "w": 2.75}, + {"matrix": [3, 6], "label": "Fn", "x": 6.25, "y": 3, "w": 2.75}, + {"matrix": [3, 9], "label": "\u21E6", "x": 9, "y": 3}, + {"matrix": [3, 10], "label": "\u21E9", "x": 10, "y": 3}, + {"matrix": [3, 11], "label": "\u21E8", "x": 11, "y": 3} ] } } diff --git a/keyboards/idobao/id42/rules.mk b/keyboards/idobao/id42/rules.mk index eab741fd0a..58e39b17a5 100755 --- a/keyboards/idobao/id42/rules.mk +++ b/keyboards/idobao/id42/rules.mk @@ -2,4 +2,3 @@ # ** settings are data driven & stored in `info.json` ** RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 diff --git a/keyboards/idobao/id61/config.h b/keyboards/idobao/id61/config.h index d2a803a1e4..5513787c4e 100644 --- a/keyboards/idobao/id61/config.h +++ b/keyboards/idobao/id61/config.h @@ -8,10 +8,8 @@ * RGB Matrix stuff * ---------------- */ -#define RGB_DI_PIN F0 - // RGB Matrix config -#if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE) +#if defined(RGB_MATRIX_ENABLE) #ifndef ID61_DISABLE_UNDERGLOW #define RGB_MATRIX_LED_COUNT 71 diff --git a/keyboards/idobao/id61/id61.c b/keyboards/idobao/id61/id61.c index f6338c7133..bd2271049b 100644 --- a/keyboards/idobao/id61/id61.c +++ b/keyboards/idobao/id61/id61.c @@ -1,7 +1,7 @@ // Copyright 2022 Vino Rodrigues (@vinorodrigues) // SPDX-License-Identifier: GPL-2.0-or-later -#include "id61.h" +#include "quantum.h" #define __ NO_LED diff --git a/keyboards/idobao/id61/id61.h b/keyboards/idobao/id61/id61.h deleted file mode 100644 index d9bef6d021..0000000000 --- a/keyboards/idobao/id61/id61.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2022 Vino Rodrigues (@vinorodrigues) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" diff --git a/keyboards/idobao/id61/info.json b/keyboards/idobao/id61/info.json index 62b6f03f52..57f9e520a3 100644 --- a/keyboards/idobao/id61/info.json +++ b/keyboards/idobao/id61/info.json @@ -14,6 +14,12 @@ "backlight": false, "rgblight": false }, + "ws2812": { + "pin": "F0" + }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7"], "rows": ["B0", "B1", "B2", "B3", "F7"] @@ -29,71 +35,71 @@ "layouts": { "LAYOUT_60_ansi": { "layout": [ - { "label": "Esc", "matrix": [0, 0], "x":0, "y":0 }, - { "label": "1!", "matrix": [0, 1], "x":1, "y":0 }, - { "label": "2@", "matrix": [0, 2], "x":2, "y":0 }, - { "label": "3#", "matrix": [0, 3], "x":3, "y":0 }, - { "label": "4$", "matrix": [0, 4], "x":4, "y":0 }, - { "label": "5%", "matrix": [0, 5], "x":5, "y":0 }, - { "label": "6^", "matrix": [0, 6], "x":6, "y":0 }, - { "label": "7&", "matrix": [0, 7], "x":7, "y":0 }, - { "label": "8*", "matrix": [0, 8], "x":8, "y":0 }, - { "label": "9(", "matrix": [0, 9], "x":9, "y":0 }, - { "label": "0)", "matrix": [0, 10], "x":10, "y":0 }, - { "label": "-_", "matrix": [0, 11], "x":11, "y":0 }, - { "label": "=+", "matrix": [0, 12], "x":12, "y":0 }, - { "label": "Backspace", "matrix": [0, 13], "x":13, "y":0, "w":2 }, + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1!", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2@", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3#", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4$", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5%", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "6^", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "7&", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8*", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "9(", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "0)", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2}, - { "label": "Tab", "matrix": [1, 0], "x":0, "y":1, "w":1.5 }, - { "label": "Q", "matrix": [1, 1], "x":1.5, "y":1 }, - { "label": "W", "matrix": [1, 2], "x":2.5, "y":1 }, - { "label": "E", "matrix": [1, 3], "x":3.5, "y":1 }, - { "label": "R", "matrix": [1, 4], "x":4.5, "y":1 }, - { "label": "T", "matrix": [1, 5], "x":5.5, "y":1 }, - { "label": "Y", "matrix": [1, 6], "x":6.5, "y":1 }, - { "label": "U", "matrix": [1, 7], "x":7.5, "y":1 }, - { "label": "I", "matrix": [1, 8], "x":8.5, "y":1 }, - { "label": "O", "matrix": [1, 9], "x":9.5, "y":1 }, - { "label": "P", "matrix": [1, 10], "x":10.5, "y":1 }, - { "label": "[{", "matrix": [1, 11], "x":11.5, "y":1 }, - { "label": "]}", "matrix": [1, 12], "x":12.5, "y":1 }, - { "label": "\\|", "matrix": [1, 13], "x":13.5, "y":1, "w":1.5 }, + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"label": "]}", "matrix": [1, 12], "x": 12.5, "y": 1}, + {"label": "\\|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, - { "label": "Caps Lock", "matrix": [2, 0], "x":0, "y":2, "w":1.75 }, - { "label": "A", "matrix": [2, 1], "x":1.75, "y":2 }, - { "label": "S", "matrix": [2, 2], "x":2.75, "y":2 }, - { "label": "D", "matrix": [2, 3], "x":3.75, "y":2 }, - { "label": "F", "matrix": [2, 4], "x":4.75, "y":2 }, - { "label": "G", "matrix": [2, 5], "x":5.75, "y":2 }, - { "label": "H", "matrix": [2, 6], "x":6.75, "y":2 }, - { "label": "J", "matrix": [2, 7], "x":7.75, "y":2 }, - { "label": "K", "matrix": [2, 8], "x":8.75, "y":2 }, - { "label": "L", "matrix": [2, 9], "x":9.75, "y":2 }, - { "label": ";:", "matrix": [2, 10], "x":10.75, "y":2 }, - { "label": "'\"", "matrix": [2, 11], "x":11.75, "y":2 }, - { "label": "Enter", "matrix": [2, 12], "x":12.75, "y":2, "w":2.25 }, + {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "Enter", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, - { "label": "Shift", "matrix": [3, 0], "x":0, "y":3, "w":2.25 }, - { "label": "Z", "matrix": [3, 2], "x":2.25, "y":3 }, - { "label": "X", "matrix": [3, 3], "x":3.25, "y":3 }, - { "label": "C", "matrix": [3, 4], "x":4.25, "y":3 }, - { "label": "V", "matrix": [3, 5], "x":5.25, "y":3 }, - { "label": "B", "matrix": [3, 6], "x":6.25, "y":3 }, - { "label": "N", "matrix": [3, 7], "x":7.25, "y":3 }, - { "label": "M", "matrix": [3, 8], "x":8.25, "y":3 }, - { "label": ",<", "matrix": [3, 9], "x":9.25, "y":3 }, - { "label": ".>", "matrix": [3, 10], "x":10.25, "y":3 }, - { "label": "/?", "matrix": [3, 11], "x":11.25, "y":3 }, - { "label": "Shift", "matrix": [3, 12], "x":12.25, "y":3, "w":2.75 }, + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3}, + {"label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3}, + {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3}, + {"label": "/?", "matrix": [3, 11], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, - { "label": "Ctrl", "matrix": [4, 0], "x":0, "y":4, "w":1.25 }, - { "label": "GUI", "matrix": [4, 1], "x":1.25, "y":4, "w":1.25 }, - { "label": "Alt", "matrix": [4, 2], "x":2.5, "y":4, "w":1.25 }, - { "label": "Space", "matrix": [4, 6], "x":3.75, "y":4, "w":6.25 }, - { "label": "Fn", "matrix": [4, 10], "x":10, "y":4, "w":1.25 }, - { "label": "Alt", "matrix": [4, 11], "x":11.25, "y":4, "w":1.25 }, - { "label": "Menu", "matrix": [4, 12], "x":12.5, "y":4, "w":1.25 }, - { "label": "Ctrl", "matrix": [4, 13], "x":13.75, "y":4, "w":1.25 } + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"label": "Fn", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"label": "Menu", "matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"label": "Ctrl", "matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/idobao/id61/rules.mk b/keyboards/idobao/id61/rules.mk index d034fbb12f..ed51a57621 100644 --- a/keyboards/idobao/id61/rules.mk +++ b/keyboards/idobao/id61/rules.mk @@ -3,4 +3,3 @@ # ** settings are data driven & stored in `info.json` ** RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 diff --git a/keyboards/idobao/id63/config.h b/keyboards/idobao/id63/config.h index 13a4068822..214fb6ba6d 100644 --- a/keyboards/idobao/id63/config.h +++ b/keyboards/idobao/id63/config.h @@ -10,10 +10,8 @@ * RGB Matrix stuff * ---------------- */ -#define RGB_DI_PIN B7 - // RGB Matrix config -#if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE) +#if defined(RGB_MATRIX_ENABLE) /* Denwir case is solid back. Please disable underglow at compile with compile command line: * diff --git a/keyboards/idobao/id63/id63.c b/keyboards/idobao/id63/id63.c index d9b7fdef39..f425eb4fe4 100644 --- a/keyboards/idobao/id63/id63.c +++ b/keyboards/idobao/id63/id63.c @@ -1,7 +1,7 @@ // Copyright 2022 Vino Rodrigues (@vinorodrigues) // SPDX-License-Identifier: GPL-2.0-or-later -#include "id63.h" +#include "quantum.h" #define __ NO_LED diff --git a/keyboards/idobao/id63/id63.h b/keyboards/idobao/id63/id63.h deleted file mode 100644 index d9bef6d021..0000000000 --- a/keyboards/idobao/id63/id63.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2022 Vino Rodrigues (@vinorodrigues) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" diff --git a/keyboards/idobao/id63/info.json b/keyboards/idobao/id63/info.json index 0d05c05eb3..048e187018 100644 --- a/keyboards/idobao/id63/info.json +++ b/keyboards/idobao/id63/info.json @@ -14,6 +14,12 @@ "backlight": false, "rgblight": false }, + "ws2812": { + "pin": "B7" + }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["C7", "F6", "F5", "F4", "F1", "B3", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7"], "rows": ["B0", "B1", "B2", "E6", "F7"] @@ -32,73 +38,73 @@ "layouts": { "LAYOUT_60_ansi_arrow": { "layout": [ - { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 }, - { "label": "1!", "matrix": [0, 1], "x": 1, "y": 0 }, - { "label": "2@", "matrix": [0, 2], "x": 2, "y": 0 }, - { "label": "3#", "matrix": [0, 3], "x": 3, "y": 0 }, - { "label": "4$", "matrix": [0, 4], "x": 4, "y": 0 }, - { "label": "5%", "matrix": [0, 5], "x": 5, "y": 0 }, - { "label": "6^", "matrix": [0, 6], "x": 6, "y": 0 }, - { "label": "7&", "matrix": [0, 7], "x": 7, "y": 0 }, - { "label": "8*", "matrix": [0, 8], "x": 8, "y": 0 }, - { "label": "9(", "matrix": [0, 9], "x": 9, "y": 0 }, - { "label": "0)", "matrix": [0, 10], "x": 10, "y": 0 }, - { "label": "-_", "matrix": [0, 11], "x": 11, "y": 0 }, - { "label": "=+", "matrix": [0, 12], "x": 12, "y": 0 }, - { "label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1!", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2@", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3#", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4$", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5%", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "6^", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "7&", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8*", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "9(", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "0)", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "-_", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "=+", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [0, 13], "x": 13, "y": 0, "w": 2}, - { "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, - { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 }, - { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 }, - { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 }, - { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 }, - { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 }, - { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 }, - { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 }, - { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 }, - { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 }, - { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 }, - { "label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1 }, - { "label": "]}", "matrix": [1, 12], "x": 12.5, "y": 1 }, - { "label": "\\|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5 }, + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"label": "]}", "matrix": [1, 12], "x": 12.5, "y": 1}, + {"label": "\\|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, - { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 }, - { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 }, - { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 }, - { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 }, - { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 }, - { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 }, - { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 }, - { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 }, - { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 }, - { "label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2 }, - { "label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2 }, - { "label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25 }, + {"label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, - { "label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25 }, - { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, - { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, - { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, - { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, - { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, - { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, - { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 }, - { "label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3 }, - { "label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3 }, - { "label": "Shift", "matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75 }, - { "label": "\u2191", "matrix": [3, 12], "x": 13, "y": 3 }, - { "label": "/?", "matrix": [3, 13], "x": 14, "y": 3 }, + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3}, + {"label": ",<", "matrix": [3, 9], "x": 9.25, "y": 3}, + {"label": ".>", "matrix": [3, 10], "x": 10.25, "y": 3}, + {"label": "Shift", "matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [3, 12], "x": 13, "y": 3}, + {"label": "/?", "matrix": [3, 13], "x": 14, "y": 3}, - { "label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25 }, - { "label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25 }, - { "label": "Alt", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25 }, - { "label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25 }, - { "label": "Fn", "matrix": [4, 9], "x": 10, "y": 4 }, - { "label": "Menu", "matrix": [4, 10], "x": 11, "y": 4 }, - { "label": "\u2190", "matrix": [4, 11], "x": 12, "y": 4 }, - { "label": "\u2193", "matrix": [4, 12], "x": 13, "y": 4 }, - { "label": "\u2192", "matrix": [4, 13], "x": 14, "y": 4 } + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"label": "Fn", "matrix": [4, 9], "x": 10, "y": 4}, + {"label": "Menu", "matrix": [4, 10], "x": 11, "y": 4}, + {"label": "\u2190", "matrix": [4, 11], "x": 12, "y": 4}, + {"label": "\u2193", "matrix": [4, 12], "x": 13, "y": 4}, + {"label": "\u2192", "matrix": [4, 13], "x": 14, "y": 4} ] } } diff --git a/keyboards/idobao/id63/rules.mk b/keyboards/idobao/id63/rules.mk index eab741fd0a..58e39b17a5 100644 --- a/keyboards/idobao/id63/rules.mk +++ b/keyboards/idobao/id63/rules.mk @@ -2,4 +2,3 @@ # ** settings are data driven & stored in `info.json` ** RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 diff --git a/keyboards/idobao/id67/config.h b/keyboards/idobao/id67/config.h index 6e6b15e076..7834bd33bb 100644 --- a/keyboards/idobao/id67/config.h +++ b/keyboards/idobao/id67/config.h @@ -5,9 +5,6 @@ #pragma once - -#define RGB_DI_PIN F0 - // RGB Matrix config #if defined(RGB_MATRIX_ENABLE) #ifndef ID67_DISABLE_UNDERGLOW diff --git a/keyboards/idobao/id67/id67.c b/keyboards/idobao/id67/id67.c index 17bcd9a943..dab6347eb3 100644 --- a/keyboards/idobao/id67/id67.c +++ b/keyboards/idobao/id67/id67.c @@ -3,7 +3,7 @@ // Copyright 2022 Vino Rodrigues (@vinorodrigues) // SPDX-License-Identifier: GPL-2.0-or-later -#include "id67.h" +#include "quantum.h" #define __ NO_LED diff --git a/keyboards/idobao/id67/id67.h b/keyboards/idobao/id67/id67.h deleted file mode 100644 index cd5ab8de09..0000000000 --- a/keyboards/idobao/id67/id67.h +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2021 Tybera (@tybera) -// Copyright 2021 Werther (@thewerther) -// Copyright 2022 Vino Rodrigues (@vinorodrigues) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" diff --git a/keyboards/idobao/id67/info.json b/keyboards/idobao/id67/info.json index 34cec9b931..55f19ba9cc 100644 --- a/keyboards/idobao/id67/info.json +++ b/keyboards/idobao/id67/info.json @@ -14,6 +14,12 @@ "backlight": false, "rgblight": false }, + "ws2812": { + "pin": "F0" + }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7", "B4"], "rows": ["B0", "B1", "B2", "B3", "F7"] @@ -28,77 +34,77 @@ "layouts": { "LAYOUT_65_ansi_blocker": { "layout": [ - { "matrix": [0, 0], "x":0, "y":0 }, - { "matrix": [0, 1], "x":1, "y":0 }, - { "matrix": [0, 2], "x":2, "y":0 }, - { "matrix": [0, 3], "x":3, "y":0 }, - { "matrix": [0, 4], "x":4, "y":0 }, - { "matrix": [0, 5], "x":5, "y":0 }, - { "matrix": [0, 6], "x":6, "y":0 }, - { "matrix": [0, 7], "x":7, "y":0 }, - { "matrix": [0, 8], "x":8, "y":0 }, - { "matrix": [0, 9], "x":9, "y":0 }, - { "matrix": [0, 10], "x":10, "y":0 }, - { "matrix": [0, 11], "x":11, "y":0 }, - { "matrix": [0, 12], "x":12, "y":0 }, - { "matrix": [0, 13], "x":13, "y":0, "w":2 }, - { "matrix": [0, 14], "x":15, "y":0 }, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, - { "matrix": [1, 0], "x":0, "y":1, "w":1.5 }, - { "matrix": [1, 1], "x":1.5, "y":1 }, - { "matrix": [1, 2], "x":2.5, "y":1 }, - { "matrix": [1, 3], "x":3.5, "y":1 }, - { "matrix": [1, 4], "x":4.5, "y":1 }, - { "matrix": [1, 5], "x":5.5, "y":1 }, - { "matrix": [1, 6], "x":6.5, "y":1 }, - { "matrix": [1, 7], "x":7.5, "y":1 }, - { "matrix": [1, 8], "x":8.5, "y":1 }, - { "matrix": [1, 9], "x":9.5, "y":1 }, - { "matrix": [1, 10], "x":10.5, "y":1 }, - { "matrix": [1, 11], "x":11.5, "y":1 }, - { "matrix": [1, 12], "x":12.5, "y":1 }, - { "matrix": [1, 13], "x":13.5, "y":1, "w":1.5 }, - { "matrix": [1, 14], "x":15, "y":1 }, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, - { "matrix": [2, 0], "x":0, "y":2, "w":1.75 }, - { "matrix": [2, 1], "x":1.75, "y":2 }, - { "matrix": [2, 2], "x":2.75, "y":2 }, - { "matrix": [2, 3], "x":3.75, "y":2 }, - { "matrix": [2, 4], "x":4.75, "y":2 }, - { "matrix": [2, 5], "x":5.75, "y":2 }, - { "matrix": [2, 6], "x":6.75, "y":2 }, - { "matrix": [2, 7], "x":7.75, "y":2 }, - { "matrix": [2, 8], "x":8.75, "y":2 }, - { "matrix": [2, 9], "x":9.75, "y":2 }, - { "matrix": [2, 10], "x":10.75, "y":2 }, - { "matrix": [2, 11], "x":11.75, "y":2 }, - { "matrix": [2, 13], "x":12.75, "y":2, "w":2.25 }, - { "matrix": [2, 14], "x":15, "y":2 }, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, - { "matrix": [3, 0], "x":0, "y":3, "w":2.25 }, - { "matrix": [3, 2], "x":2.25, "y":3 }, - { "matrix": [3, 3], "x":3.25, "y":3 }, - { "matrix": [3, 4], "x":4.25, "y":3 }, - { "matrix": [3, 5], "x":5.25, "y":3 }, - { "matrix": [3, 6], "x":6.25, "y":3 }, - { "matrix": [3, 7], "x":7.25, "y":3 }, - { "matrix": [3, 8], "x":8.25, "y":3 }, - { "matrix": [3, 9], "x":9.25, "y":3 }, - { "matrix": [3, 10], "x":10.25, "y":3 }, - { "matrix": [3, 11], "x":11.25, "y":3 }, - { "matrix": [3, 12], "x":12.25, "y":3, "w":1.75 }, - { "matrix": [3, 13], "x":14, "y":3 }, - { "matrix": [3, 14], "x":15, "y":3 }, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, - { "matrix": [4, 0], "x":0, "y":4, "w":1.25 }, - { "matrix": [4, 1], "x":1.25, "y":4, "w":1.25 }, - { "matrix": [4, 3], "x":2.5, "y":4, "w":1.25 }, - { "matrix": [4, 6], "x":3.75, "y":4, "w":6.25 }, - { "matrix": [4, 10], "x":10, "y":4, "w":1.25 }, - { "matrix": [4, 11], "x":11.25, "y":4, "w":1.25 }, - { "matrix": [4, 12], "x":13, "y":4 }, - { "matrix": [4, 13], "x":14, "y":4 }, - { "matrix": [4, 14], "x":15, "y":4 } + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} ] } } diff --git a/keyboards/idobao/id67/rules.mk b/keyboards/idobao/id67/rules.mk index ce58b87be5..4341508fde 100644 --- a/keyboards/idobao/id67/rules.mk +++ b/keyboards/idobao/id67/rules.mk @@ -2,4 +2,3 @@ # change yes to no to disable # RGB_MATRIX_ENABLE = yes # Enable RGB Matrix feature -RGB_MATRIX_DRIVER = WS2812 # ID67 uses WS2812 driver diff --git a/keyboards/idobao/id75/keymaps/egstad/config.h b/keyboards/idobao/id75/keymaps/egstad/config.h index c0227431fb..7e1868813f 100644 --- a/keyboards/idobao/id75/keymaps/egstad/config.h +++ b/keyboards/idobao/id75/keymaps/egstad/config.h @@ -16,7 +16,6 @@ #pragma once #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT #define RGBLIGHT_SLEEP diff --git a/keyboards/idobao/id75/keymaps/gkbd_75/config.h b/keyboards/idobao/id75/keymaps/gkbd_75/config.h index 7813d776e5..d969bd88a2 100644 --- a/keyboards/idobao/id75/keymaps/gkbd_75/config.h +++ b/keyboards/idobao/id75/keymaps/gkbd_75/config.h @@ -17,5 +17,4 @@ #pragma once #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD diff --git a/keyboards/idobao/id75/keymaps/gkbd_orthon/config.h b/keyboards/idobao/id75/keymaps/gkbd_orthon/config.h index e8fc39faad..3e8dcc7570 100644 --- a/keyboards/idobao/id75/keymaps/gkbd_orthon/config.h +++ b/keyboards/idobao/id75/keymaps/gkbd_orthon/config.h @@ -17,4 +17,3 @@ #pragma once #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/idobao/id75/v1/config.h b/keyboards/idobao/id75/v1/config.h index 54f0fc0c7c..2174e39bd2 100644 --- a/keyboards/idobao/id75/v1/config.h +++ b/keyboards/idobao/id75/v1/config.h @@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B0, B3, C7, B6, C6 } -#define MATRIX_COL_PINS { F6, F5, F4, F1, E6, D5, D3, D2, D1, D0, D4, D6, D7, B4, B5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN F0 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_CHRISTMAS @@ -51,7 +32,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/idobao/id75/v1/info.json b/keyboards/idobao/id75/v1/info.json index a192072701..1407d02c80 100644 --- a/keyboards/idobao/id75/v1/info.json +++ b/keyboards/idobao/id75/v1/info.json @@ -8,6 +8,14 @@ "pid": "0x0075", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F5", "F4", "F1", "E6", "D5", "D3", "D2", "D1", "D0", "D4", "D6", "D7", "B4", "B5"], + "rows": ["B0", "B3", "C7", "B6", "C6"] + }, + "ws2812": { + "pin": "F0" + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true @@ -17,7 +25,87 @@ "community_layouts": ["ortho_5x15"], "layouts": { "LAYOUT_ortho_5x15": { - "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":12, "y":0}, {"x":13, "y":0}, {"x":14, "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":12, "y":1}, {"x":13, "y":1}, {"x":14, "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":12, "y":2}, {"x":13, "y":2}, {"x":14, "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":12, "y":3}, {"x":13, "y":3}, {"x":14, "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}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [1, 14], "x": 14, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [2, 12], "x": 12, "y": 2}, + {"matrix": [2, 13], "x": 13, "y": 2}, + {"matrix": [2, 14], "x": 14, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 6], "x": 6, "y": 4}, + {"matrix": [4, 7], "x": 7, "y": 4}, + {"matrix": [4, 8], "x": 8, "y": 4}, + {"matrix": [4, 9], "x": 9, "y": 4}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4} + ] } } } diff --git a/keyboards/idobao/id75/v1/v1.c b/keyboards/idobao/id75/v1/v1.c deleted file mode 100644 index 992a292616..0000000000 --- a/keyboards/idobao/id75/v1/v1.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2018 MechMerlin - * - * 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/>. - */ -#include "v1.h" diff --git a/keyboards/idobao/id75/v1/v1.h b/keyboards/idobao/id75/v1/v1.h deleted file mode 100644 index 9643a1efd3..0000000000 --- a/keyboards/idobao/id75/v1/v1.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2018 MechMerlin - * - * 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 - -#include "quantum.h" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT_ortho_5x15( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E } \ -} diff --git a/keyboards/idobao/id75/v2/config.h b/keyboards/idobao/id75/v2/config.h index d44e54d32c..54d74c8da5 100644 --- a/keyboards/idobao/id75/v2/config.h +++ b/keyboards/idobao/id75/v2/config.h @@ -16,25 +16,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B0, B3, C7, B6, C6 } -#define MATRIX_COL_PINS { F6, F5, F4, F1, E6, D5, D3, D2, D1, D0, D4, D6, D7, B4, B5 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -#undef RGB_DI_PIN -#define RGB_DI_PIN F0 #ifdef RGB_MATRIX_ENABLE # define RGB_MATRIX_LED_COUNT 85 /* 10 Bottom 75 top*/ // RGB Matrix Animation modes. Explicitly enabled diff --git a/keyboards/idobao/id75/v2/info.json b/keyboards/idobao/id75/v2/info.json index 558cbda3c8..5275c54dbb 100644 --- a/keyboards/idobao/id75/v2/info.json +++ b/keyboards/idobao/id75/v2/info.json @@ -8,91 +8,102 @@ "pid": "0x0075", "device_version": "0.0.2" }, + "ws2812": { + "pin": "F0" + }, + "rgb_matrix": { + "driver": "WS2812" + }, + "matrix_pins": { + "cols": ["F6", "F5", "F4", "F1", "E6", "D5", "D3", "D2", "D1", "D0", "D4", "D6", "D7", "B4", "B5"], + "rows": ["B0", "B3", "C7", "B6", "C6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x15"], "layouts": { "LAYOUT_ortho_5x15": { "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":12, "y":0}, - {"x":13, "y":0}, - {"x":14, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "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":12, "y":1}, - {"x":13, "y":1}, - {"x":14, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [1, 14], "x": 14, "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":12, "y":2}, - {"x":13, "y":2}, - {"x":14, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [2, 12], "x": 12, "y": 2}, + {"matrix": [2, 13], "x": 13, "y": 2}, + {"matrix": [2, 14], "x": 14, "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":12, "y":3}, - {"x":13, "y":3}, - {"x":14, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3}, + {"matrix": [3, 14], "x": 14, "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}, - {"x":12, "y":4}, - {"x":13, "y":4}, - {"x":14, "y":4} + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 6], "x": 6, "y": 4}, + {"matrix": [4, 7], "x": 7, "y": 4}, + {"matrix": [4, 8], "x": 8, "y": 4}, + {"matrix": [4, 9], "x": 9, "y": 4}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4} ] } } diff --git a/keyboards/idobao/id75/v2/rules.mk b/keyboards/idobao/id75/v2/rules.mk index a29a20b766..38f5eb554b 100644 --- a/keyboards/idobao/id75/v2/rules.mk +++ b/keyboards/idobao/id75/v2/rules.mk @@ -13,4 +13,3 @@ AUDIO_ENABLE = no # Audio output LTO_ENABLE = yes # Use link time optimization RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 diff --git a/keyboards/idobao/id75/v2/v2.c b/keyboards/idobao/id75/v2/v2.c index f65a9e3362..55d58d92e1 100644 --- a/keyboards/idobao/id75/v2/v2.c +++ b/keyboards/idobao/id75/v2/v2.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "v2.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/idobao/id75/v2/v2.h b/keyboards/idobao/id75/v2/v2.h deleted file mode 100644 index 9643a1efd3..0000000000 --- a/keyboards/idobao/id75/v2/v2.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2018 MechMerlin - * - * 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 - -#include "quantum.h" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT_ortho_5x15( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E } \ -} diff --git a/keyboards/idobao/id80/v2/ansi/info.json b/keyboards/idobao/id80/v2/ansi/info.json index 0e19a2b10b..5a78220ee2 100644 --- a/keyboards/idobao/id80/v2/ansi/info.json +++ b/keyboards/idobao/id80/v2/ansi/info.json @@ -6,91 +6,91 @@ "layouts": { "LAYOUT_ansi": { "layout": [ - {"label":"Esc", "matrix":[0, 5], "x":0, "y":0}, - {"label":"F1", "matrix":[1, 5], "x":1.25, "y":0}, - {"label":"F2", "matrix":[2, 5], "x":2.25, "y":0}, - {"label":"F3", "matrix":[3, 5], "x":3.25, "y":0}, - {"label":"F4", "matrix":[4, 5], "x":4.25, "y":0}, - {"label":"F5", "matrix":[5, 5], "x":5.5, "y":0}, - {"label":"F6", "matrix":[6, 5], "x":6.5, "y":0}, - {"label":"F7", "matrix":[7, 5], "x":7.5, "y":0}, - {"label":"F8", "matrix":[8, 5], "x":8.5, "y":0}, - {"label":"F9", "matrix":[7, 10], "x":9.75, "y":0}, - {"label":"F10", "matrix":[5, 10], "x":10.75, "y":0}, - {"label":"F11", "matrix":[4, 10], "x":11.75, "y":0}, - {"label":"F12", "matrix":[3, 10], "x":12.75, "y":0}, - {"label":"Fn", "matrix":[6, 10], "x":14, "y":0}, - {"label":"Insert", "matrix":[2, 10], "x":15.25, "y":0}, + {"label": "Esc", "matrix": [0, 5], "x": 0, "y": 0}, + {"label": "F1", "matrix": [1, 5], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [2, 5], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [3, 5], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [4, 5], "x": 4.25, "y": 0}, + {"label": "F5", "matrix": [5, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [6, 5], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [7, 5], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [8, 5], "x": 8.5, "y": 0}, + {"label": "F9", "matrix": [7, 10], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [5, 10], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [4, 10], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [3, 10], "x": 12.75, "y": 0}, + {"label": "Fn", "matrix": [6, 10], "x": 14, "y": 0}, + {"label": "Insert", "matrix": [2, 10], "x": 15.25, "y": 0}, - {"label":"`", "matrix":[0, 4], "x":0, "y":1.25}, - {"label":"1", "matrix":[1, 4], "x":1, "y":1.25}, - {"label":"2", "matrix":[2, 4], "x":2, "y":1.25}, - {"label":"3", "matrix":[3, 4], "x":3, "y":1.25}, - {"label":"4", "matrix":[4, 4], "x":4, "y":1.25}, - {"label":"5", "matrix":[5, 4], "x":5, "y":1.25}, - {"label":"6", "matrix":[6, 4], "x":6, "y":1.25}, - {"label":"7", "matrix":[7, 4], "x":7, "y":1.25}, - {"label":"8", "matrix":[8, 4], "x":8, "y":1.25}, - {"label":"9", "matrix":[8, 9], "x":9, "y":1.25}, - {"label":"0", "matrix":[7, 9], "x":10, "y":1.25}, - {"label":"-", "matrix":[5, 9], "x":11, "y":1.25}, - {"label":"=", "matrix":[4, 9], "x":12, "y":1.25}, - {"label":"Backspace", "matrix":[6, 9], "x":13, "y":1.25, "w":2}, - {"label":"Home", "matrix":[2, 9], "x":15.25, "y":1.25}, + {"label": "`", "matrix": [0, 4], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 4], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [2, 4], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [3, 4], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [4, 4], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [5, 4], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [6, 4], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [7, 4], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [8, 4], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [8, 9], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [7, 9], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [5, 9], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [4, 9], "x": 12, "y": 1.25}, + {"label": "Backspace", "matrix": [6, 9], "x": 13, "y": 1.25, "w": 2}, + {"label": "Home", "matrix": [2, 9], "x": 15.25, "y": 1.25}, - {"label":"Tab", "matrix":[0, 3], "x":0, "y":2.2, "w":1.55}, - {"label":"Q", "matrix":[1, 3], "x":1.5, "y":2.25}, - {"label":"W", "matrix":[2, 3], "x":2.5, "y":2.25}, - {"label":"E", "matrix":[3, 3], "x":3.5, "y":2.25}, - {"label":"R", "matrix":[4, 3], "x":4.5, "y":2.25}, - {"label":"T", "matrix":[5, 3], "x":5.5, "y":2.25}, - {"label":"Y", "matrix":[6, 3], "x":6.5, "y":2.25}, - {"label":"U", "matrix":[7, 3], "x":7.5, "y":2.25}, - {"label":"I", "matrix":[8, 3], "x":8.5, "y":2.25}, - {"label":"O", "matrix":[8, 8], "x":9.5, "y":2.25}, - {"label":"P", "matrix":[7, 8], "x":10.5, "y":2.25}, - {"label":"[", "matrix":[5, 8], "x":11.5, "y":2.25}, - {"label":"]", "matrix":[4, 8], "x":12.5, "y":2.25}, - {"label":"\\", "matrix":[3, 8], "x":13.5, "y":2.25, "w":1.5}, - {"label":"Delete", "matrix":[2, 8], "x":15.25, "y":2.25}, + {"label": "Tab", "matrix": [0, 3], "x": 0, "y": 2.2, "w": 1.55}, + {"label": "Q", "matrix": [1, 3], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [2, 3], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [3, 3], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [4, 3], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [5, 3], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [6, 3], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [7, 3], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [8, 3], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [8, 8], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [7, 8], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [5, 8], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [4, 8], "x": 12.5, "y": 2.25}, + {"label": "\\", "matrix": [3, 8], "x": 13.5, "y": 2.25, "w": 1.5}, + {"label": "Delete", "matrix": [2, 8], "x": 15.25, "y": 2.25}, - {"label":"Caps Lock", "matrix":[0, 2], "x":0, "y":3.25, "w":1.75}, - {"label":"A", "matrix":[1, 2], "x":1.75, "y":3.25}, - {"label":"S", "matrix":[2, 2], "x":2.75, "y":3.25}, - {"label":"D", "matrix":[3, 2], "x":3.75, "y":3.25}, - {"label":"F", "matrix":[4, 2], "x":4.75, "y":3.25}, - {"label":"G", "matrix":[5, 2], "x":5.75, "y":3.25}, - {"label":"H", "matrix":[6, 2], "x":6.75, "y":3.25}, - {"label":"J", "matrix":[7, 2], "x":7.75, "y":3.25}, - {"label":"K", "matrix":[8, 2], "x":8.75, "y":3.25}, - {"label":"L", "matrix":[8, 7], "x":9.75, "y":3.25}, - {"label":";", "matrix":[7, 7], "x":10.75, "y":3.25}, - {"label":"'", "matrix":[5, 7], "x":11.75, "y":3.25}, - {"label":"Enter", "matrix":[4, 7], "x":12.75, "y":3.25 , "w":2.25}, + {"label": "Caps Lock", "matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [1, 2], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [3, 2], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [6, 2], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [7, 2], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [8, 2], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [8, 7], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [7, 7], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [5, 7], "x": 11.75, "y": 3.25}, + {"label": "Enter", "matrix": [4, 7], "x": 12.75, "y": 3.25, "w": 2.25}, - {"label":"Shift", "matrix":[0, 1], "x":0, "y":4.25 , "w":2.25}, - {"label":"Z", "matrix":[2, 1], "x":2.25, "y":4.25}, - {"label":"X", "matrix":[3, 1], "x":3.25, "y":4.25}, - {"label":"C", "matrix":[4, 1], "x":4.25, "y":4.25}, - {"label":"V", "matrix":[5, 1], "x":5.25, "y":4.25}, - {"label":"B", "matrix":[6, 1], "x":6.25, "y":4.25}, - {"label":"N", "matrix":[7, 1], "x":7.25, "y":4.25}, - {"label":"M", "matrix":[8, 1], "x":8.25, "y":4.25}, - {"label":",", "matrix":[8, 6], "x":9.25, "y":4.25}, - {"label":".", "matrix":[7, 6], "x":10.25, "y":4.25}, - {"label":"/", "matrix":[5, 6], "x":11.25, "y":4.25}, - {"label":"Shift", "matrix":[4, 6], "x":12.25, "y":4.25 , "w":1.75}, - {"label":"\u2191", "matrix":[3, 6], "x":14.25, "y":4.5}, + {"label": "Shift", "matrix": [0, 1], "x": 0, "y": 4.25, "w": 2.25}, + {"label": "Z", "matrix": [2, 1], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [3, 1], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [4, 1], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [5, 1], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [6, 1], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [7, 1], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [8, 1], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [8, 6], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [7, 6], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [5, 6], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [4, 6], "x": 12.25, "y": 4.25, "w": 1.75}, + {"label": "\u2191", "matrix": [3, 6], "x": 14.25, "y": 4.5}, - {"label":"Ctrl", "matrix":[0, 0], "x":0, "y":5.25 , "w":1.25}, - {"label":"Win", "matrix":[1, 0], "x":1.25, "y":5.25 , "w":1.25}, - {"label":"Alt", "matrix":[2, 0], "x":2.5, "y":5.25 , "w":1.25}, - {"label":"K06", "matrix":[6, 0], "x":3.75, "y":5.25 , "w":6.25}, - {"label":"Alt", "matrix":[8, 0], "x":10, "y":5.25 , "w":1.5}, - {"label":"Ctrl", "matrix":[7, 0], "x":11.5, "y":5.25 , "w":1.5}, - {"label":"\u2190", "matrix":[5, 0], "x":13.25, "y":5.5}, - {"label":"\u2193", "matrix":[4, 0], "x":14.25, "y":5.5}, - {"label":"\u2192", "matrix":[3, 0], "x":15.25, "y":5.5} + {"label": "Ctrl", "matrix": [0, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"label": "Win", "matrix": [1, 0], "x": 1.25, "y": 5.25, "w": 1.25}, + {"label": "Alt", "matrix": [2, 0], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "K06", "matrix": [6, 0], "x": 3.75, "y": 5.25, "w": 6.25}, + {"label": "Alt", "matrix": [8, 0], "x": 10, "y": 5.25, "w": 1.5}, + {"label": "Ctrl", "matrix": [7, 0], "x": 11.5, "y": 5.25, "w": 1.5}, + {"label": "\u2190", "matrix": [5, 0], "x": 13.25, "y": 5.5}, + {"label": "\u2193", "matrix": [4, 0], "x": 14.25, "y": 5.5}, + {"label": "\u2192", "matrix": [3, 0], "x": 15.25, "y": 5.5} ] } } diff --git a/keyboards/idobao/id80/v2/ansi/keymaps/msf/config.h b/keyboards/idobao/id80/v2/ansi/keymaps/msf/config.h index 4f3cc95f30..2a432a5b2e 100644 --- a/keyboards/idobao/id80/v2/ansi/keymaps/msf/config.h +++ b/keyboards/idobao/id80/v2/ansi/keymaps/msf/config.h @@ -20,5 +20,4 @@ */ #pragma once -#define COMBO_COUNT 3 #define COMBO_TERM 200 diff --git a/keyboards/idobao/id80/v2/ansi/keymaps/msf/keymap.c b/keyboards/idobao/id80/v2/ansi/keymaps/msf/keymap.c index ae8b42851c..bdcb153413 100644 --- a/keyboards/idobao/id80/v2/ansi/keymaps/msf/keymap.c +++ b/keyboards/idobao/id80/v2/ansi/keymaps/msf/keymap.c @@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, _______, RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, NK_TOGG, _______, _______, _______, _______, _______, BL_UP, + _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, NK_TOGG, _______, _______, _______, _______, _______, BL_UP, _______, _______, _______, _______, _______, _______, BL_TOGG, BL_DOWN, BL_STEP ), [2] = LAYOUT_ansi( @@ -52,7 +52,7 @@ const uint16_t PROGMEM slashDown_combo[] = {KC_SLSH, KC_DOWN, COMBO_END}; const uint16_t PROGMEM slashUp_combo[] = {KC_SLSH, KC_UP, COMBO_END}; const uint16_t PROGMEM raltBackspace_combo[] = {KC_RALT, KC_BSPC, COMBO_END}; -combo_t key_combos[COMBO_COUNT] = { +combo_t key_combos[] = { [SLSHDN_PGDN] = COMBO(slashDown_combo, KC_PGDN), [SLSHUP_PGUP] = COMBO(slashUp_combo, KC_PGUP), [RALTBKSPC_DELETE] = COMBO(raltBackspace_combo, KC_DEL), diff --git a/keyboards/idobao/id80/v2/config.h b/keyboards/idobao/id80/v2/config.h index d3eb71dc92..aa409bc487 100644 --- a/keyboards/idobao/id80/v2/config.h +++ b/keyboards/idobao/id80/v2/config.h @@ -17,39 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - * The matrix description in the vendor-supplied JSON file for kbfirmware.com - * had 9 columns: - * { D0, D1, D2, D3, D5, D4, D6, D7, B4 } - * and 12 rows: - * { B7, B3, B2, B1, B0, E6, F0, F1, F4, F5, F6, F7 } - * However, the row 6 was completely empty, and the pin F0 was not actually - * routed anywhere on the PCB, therefore this row was removed to save some - * resources (the EEPROM space for dynamic keymaps is especially scarce). - * - * After doing the above change, the matrix was transposed (rows and columns - * were swapped), because a matrix with the COL2ROW layout can be scanned much - * more efficiently than a matrix with the ROW2COL layout (depending on various - * optimizations, the difference in scan rate can be over 2 times). Because of - * this, the "columns" in the matrix layout now mostly correspond to physical - * rows, and the "rows" have mostly vertical physical orientation. - */ -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 } -#define MATRIX_COL_PINS { B7, B3, B2, B1, B0, E6, F1, F4, F5, F6, F7 } - -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 20 /* 16 underglow LEDs, 4 top LEDs */ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -67,4 +34,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_SNAKE #define RGBLIGHT_EFFECT_STATIC_GRADIENT #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/idobao/id80/v2/info.json b/keyboards/idobao/id80/v2/info.json index 89b64f3951..247c3cb113 100644 --- a/keyboards/idobao/id80/v2/info.json +++ b/keyboards/idobao/id80/v2/info.json @@ -6,10 +6,18 @@ "vid": "0x6964", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B7", "B3", "B2", "B1", "B0", "E6", "F1", "F4", "F5", "F6", "F7"], + "rows": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "breathing": true }, + "ws2812": { + "pin": "E2" + }, "indicators": { "caps_lock": "C7", "on_state": 0 diff --git a/keyboards/idobao/id80/v2/iso/info.json b/keyboards/idobao/id80/v2/iso/info.json index b35f559e48..cdaeab4251 100644 --- a/keyboards/idobao/id80/v2/iso/info.json +++ b/keyboards/idobao/id80/v2/iso/info.json @@ -6,92 +6,92 @@ "layouts": { "LAYOUT_iso": { "layout": [ - {"label":"Esc", "matrix":[0, 5], "x":0, "y":0}, - {"label":"F1", "matrix":[1, 5], "x":1.25, "y":0}, - {"label":"F2", "matrix":[2, 5], "x":2.25, "y":0}, - {"label":"F3", "matrix":[3, 5], "x":3.25, "y":0}, - {"label":"F4", "matrix":[4, 5], "x":4.25, "y":0}, - {"label":"F5", "matrix":[5, 5], "x":5.5, "y":0}, - {"label":"F6", "matrix":[6, 5], "x":6.5, "y":0}, - {"label":"F7", "matrix":[7, 5], "x":7.5, "y":0}, - {"label":"F8", "matrix":[8, 5], "x":8.5, "y":0}, - {"label":"F9", "matrix":[7, 10], "x":9.75, "y":0}, - {"label":"F10", "matrix":[5, 10], "x":10.75, "y":0}, - {"label":"F11", "matrix":[4, 10], "x":11.75, "y":0}, - {"label":"F12", "matrix":[3, 10], "x":12.75, "y":0}, - {"label":"Fn", "matrix":[6, 10], "x":14, "y":0}, - {"label":"Insert", "matrix":[2, 10], "x":15.25, "y":0}, + {"label": "Esc", "matrix": [0, 5], "x": 0, "y": 0}, + {"label": "F1", "matrix": [1, 5], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [2, 5], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [3, 5], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [4, 5], "x": 4.25, "y": 0}, + {"label": "F5", "matrix": [5, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [6, 5], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [7, 5], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [8, 5], "x": 8.5, "y": 0}, + {"label": "F9", "matrix": [7, 10], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [5, 10], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [4, 10], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [3, 10], "x": 12.75, "y": 0}, + {"label": "Fn", "matrix": [6, 10], "x": 14, "y": 0}, + {"label": "Insert", "matrix": [2, 10], "x": 15.25, "y": 0}, - {"label":"`", "matrix":[0, 4], "x":0, "y":1.25}, - {"label":"1", "matrix":[1, 4], "x":1, "y":1.25}, - {"label":"2", "matrix":[2, 4], "x":2, "y":1.25}, - {"label":"3", "matrix":[3, 4], "x":3, "y":1.25}, - {"label":"4", "matrix":[4, 4], "x":4, "y":1.25}, - {"label":"5", "matrix":[5, 4], "x":5, "y":1.25}, - {"label":"6", "matrix":[6, 4], "x":6, "y":1.25}, - {"label":"7", "matrix":[7, 4], "x":7, "y":1.25}, - {"label":"8", "matrix":[8, 4], "x":8, "y":1.25}, - {"label":"9", "matrix":[8, 9], "x":9, "y":1.25}, - {"label":"0", "matrix":[7, 9], "x":10, "y":1.25}, - {"label":"-", "matrix":[5, 9], "x":11, "y":1.25}, - {"label":"=", "matrix":[4, 9], "x":12, "y":1.25}, - {"label":"Backspace", "matrix":[6, 9], "x":13, "y":1.25, "w":2}, - {"label":"Home", "matrix":[2, 9], "x":15.25, "y":1.25}, + {"label": "`", "matrix": [0, 4], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 4], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [2, 4], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [3, 4], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [4, 4], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [5, 4], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [6, 4], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [7, 4], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [8, 4], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [8, 9], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [7, 9], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [5, 9], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [4, 9], "x": 12, "y": 1.25}, + {"label": "Backspace", "matrix": [6, 9], "x": 13, "y": 1.25, "w": 2}, + {"label": "Home", "matrix": [2, 9], "x": 15.25, "y": 1.25}, - {"label":"Tab", "matrix":[0, 3], "x":0, "y":2.25, "w":1.5}, - {"label":"Q", "matrix":[1, 3], "x":1.5, "y":2.25}, - {"label":"W", "matrix":[2, 3], "x":2.5, "y":2.25}, - {"label":"E", "matrix":[3, 3], "x":3.5, "y":2.25}, - {"label":"R", "matrix":[4, 3], "x":4.5, "y":2.25}, - {"label":"T", "matrix":[5, 3], "x":5.5, "y":2.25}, - {"label":"Y", "matrix":[6, 3], "x":6.5, "y":2.25}, - {"label":"U", "matrix":[7, 3], "x":7.5, "y":2.25}, - {"label":"I", "matrix":[8, 3], "x":8.5, "y":2.25}, - {"label":"O", "matrix":[8, 8], "x":9.5, "y":2.25}, - {"label":"P", "matrix":[7, 8], "x":10.5, "y":2.25}, - {"label":"[", "matrix":[5, 8], "x":11.5, "y":2.25}, - {"label":"]", "matrix":[4, 8], "x":12.5, "y":2.25}, - {"label":"Delete", "matrix":[2, 8], "x":15.25, "y":2.25}, + {"label": "Tab", "matrix": [0, 3], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [1, 3], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [2, 3], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [3, 3], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [4, 3], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [5, 3], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [6, 3], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [7, 3], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [8, 3], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [8, 8], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [7, 8], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [5, 8], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [4, 8], "x": 12.5, "y": 2.25}, + {"label": "Delete", "matrix": [2, 8], "x": 15.25, "y": 2.25}, - {"label":"Caps Lock", "matrix":[0, 2], "x":0, "y":3.25, "w":1.75}, - {"label":"A", "matrix":[1, 2], "x":1.75, "y":3.25}, - {"label":"S", "matrix":[2, 2], "x":2.75, "y":3.25}, - {"label":"D", "matrix":[3, 2], "x":3.75, "y":3.25}, - {"label":"F", "matrix":[4, 2], "x":4.75, "y":3.25}, - {"label":"G", "matrix":[5, 2], "x":5.75, "y":3.25}, - {"label":"H", "matrix":[6, 2], "x":6.75, "y":3.25}, - {"label":"J", "matrix":[7, 2], "x":7.75, "y":3.25}, - {"label":"K", "matrix":[8, 2], "x":8.75, "y":3.25}, - {"label":"L", "matrix":[8, 7], "x":9.75, "y":3.25}, - {"label":";", "matrix":[7, 7], "x":10.75, "y":3.25}, - {"label":"'", "matrix":[5, 7], "x":11.75, "y":3.25}, - {"label":"ISO #", "matrix":[4, 7], "x":12.75, "y":3.25}, - {"label":"Enter", "matrix":[3, 8], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"label": "Caps Lock", "matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [1, 2], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [3, 2], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [4, 2], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [5, 2], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [6, 2], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [7, 2], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [8, 2], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [8, 7], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [7, 7], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [5, 7], "x": 11.75, "y": 3.25}, + {"label": "ISO #", "matrix": [4, 7], "x": 12.75, "y": 3.25}, + {"label": "Enter", "matrix": [3, 8], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, - {"label":"Shift", "matrix":[0, 1], "x":0, "y":4.25, "w":1.25}, - {"label":"ISO \\", "matrix":[1, 1], "x":1.25, "y":4.25}, - {"label":"Z", "matrix":[2, 1], "x":2.25, "y":4.25}, - {"label":"X", "matrix":[3, 1], "x":3.25, "y":4.25}, - {"label":"C", "matrix":[4, 1], "x":4.25, "y":4.25}, - {"label":"V", "matrix":[5, 1], "x":5.25, "y":4.25}, - {"label":"B", "matrix":[6, 1], "x":6.25, "y":4.25}, - {"label":"N", "matrix":[7, 1], "x":7.25, "y":4.25}, - {"label":"M", "matrix":[8, 1], "x":8.25, "y":4.25}, - {"label":",", "matrix":[8, 6], "x":9.25, "y":4.25}, - {"label":".", "matrix":[7, 6], "x":10.25, "y":4.25}, - {"label":"/", "matrix":[5, 6], "x":11.25, "y":4.25}, - {"label":"Shift", "matrix":[4, 6], "x":12.25, "y":4.25, "w":1.75}, - {"label":"Up", "matrix":[3, 6], "x":14.25, "y":4.5}, + {"label": "Shift", "matrix": [0, 1], "x": 0, "y": 4.25, "w": 1.25}, + {"label": "ISO \\", "matrix": [1, 1], "x": 1.25, "y": 4.25}, + {"label": "Z", "matrix": [2, 1], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [3, 1], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [4, 1], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [5, 1], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [6, 1], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [7, 1], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [8, 1], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [8, 6], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [7, 6], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [5, 6], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [4, 6], "x": 12.25, "y": 4.25, "w": 1.75}, + {"label": "Up", "matrix": [3, 6], "x": 14.25, "y": 4.5}, - {"label":"Ctrl", "matrix":[0, 0], "x":0, "y":5.25, "w":1.25}, - {"label":"GUI", "matrix":[1, 0], "x":1.25, "y":5.25, "w":1.25}, - {"label":"Alt", "matrix":[2, 0], "x":2.5, "y":5.25, "w":1.25}, - {"label":"Space", "matrix":[6, 0], "x":3.75, "y":5.25, "w":6.25}, - {"label":"Alt", "matrix":[8, 0], "x":10, "y":5.25, "w":1.5}, - {"label":"Ctrl", "matrix":[7, 0], "x":11.5, "y":5.25, "w":1.5}, - {"label":"Left", "matrix":[5, 0], "x":13.25, "y":5.5}, - {"label":"Down", "matrix":[4, 0], "x":14.25, "y":5.5}, - {"label":"Right", "matrix":[3, 0], "x":15.25, "y":5.5} + {"label": "Ctrl", "matrix": [0, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [1, 0], "x": 1.25, "y": 5.25, "w": 1.25}, + {"label": "Alt", "matrix": [2, 0], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "Space", "matrix": [6, 0], "x": 3.75, "y": 5.25, "w": 6.25}, + {"label": "Alt", "matrix": [8, 0], "x": 10, "y": 5.25, "w": 1.5}, + {"label": "Ctrl", "matrix": [7, 0], "x": 11.5, "y": 5.25, "w": 1.5}, + {"label": "Left", "matrix": [5, 0], "x": 13.25, "y": 5.5}, + {"label": "Down", "matrix": [4, 0], "x": 14.25, "y": 5.5}, + {"label": "Right", "matrix": [3, 0], "x": 15.25, "y": 5.5} ] } } diff --git a/keyboards/idobao/id80/v3/ansi/ansi.c b/keyboards/idobao/id80/v3/ansi/ansi.c index 2b298924cf..75f995fbbe 100644 --- a/keyboards/idobao/id80/v3/ansi/ansi.c +++ b/keyboards/idobao/id80/v3/ansi/ansi.c @@ -1,7 +1,7 @@ // Copyright 2022 Vino Rodrigues (@vinorodrigues) // SPDX-License-Identifier: GPL-2.0-or-later -#include "ansi.h" +#include "quantum.h" #define __ NO_LED diff --git a/keyboards/idobao/id80/v3/ansi/ansi.h b/keyboards/idobao/id80/v3/ansi/ansi.h deleted file mode 100644 index d9bef6d021..0000000000 --- a/keyboards/idobao/id80/v3/ansi/ansi.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2022 Vino Rodrigues (@vinorodrigues) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" diff --git a/keyboards/idobao/id80/v3/ansi/config.h b/keyboards/idobao/id80/v3/ansi/config.h index bdabde0782..afe880fa8a 100644 --- a/keyboards/idobao/id80/v3/ansi/config.h +++ b/keyboards/idobao/id80/v3/ansi/config.h @@ -7,10 +7,8 @@ * RGB Matrix stuff * ---------------- */ -#define RGB_DI_PIN E2 - // RGB Matrix config -#if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE) +#if defined(RGB_MATRIX_ENABLE) #define RGB_MATRIX_LED_COUNT 94 diff --git a/keyboards/idobao/id80/v3/ansi/info.json b/keyboards/idobao/id80/v3/ansi/info.json index 9797c60dfe..816e55208f 100644 --- a/keyboards/idobao/id80/v3/ansi/info.json +++ b/keyboards/idobao/id80/v3/ansi/info.json @@ -14,6 +14,9 @@ "backlight": false, "rgblight": false }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["B7", "B3", "B2", "B1", "B0", "E6", "F1", "F4", "F5", "F6", "F7"], "rows": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"] @@ -25,99 +28,102 @@ "pid": "0x0380", "device_version": "3.0.0" }, + "ws2812": { + "pin": "E2" + }, "bootmagic": { "matrix": [0, 5] }, "layouts": { "LAYOUT_80_ansi": { "layout": [ - { "matrix": [0, 5], "x": 0, "y": 0 }, - { "matrix": [1, 5], "x": 1.25, "y": 0 }, - { "matrix": [2, 5], "x": 2.25, "y": 0 }, - { "matrix": [3, 5], "x": 3.25, "y": 0 }, - { "matrix": [4, 5], "x": 4.25, "y": 0 }, - { "matrix": [5, 5], "x": 5.5, "y": 0 }, - { "matrix": [6, 5], "x": 6.5, "y": 0 }, - { "matrix": [7, 5], "x": 7.5, "y": 0 }, - { "matrix": [8, 5], "x": 8.5, "y": 0 }, - { "matrix": [7, 10], "x": 9.75, "y": 0 }, - { "matrix": [5, 10], "x": 10.75, "y": 0 }, - { "matrix": [4, 10], "x": 11.75, "y": 0 }, - { "matrix": [3, 10], "x": 12.75, "y": 0 }, - { "matrix": [6, 10], "x": 14, "y": 0 }, - { "matrix": [2, 10], "x": 15.25, "y": 0 }, + {"matrix": [0, 5], "x": 0, "y": 0}, + {"matrix": [1, 5], "x": 1.25, "y": 0}, + {"matrix": [2, 5], "x": 2.25, "y": 0}, + {"matrix": [3, 5], "x": 3.25, "y": 0}, + {"matrix": [4, 5], "x": 4.25, "y": 0}, + {"matrix": [5, 5], "x": 5.5, "y": 0}, + {"matrix": [6, 5], "x": 6.5, "y": 0}, + {"matrix": [7, 5], "x": 7.5, "y": 0}, + {"matrix": [8, 5], "x": 8.5, "y": 0}, + {"matrix": [7, 10], "x": 9.75, "y": 0}, + {"matrix": [5, 10], "x": 10.75, "y": 0}, + {"matrix": [4, 10], "x": 11.75, "y": 0}, + {"matrix": [3, 10], "x": 12.75, "y": 0}, + {"matrix": [6, 10], "x": 14, "y": 0}, + {"matrix": [2, 10], "x": 15.25, "y": 0}, - { "matrix": [0, 4], "x": 0, "y": 1.25 }, - { "matrix": [1, 4], "x": 1, "y": 1.25 }, - { "matrix": [2, 4], "x": 2, "y": 1.25 }, - { "matrix": [3, 4], "x": 3, "y": 1.25 }, - { "matrix": [4, 4], "x": 4, "y": 1.25 }, - { "matrix": [5, 4], "x": 5, "y": 1.25 }, - { "matrix": [6, 4], "x": 6, "y": 1.25 }, - { "matrix": [7, 4], "x": 7, "y": 1.25 }, - { "matrix": [8, 4], "x": 8, "y": 1.25 }, - { "matrix": [8, 9], "x": 9, "y": 1.25 }, - { "matrix": [7, 9], "x": 10, "y": 1.25 }, - { "matrix": [5, 9], "x": 11, "y": 1.25 }, - { "matrix": [4, 9], "x": 12, "y": 1.25 }, - { "matrix": [6, 9], "x": 13, "y": 1.25, "w": 2 }, - { "matrix": [2, 9], "x": 15.25, "y": 1.25 }, + {"matrix": [0, 4], "x": 0, "y": 1.25}, + {"matrix": [1, 4], "x": 1, "y": 1.25}, + {"matrix": [2, 4], "x": 2, "y": 1.25}, + {"matrix": [3, 4], "x": 3, "y": 1.25}, + {"matrix": [4, 4], "x": 4, "y": 1.25}, + {"matrix": [5, 4], "x": 5, "y": 1.25}, + {"matrix": [6, 4], "x": 6, "y": 1.25}, + {"matrix": [7, 4], "x": 7, "y": 1.25}, + {"matrix": [8, 4], "x": 8, "y": 1.25}, + {"matrix": [8, 9], "x": 9, "y": 1.25}, + {"matrix": [7, 9], "x": 10, "y": 1.25}, + {"matrix": [5, 9], "x": 11, "y": 1.25}, + {"matrix": [4, 9], "x": 12, "y": 1.25}, + {"matrix": [6, 9], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [2, 9], "x": 15.25, "y": 1.25}, - { "matrix": [0, 3], "x":0, "y":2.25, "w":1.5}, - { "matrix": [1, 3], "x":1.5, "y":2.25}, - { "matrix": [2, 3], "x":2.5, "y":2.25}, - { "matrix": [3, 3], "x":3.5, "y":2.25}, - { "matrix": [4, 3], "x":4.5, "y":2.25}, - { "matrix": [5, 3], "x":5.5, "y":2.25}, - { "matrix": [6, 3], "x":6.5, "y":2.25}, - { "matrix": [7, 3], "x":7.5, "y":2.25}, - { "matrix": [8, 3], "x":8.5, "y":2.25}, - { "matrix": [8, 8], "x":9.5, "y":2.25}, - { "matrix": [7, 8], "x":10.5, "y":2.25}, - { "matrix": [5, 8], "x":11.5, "y":2.25}, - { "matrix": [4, 8], "x":12.5, "y":2.25}, - { "matrix": [3, 8], "x":13.5, "y":2.25, "w":1.5}, - { "matrix": [2, 8], "x":15.25, "y":2.25}, + {"matrix": [0, 3], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [1, 3], "x": 1.5, "y": 2.25}, + {"matrix": [2, 3], "x": 2.5, "y": 2.25}, + {"matrix": [3, 3], "x": 3.5, "y": 2.25}, + {"matrix": [4, 3], "x": 4.5, "y": 2.25}, + {"matrix": [5, 3], "x": 5.5, "y": 2.25}, + {"matrix": [6, 3], "x": 6.5, "y": 2.25}, + {"matrix": [7, 3], "x": 7.5, "y": 2.25}, + {"matrix": [8, 3], "x": 8.5, "y": 2.25}, + {"matrix": [8, 8], "x": 9.5, "y": 2.25}, + {"matrix": [7, 8], "x": 10.5, "y": 2.25}, + {"matrix": [5, 8], "x": 11.5, "y": 2.25}, + {"matrix": [4, 8], "x": 12.5, "y": 2.25}, + {"matrix": [3, 8], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [2, 8], "x": 15.25, "y": 2.25}, - { "matrix": [0, 2], "x":0, "y":3.25, "w":1.75}, - { "matrix": [1, 2], "x":1.75, "y":3.25}, - { "matrix": [2, 2], "x":2.75, "y":3.25}, - { "matrix": [3, 2], "x":3.75, "y":3.25}, - { "matrix": [4, 2], "x":4.75, "y":3.25}, - { "matrix": [5, 2], "x":5.75, "y":3.25}, - { "matrix": [6, 2], "x":6.75, "y":3.25}, - { "matrix": [7, 2], "x":7.75, "y":3.25}, - { "matrix": [8, 2], "x":8.75, "y":3.25}, - { "matrix": [8, 7], "x":9.75, "y":3.25}, - { "matrix": [7, 7], "x":10.75, "y":3.25}, - { "matrix": [5, 7], "x":11.75, "y":3.25}, - { "matrix": [4, 7], "x":12.75, "y":3.25, "w":2.25}, + {"matrix": [0, 2], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [1, 2], "x": 1.75, "y": 3.25}, + {"matrix": [2, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 2], "x": 3.75, "y": 3.25}, + {"matrix": [4, 2], "x": 4.75, "y": 3.25}, + {"matrix": [5, 2], "x": 5.75, "y": 3.25}, + {"matrix": [6, 2], "x": 6.75, "y": 3.25}, + {"matrix": [7, 2], "x": 7.75, "y": 3.25}, + {"matrix": [8, 2], "x": 8.75, "y": 3.25}, + {"matrix": [8, 7], "x": 9.75, "y": 3.25}, + {"matrix": [7, 7], "x": 10.75, "y": 3.25}, + {"matrix": [5, 7], "x": 11.75, "y": 3.25}, + {"matrix": [4, 7], "x": 12.75, "y": 3.25, "w": 2.25}, - { "matrix": [0, 1], "x":0, "y":4.25, "w":2.25}, - { "matrix": [2, 1], "x":2.25, "y":4.25}, - { "matrix": [3, 1], "x":3.25, "y":4.25}, - { "matrix": [4, 1], "x":4.25, "y":4.25}, - { "matrix": [5, 1], "x":5.25, "y":4.25}, - { "matrix": [6, 1], "x":6.25, "y":4.25}, - { "matrix": [7, 1], "x":7.25, "y":4.25}, - { "matrix": [8, 1], "x":8.25, "y":4.25}, - { "matrix": [8, 6], "x":9.25, "y":4.25}, - { "matrix": [7, 6], "x":10.25, "y":4.25}, - { "matrix": [5, 6], "x":11.25, "y":4.25}, - { "matrix": [4, 6], "x":12.25, "y":4.25, "w":1.75}, + {"matrix": [0, 1], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [2, 1], "x": 2.25, "y": 4.25}, + {"matrix": [3, 1], "x": 3.25, "y": 4.25}, + {"matrix": [4, 1], "x": 4.25, "y": 4.25}, + {"matrix": [5, 1], "x": 5.25, "y": 4.25}, + {"matrix": [6, 1], "x": 6.25, "y": 4.25}, + {"matrix": [7, 1], "x": 7.25, "y": 4.25}, + {"matrix": [8, 1], "x": 8.25, "y": 4.25}, + {"matrix": [8, 6], "x": 9.25, "y": 4.25}, + {"matrix": [7, 6], "x": 10.25, "y": 4.25}, + {"matrix": [5, 6], "x": 11.25, "y": 4.25}, + {"matrix": [4, 6], "x": 12.25, "y": 4.25, "w": 1.75}, - { "matrix": [3, 6], "x":14.25, "y":4.5}, + {"matrix": [3, 6], "x": 14.25, "y": 4.5}, - { "matrix": [0, 0], "x":0, "y":5.25, "w":1.25}, - { "matrix": [1, 0], "x":1.25, "y":5.25, "w":1.25}, - { "matrix": [2, 0], "x":2.5, "y":5.25, "w":1.25}, - { "matrix": [6, 0], "x":3.75, "y":5.25, "w":6.25}, - { "matrix": [8, 0], "x":10, "y":5.25, "w":1.5}, - { "matrix": [7, 0], "x":11.5, "y":5.25, "w":1.5}, + {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [1, 0], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [2, 0], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [6, 0], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [8, 0], "x": 10, "y": 5.25, "w": 1.5}, + {"matrix": [7, 0], "x": 11.5, "y": 5.25, "w": 1.5}, - { "matrix": [5, 0], "x":13.25, "y":5.5}, - { "matrix": [4, 0], "x":14.25, "y":5.5}, - { "matrix": [3, 0], "x":15.25, "y":5.5} + {"matrix": [5, 0], "x": 13.25, "y": 5.5}, + {"matrix": [4, 0], "x": 14.25, "y": 5.5}, + {"matrix": [3, 0], "x": 15.25, "y": 5.5} ] } } diff --git a/keyboards/idobao/id80/v3/ansi/rules.mk b/keyboards/idobao/id80/v3/ansi/rules.mk index eab741fd0a..58e39b17a5 100644 --- a/keyboards/idobao/id80/v3/ansi/rules.mk +++ b/keyboards/idobao/id80/v3/ansi/rules.mk @@ -2,4 +2,3 @@ # ** settings are data driven & stored in `info.json` ** RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 diff --git a/keyboards/idobao/id87/v1/config.h b/keyboards/idobao/id87/v1/config.h index 2f4ebd7744..9b7459de6c 100644 --- a/keyboards/idobao/id87/v1/config.h +++ b/keyboards/idobao/id87/v1/config.h @@ -14,27 +14,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ - -#define MATRIX_ROW_PINS { E6, B0, B1, B2, B3, B7, F7, F6, F5, F4, F1 } - -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - -#define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_CHRISTMAS @@ -50,4 +29,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/idobao/id87/v1/info.json b/keyboards/idobao/id87/v1/info.json index ca39654575..1deaf6b270 100644 --- a/keyboards/idobao/id87/v1/info.json +++ b/keyboards/idobao/id87/v1/info.json @@ -1,112 +1,133 @@ { - "keyboard_name": "ID87", + "keyboard_name": "ID87", "manufacturer": "IDOBAO", - "url": "https://www.idobao.net/products/idobao-id87-80-hot-swappable-mechanical-keyboard-kit", - "maintainer": "qmk", + "url": "https://www.idobao.net/products/idobao-id87-80-hot-swappable-mechanical-keyboard-kit", + "maintainer": "qmk", "usb": { "vid": "0x6964", "pid": "0x0087", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], + "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6" }, "indicators": { "caps_lock": "C7" }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"F1", "x":2, "y":0}, - {"label":"F2", "x":3, "y":0}, - {"label":"F3", "x":4, "y":0}, - {"label":"F4", "x":5, "y":0}, - {"label":"F5", "x":6.5, "y":0}, - {"label":"F6", "x":7.5, "y":0}, - {"label":"F7", "x":8.5, "y":0}, - {"label":"F8", "x":9.5, "y":0}, - {"label":"F9", "x":11, "y":0}, - {"label":"F10", "x":12, "y":0}, - {"label":"F11", "x":13, "y":0}, - {"label":"F12", "x":14, "y":0}, - {"label":"PrtSc", "x":15.25, "y":0}, - {"label":"Scroll Lock", "x":16.25, "y":0}, - {"label":"Pause", "x":17.25, "y":0}, - {"label":"~", "x":0, "y":1.5}, - {"label":"1", "x":1, "y":1.5}, - {"label":"2", "x":2, "y":1.5}, - {"label":"3", "x":3, "y":1.5}, - {"label":"4", "x":4, "y":1.5}, - {"label":"5", "x":5, "y":1.5}, - {"label":"6", "x":6, "y":1.5}, - {"label":"7", "x":7, "y":1.5}, - {"label":"8", "x":8, "y":1.5}, - {"label":"9", "x":9, "y":1.5}, - {"label":"0", "x":10, "y":1.5}, - {"label":"-", "x":11, "y":1.5}, - {"label":"=", "x":12, "y":1.5}, - {"label":"Backspace", "x":13, "y":1.5, "w":2}, - {"label":"Insert", "x":15.25, "y":1.5}, - {"label":"Home", "x":16.25, "y":1.5}, - {"label":"PgUp", "x":17.25, "y":1.5}, - {"label":"Tab", "x":0, "y":2.5, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.5}, - {"label":"W", "x":2.5, "y":2.5}, - {"label":"E", "x":3.5, "y":2.5}, - {"label":"R", "x":4.5, "y":2.5}, - {"label":"T", "x":5.5, "y":2.5}, - {"label":"Y", "x":6.5, "y":2.5}, - {"label":"U", "x":7.5, "y":2.5}, - {"label":"I", "x":8.5, "y":2.5}, - {"label":"O", "x":9.5, "y":2.5}, - {"label":"P", "x":10.5, "y":2.5}, - {"label":"[", "x":11.5, "y":2.5}, - {"label":"]", "x":12.5, "y":2.5}, - {"label":"\\", "x":13.5, "y":2.5, "w":1.5}, - {"label":"Delete", "x":15.25, "y":2.5}, - {"label":"End", "x":16.25, "y":2.5}, - {"label":"PgDn", "x":17.25, "y":2.5}, - {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, - {"label":"A", "x":1.75, "y":3.5}, - {"label":"S", "x":2.75, "y":3.5}, - {"label":"D", "x":3.75, "y":3.5}, - {"label":"F", "x":4.75, "y":3.5}, - {"label":"G", "x":5.75, "y":3.5}, - {"label":"H", "x":6.75, "y":3.5}, - {"label":"J", "x":7.75, "y":3.5}, - {"label":"K", "x":8.75, "y":3.5}, - {"label":"L", "x":9.75, "y":3.5}, - {"label":";", "x":10.75, "y":3.5}, - {"label":"'", "x":11.75, "y":3.5}, - {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, - {"label":"Shift", "x":0, "y":4.5, "w":2.25}, - {"label":"Z", "x":2.25, "y":4.5}, - {"label":"X", "x":3.25, "y":4.5}, - {"label":"C", "x":4.25, "y":4.5}, - {"label":"V", "x":5.25, "y":4.5}, - {"label":"B", "x":6.25, "y":4.5}, - {"label":"N", "x":7.25, "y":4.5}, - {"label":"M", "x":8.25, "y":4.5}, - {"label":",", "x":9.25, "y":4.5}, - {"label":".", "x":10.25, "y":4.5}, - {"label":"/", "x":11.25, "y":4.5}, - {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, - {"label":"Up", "x":16.25, "y":4.5}, - {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, - {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, - {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, - {"label":"Space", "x":3.75, "y":5.5, "w":6.25}, - {"label":"Alt", "x":10, "y":5.5, "w":1.25}, - {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, - {"label":"LT(1, KC_APP)", "x":12.5, "y":5.5, "w":1.25}, - {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, - {"label":"Left", "x":15.25, "y":5.5}, - {"label":"Down", "x":16.25, "y":5.5}, - {"label":"Right", "x":17.25, "y":5.5} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [6, 8], "x": 9.5, "y": 0}, + + {"matrix": [6, 7], "x": 11, "y": 0}, + {"matrix": [6, 5], "x": 12, "y": 0}, + {"matrix": [6, 4], "x": 13, "y": 0}, + {"matrix": [6, 3], "x": 14, "y": 0}, + + {"matrix": [6, 6], "x": 15.25, "y": 0}, + {"matrix": [6, 2], "x": 16.25, "y": 0}, + {"matrix": [6, 1], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [7, 8], "x": 9, "y": 1.5}, + {"matrix": [7, 0], "x": 10, "y": 1.5}, + {"matrix": [7, 7], "x": 11, "y": 1.5}, + {"matrix": [7, 5], "x": 12, "y": 1.5}, + {"matrix": [7, 3], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [7, 6], "x": 15.25, "y": 1.5}, + {"matrix": [7, 2], "x": 16.25, "y": 1.5}, + {"matrix": [7, 1], "x": 17.25, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [8, 8], "x": 9.5, "y": 2.5}, + {"matrix": [8, 7], "x": 10.5, "y": 2.5}, + {"matrix": [8, 5], "x": 11.5, "y": 2.5}, + {"matrix": [8, 4], "x": 12.5, "y": 2.5}, + {"matrix": [8, 3], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [8, 6], "x": 15.25, "y": 2.5}, + {"matrix": [8, 2], "x": 16.25, "y": 2.5}, + {"matrix": [8, 1], "x": 17.25, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [9, 8], "x": 9.75, "y": 3.5}, + {"matrix": [9, 7], "x": 10.75, "y": 3.5}, + {"matrix": [9, 5], "x": 11.75, "y": 3.5}, + {"matrix": [9, 3], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [10, 8], "x": 9.25, "y": 4.5}, + {"matrix": [10, 7], "x": 10.25, "y": 4.5}, + {"matrix": [10, 5], "x": 11.25, "y": 4.5}, + {"matrix": [10, 4], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [9, 2], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 8], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [5, 7], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 4], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 3], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [10, 6], "x": 15.25, "y": 5.5}, + {"matrix": [10, 2], "x": 16.25, "y": 5.5}, + {"matrix": [10, 1], "x": 17.25, "y": 5.5} ] } } diff --git a/keyboards/idobao/id87/v1/v1.c b/keyboards/idobao/id87/v1/v1.c deleted file mode 100644 index 59dc3daab4..0000000000 --- a/keyboards/idobao/id87/v1/v1.c +++ /dev/null @@ -1,15 +0,0 @@ -/* -Copyright 2020 Tybera -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/>. -*/ - -#include "v1.h" diff --git a/keyboards/idobao/id87/v1/v1.h b/keyboards/idobao/id87/v1/v1.h deleted file mode 100644 index 1a75d95755..0000000000 --- a/keyboards/idobao/id87/v1/v1.h +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2020 Tybera -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 - -#include "quantum.h" - -#define LAYOUT_tkl_ansi( \ - K00, K02, K03, K04, K05, K06, K07, K08, K68, K67, K65, K64, K63, K66, K62, K61, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K70, K77, K75, K73, K76, K72, K71, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85, K84, K83, K86, K82, K81, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K93, \ - K40, K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA5, KA4, K92, \ - K50, K51, K52, K56, K58, K57, K54, K53, KA6, KA2, KA1 \ -) { \ - { K00, KC_NO, K02, K03, K04, K05, K06, K07, K08 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \ - { K40, KC_NO, K42, K43, K44, K45, K46, K47, K48 }, \ - { K50, K51, K52, K53, K54, KC_NO, K56, K57, K58 }, \ - { KC_NO, K61, K62, K63, K64, K65, K66, K67, K68 }, \ - { K70, K71, K72, K73, KC_NO, K75, K76, K77, K78 }, \ - { KC_NO, K81, K82, K83, K84, K85, K86, K87, K88 }, \ - { KC_NO, KC_NO, K92, K93, KC_NO, K95, KC_NO, K97, K98 }, \ - { KC_NO, KA1, KA2, KC_NO, KA4, KA5, KA6, KA7, KA8 }, \ -} - - diff --git a/keyboards/idobao/id87/v2/config.h b/keyboards/idobao/id87/v2/config.h index 02b62fc61f..17b63471fa 100644 --- a/keyboards/idobao/id87/v2/config.h +++ b/keyboards/idobao/id87/v2/config.h @@ -8,8 +8,6 @@ * RGB Matrix stuff * ---------------- */ -#define RGB_DI_PIN E2 - // RGB Matrix config #if defined(RGB_MATRIX_ENABLE) diff --git a/keyboards/idobao/id87/v2/info.json b/keyboards/idobao/id87/v2/info.json index 6272c02d96..aace4915a1 100644 --- a/keyboards/idobao/id87/v2/info.json +++ b/keyboards/idobao/id87/v2/info.json @@ -14,6 +14,12 @@ "backlight": false, "rgblight": false }, + "ws2812": { + "pin": "E2" + }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"] @@ -28,98 +34,98 @@ "layouts": { "LAYOUT_tkl_ansi": { "layout": [ - { "matrix": [0, 0], "x": 0, "y": 0 }, - { "matrix": [0, 2], "x": 2, "y": 0 }, - { "matrix": [0, 3], "x": 3, "y": 0 }, - { "matrix": [0, 4], "x": 4, "y": 0 }, - { "matrix": [0, 5], "x": 5, "y": 0 }, - { "matrix": [0, 6], "x": 6.5, "y": 0 }, - { "matrix": [0, 7], "x": 7.5, "y": 0 }, - { "matrix": [0, 8], "x": 8.5, "y": 0 }, - { "matrix": [6, 8], "x": 9.5, "y": 0 }, - { "matrix": [6, 7], "x": 11, "y": 0 }, - { "matrix": [6, 5], "x": 12, "y": 0 }, - { "matrix": [6, 4], "x": 13, "y": 0 }, - { "matrix": [6, 3], "x": 14, "y": 0 }, - { "matrix": [6, 6], "x": 15.25, "y": 0 }, - { "matrix": [6, 2], "x": 16.25, "y": 0 }, - { "matrix": [6, 1], "x": 17.25, "y": 0 }, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [6, 8], "x": 9.5, "y": 0}, + {"matrix": [6, 7], "x": 11, "y": 0}, + {"matrix": [6, 5], "x": 12, "y": 0}, + {"matrix": [6, 4], "x": 13, "y": 0}, + {"matrix": [6, 3], "x": 14, "y": 0}, + {"matrix": [6, 6], "x": 15.25, "y": 0}, + {"matrix": [6, 2], "x": 16.25, "y": 0}, + {"matrix": [6, 1], "x": 17.25, "y": 0}, - { "matrix": [1, 0], "x": 0, "y": 1.25 }, - { "matrix": [1, 1], "x": 1, "y": 1.25 }, - { "matrix": [1, 2], "x": 2, "y": 1.25 }, - { "matrix": [1, 3], "x": 3, "y": 1.25 }, - { "matrix": [1, 4], "x": 4, "y": 1.25 }, - { "matrix": [1, 5], "x": 5, "y": 1.25 }, - { "matrix": [1, 6], "x": 6, "y": 1.25 }, - { "matrix": [1, 7], "x": 7, "y": 1.25 }, - { "matrix": [1, 8], "x": 8, "y": 1.25 }, - { "matrix": [7, 8], "x": 9, "y": 1.25 }, - { "matrix": [7, 0], "x": 10, "y": 1.25 }, - { "matrix": [7, 7], "x": 11, "y": 1.25 }, - { "matrix": [7, 5], "x": 12, "y": 1.25 }, - { "matrix": [7, 3], "x": 13, "y": 1.25, "w": 2 }, - { "matrix": [7, 6], "x": 15.25, "y": 1.25 }, - { "matrix": [7, 2], "x": 16.25, "y": 1.25 }, - { "matrix": [7, 1], "x": 17.25, "y": 1.25 }, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [7, 8], "x": 9, "y": 1.25}, + {"matrix": [7, 0], "x": 10, "y": 1.25}, + {"matrix": [7, 7], "x": 11, "y": 1.25}, + {"matrix": [7, 5], "x": 12, "y": 1.25}, + {"matrix": [7, 3], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [7, 6], "x": 15.25, "y": 1.25}, + {"matrix": [7, 2], "x": 16.25, "y": 1.25}, + {"matrix": [7, 1], "x": 17.25, "y": 1.25}, - { "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 }, - { "matrix": [2, 1], "x": 1.5, "y": 2.25 }, - { "matrix": [2, 2], "x": 2.5, "y": 2.25 }, - { "matrix": [2, 3], "x": 3.5, "y": 2.25 }, - { "matrix": [2, 4], "x": 4.5, "y": 2.25 }, - { "matrix": [2, 5], "x": 5.5, "y": 2.25 }, - { "matrix": [2, 6], "x": 6.5, "y": 2.25 }, - { "matrix": [2, 7], "x": 7.5, "y": 2.25 }, - { "matrix": [2, 8], "x": 8.5, "y": 2.25 }, - { "matrix": [8, 8], "x": 9.5, "y": 2.25 }, - { "matrix": [8, 7], "x": 10.5, "y": 2.25 }, - { "matrix": [8, 5], "x": 11.5, "y": 2.25 }, - { "matrix": [8, 4], "x": 12.5, "y": 2.25 }, - { "matrix": [8, 3], "w": 1.5, "x": 13.5, "y": 2.25 }, - { "matrix": [8, 6], "x": 15.25, "y": 2.25 }, - { "matrix": [8, 2], "x": 16.25, "y": 2.25 }, - { "matrix": [8, 1], "x": 17.25, "y": 2.25 }, + {"matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [8, 8], "x": 9.5, "y": 2.25}, + {"matrix": [8, 7], "x": 10.5, "y": 2.25}, + {"matrix": [8, 5], "x": 11.5, "y": 2.25}, + {"matrix": [8, 4], "x": 12.5, "y": 2.25}, + {"matrix": [8, 3], "w": 1.5, "x": 13.5, "y": 2.25}, + {"matrix": [8, 6], "x": 15.25, "y": 2.25}, + {"matrix": [8, 2], "x": 16.25, "y": 2.25}, + {"matrix": [8, 1], "x": 17.25, "y": 2.25}, - { "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75 }, - { "matrix": [3, 1], "x": 1.75, "y": 3.25 }, - { "matrix": [3, 2], "x": 2.75, "y": 3.25 }, - { "matrix": [3, 3], "x": 3.75, "y": 3.25 }, - { "matrix": [3, 4], "x": 4.75, "y": 3.25 }, - { "matrix": [3, 5], "x": 5.75, "y": 3.25 }, - { "matrix": [3, 6], "x": 6.75, "y": 3.25 }, - { "matrix": [3, 7], "x": 7.75, "y": 3.25 }, - { "matrix": [3, 8], "x": 8.75, "y": 3.25 }, - { "matrix": [9, 8], "x": 9.75, "y": 3.25 }, - { "matrix": [9, 7], "x": 10.75, "y": 3.25 }, - { "matrix": [9, 5], "x": 11.75, "y": 3.25 }, - { "matrix": [9, 3], "x": 12.75, "y": 3.25, "w": 2.25 }, + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [9, 8], "x": 9.75, "y": 3.25}, + {"matrix": [9, 7], "x": 10.75, "y": 3.25}, + {"matrix": [9, 5], "x": 11.75, "y": 3.25}, + {"matrix": [9, 3], "x": 12.75, "y": 3.25, "w": 2.25}, - { "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25 }, - { "matrix": [4, 2], "x": 2.25, "y": 4.25 }, - { "matrix": [4, 3], "x": 3.25, "y": 4.25 }, - { "matrix": [4, 4], "x": 4.25, "y": 4.25 }, - { "matrix": [4, 5], "x": 5.25, "y": 4.25 }, - { "matrix": [4, 6], "x": 6.25, "y": 4.25 }, - { "matrix": [4, 7], "x": 7.25, "y": 4.25 }, - { "matrix": [4, 8], "x": 8.25, "y": 4.25 }, - { "matrix": [10, 8], "x": 9.25, "y": 4.25 }, - { "matrix": [10, 7], "x": 10.25, "y": 4.25 }, - { "matrix": [10, 5], "x": 11.25, "y": 4.25 }, - { "matrix": [10, 4], "x": 12.25, "y": 4.25, "w": 2.75 }, - { "matrix": [9, 2], "x": 16.25, "y": 4.25 }, + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [10, 8], "x": 9.25, "y": 4.25}, + {"matrix": [10, 7], "x": 10.25, "y": 4.25}, + {"matrix": [10, 5], "x": 11.25, "y": 4.25}, + {"matrix": [10, 4], "x": 12.25, "y": 4.25, "w": 2.75}, + {"matrix": [9, 2], "x": 16.25, "y": 4.25}, - { "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25 }, - { "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25 }, - { "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25 }, - { "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25 }, - { "matrix": [5, 8], "x": 10, "y": 5.25, "w": 1.25 }, - { "matrix": [5, 7], "x": 11.25, "y": 5.25, "w": 1.25 }, - { "matrix": [5, 4], "x": 12.5, "y": 5.25, "w": 1.25 }, - { "matrix": [5, 3], "x": 13.75, "y": 5.25, "w": 1.25 }, - { "matrix": [10, 6], "x": 15.25, "y": 5.25 }, - { "matrix": [10, 2], "x": 16.25, "y": 5.25 }, - { "matrix": [10, 1], "x": 17.25, "y": 5.25 } + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 8], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 7], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 4], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 3], "x": 13.75, "y": 5.25, "w": 1.25}, + {"matrix": [10, 6], "x": 15.25, "y": 5.25}, + {"matrix": [10, 2], "x": 16.25, "y": 5.25}, + {"matrix": [10, 1], "x": 17.25, "y": 5.25} ] } } diff --git a/keyboards/idobao/id87/v2/rules.mk b/keyboards/idobao/id87/v2/rules.mk index eab741fd0a..58e39b17a5 100644 --- a/keyboards/idobao/id87/v2/rules.mk +++ b/keyboards/idobao/id87/v2/rules.mk @@ -2,4 +2,3 @@ # ** settings are data driven & stored in `info.json` ** RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 diff --git a/keyboards/idobao/id87/v2/v2.c b/keyboards/idobao/id87/v2/v2.c index 34f0a74669..7992fb6295 100644 --- a/keyboards/idobao/id87/v2/v2.c +++ b/keyboards/idobao/id87/v2/v2.c @@ -1,7 +1,7 @@ // Copyright 2022 vinorodrigues (@vinorodrigues) // SPDX-License-Identifier: GPL-2.0-or-later -#include "v2.h" +#include "quantum.h" #define __ NO_LED diff --git a/keyboards/idobao/id87/v2/v2.h b/keyboards/idobao/id87/v2/v2.h deleted file mode 100644 index 38b3c9dfda..0000000000 --- a/keyboards/idobao/id87/v2/v2.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2022 vinorodrigues (@vinorodrigues) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" diff --git a/keyboards/idobao/id96/config.h b/keyboards/idobao/id96/config.h index 7f48dc7752..a857f49125 100644 --- a/keyboards/idobao/id96/config.h +++ b/keyboards/idobao/id96/config.h @@ -18,22 +18,12 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0, E6, F0, F1, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -48,4 +38,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/idobao/id96/id96.c b/keyboards/idobao/id96/id96.c deleted file mode 100644 index 1bb863f1ff..0000000000 --- a/keyboards/idobao/id96/id96.c +++ /dev/null @@ -1,19 +0,0 @@ -/* - * This file is part of the QMK Firmware distribution (https://github.com/qmk/qmk_firmware). - * Copyright 2018-2021 "kaylanm" <http://github.com/kaylanm> [Melody96] - * Vino Rodrigues <http://github.com/vinorodrigues> [ID96] - * - * 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, version 3. - * - * 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/>. - */ - -#include "id96.h" diff --git a/keyboards/idobao/id96/id96.h b/keyboards/idobao/id96/id96.h deleted file mode 100644 index adb8f47689..0000000000 --- a/keyboards/idobao/id96/id96.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - * This file is part of the QMK Firmware distribution (https://github.com/qmk/qmk_firmware). - * Copyright 2018-2021 "kaylanm" <http://github.com/kaylanm> [Melody96] - * Vino Rodrigues <http://github.com/vinorodrigues> [ID96] - * - * 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, version 3. - * - * 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 - -#include "quantum.h" - -/* - * The layout macro for the ID96 keyboard, with illustrative grid of a typical - * assignment. - * ,--------------------------------------------------------------------------- - * |ESC|F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|PSC|HOM|END|PGU|PGD|DEL| - * ,--------------------------------------------------------------------------| - * | ` |1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | + | \ |BKS|NLK| / | * | - | - * |--------------------------------------------------------------------------| - * | TAB | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | 7 | 8 | 9 | + | - * |--------------------------------------------------------------------------| - * | CTRL | A | S | D | F | G | H | J | K | L | ; | ' | RET | 4 | 5 | 6 | + | - * |--------------------------------------------------------------------------| - * | LSHIFT | Z | X | C | V | B | N | M | , | . | / |RSHFT| ↑ | 1 | 2 | 3 |ENT| - * |--------------------------------------------------------------------------| - * |LCTL|LWIN|LALT| SPACE |CTL|ALT|FN | ← | ↓ | → | 0 | . |ENT| - * `--------------------------------------------------------------------------- - */ - -#define ____ KC_NO - -#define LAYOUT( \ - K050, K051, K052, K053, K054, K055, K056, K057, K058, K118, K117, K115, K114, K113, K116, K112, K111, K110, K063, \ - K040, K041, K042, K043, K044, K045, K046, K047, K048, K108, K107, K105, K104, K103, K106, K102, K101, K100, K064, \ - K030, K031, K032, K033, K034, K035, K036, K037, K038, K098, K097, K095, K094, K084, K096, K092, K091, K090, \ - K020, K021, K022, K023, K024, K025, K026, K027, K028, K088, K087, K085, K093, K086, K082, K081, K080, \ - K010, K011, K012, K013, K014, K015, K016, K017, K018, K078, K077, K075, K074, K073, K076, K072, K071, K070, \ - K000, K001, K002, K006, K008, K007, K005, K004, K003, K066, K062, K061, K060 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008 }, \ - { K010, K011, K012, K013, K014, K015, K016, K017, K018 }, \ - { K020, K021, K022, K023, K024, K025, K026, K027, K028 }, \ - { K030, K031, K032, K033, K034, K035, K036, K037, K038 }, \ - { K040, K041, K042, K043, K044, K045, K046, K047, K048 }, \ - { K050, K051, K052, K053, K054, K055, K056, K057, K058 }, \ - { K060, K061, K062, K063, K064, ____, K066, ____, ____ }, \ - { K070, K071, K072, K073, K074, K075, K076, K077, K078 }, \ - { K080, K081, K082, ____, K084, K085, K086, K087, K088 }, \ - { K090, K091, K092, K093, K094, K095, K096, K097, K098 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108 }, \ - { K110, K111, K112, K113, K114, K115, K116, K117, K118 } \ -} diff --git a/keyboards/idobao/id96/info.json b/keyboards/idobao/id96/info.json index 2046283d8e..f49337fc14 100644 --- a/keyboards/idobao/id96/info.json +++ b/keyboards/idobao/id96/info.json @@ -8,11 +8,19 @@ "pid": "0x0096", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], + "rows": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6", "levels": 7, "breathing": true }, + "ws2812": { + "pin": "E2" + }, "indicators": { "caps_lock": "C7", "num_lock": "C6", @@ -26,115 +34,116 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"F1", "x":1, "y":0}, - {"label":"F2", "x":2, "y":0}, - {"label":"F3", "x":3, "y":0}, - {"label":"F4", "x":4, "y":0}, - {"label":"F5", "x":5, "y":0}, - {"label":"F6", "x":6, "y":0}, - {"label":"F7", "x":7, "y":0}, - {"label":"F8", "x":8, "y":0}, - {"label":"F9", "x":9, "y":0}, - {"label":"F10", "x":10, "y":0}, - {"label":"F11", "x":11, "y":0}, - {"label":"F12", "x":12, "y":0}, - {"label":"PrtSc", "x":13, "y":0}, - {"label":"Scroll Lock", "x":14, "y":0}, - {"label":"Pause", "x":15, "y":0}, - {"label":"Insert", "x":16, "y":0}, - {"label":"Home", "x":17, "y":0}, - {"label":"PgUp", "x":18, "y":0}, + {"matrix": [5, 0], "x": 0, "y": 0}, + {"matrix": [5, 1], "x": 1, "y": 0}, + {"matrix": [5, 2], "x": 2, "y": 0}, + {"matrix": [5, 3], "x": 3, "y": 0}, + {"matrix": [5, 4], "x": 4, "y": 0}, + {"matrix": [5, 5], "x": 5, "y": 0}, + {"matrix": [5, 6], "x": 6, "y": 0}, + {"matrix": [5, 7], "x": 7, "y": 0}, + {"matrix": [5, 8], "x": 8, "y": 0}, + {"matrix": [11, 8], "x": 9, "y": 0}, + {"matrix": [11, 7], "x": 10, "y": 0}, + {"matrix": [11, 5], "x": 11, "y": 0}, + {"matrix": [11, 4], "x": 12, "y": 0}, + {"matrix": [11, 3], "x": 13, "y": 0}, + {"matrix": [11, 6], "x": 14, "y": 0}, + {"matrix": [11, 2], "x": 15, "y": 0}, + {"matrix": [11, 1], "x": 16, "y": 0}, + {"matrix": [11, 0], "x": 17, "y": 0}, + {"matrix": [6, 3], "x": 18, "y": 0}, - {"label":"~", "x":0, "y":1}, - {"label":"!", "x":1, "y":1}, - {"label":"@", "x":2, "y":1}, - {"label":"#", "x":3, "y":1}, - {"label":"$", "x":4, "y":1}, - {"label":"%", "x":5, "y":1}, - {"label":"^", "x":6, "y":1}, - {"label":"&", "x":7, "y":1}, - {"label":"*", "x":8, "y":1}, - {"label":"(", "x":9, "y":1}, - {"label":")", "x":10, "y":1}, - {"label":"_", "x":11, "y":1}, - {"label":"+", "x":12, "y":1}, - {"x":13, "y":1}, - {"x":14, "y":1}, - {"label":"Num Lock", "x":15, "y":1}, - {"label":"/", "x":16, "y":1}, - {"label":"*", "x":17, "y":1}, - {"label":"-", "x":18, "y":1}, + {"matrix": [4, 0], "x": 0, "y": 1}, + {"matrix": [4, 1], "x": 1, "y": 1}, + {"matrix": [4, 2], "x": 2, "y": 1}, + {"matrix": [4, 3], "x": 3, "y": 1}, + {"matrix": [4, 4], "x": 4, "y": 1}, + {"matrix": [4, 5], "x": 5, "y": 1}, + {"matrix": [4, 6], "x": 6, "y": 1}, + {"matrix": [4, 7], "x": 7, "y": 1}, + {"matrix": [4, 8], "x": 8, "y": 1}, + {"matrix": [10, 8], "x": 9, "y": 1}, + {"matrix": [10, 7], "x": 10, "y": 1}, + {"matrix": [10, 5], "x": 11, "y": 1}, + {"matrix": [10, 4], "x": 12, "y": 1}, + {"matrix": [10, 3], "x": 13, "y": 1}, + {"matrix": [10, 6], "x": 14, "y": 1}, + {"matrix": [10, 2], "x": 15, "y": 1}, + {"matrix": [10, 1], "x": 16, "y": 1}, + {"matrix": [10, 0], "x": 17, "y": 1}, + {"matrix": [6, 4], "x": 18, "y": 1}, - {"label":"Tab", "x":0, "y":2, "w":1.5}, - {"label":"Q", "x":1.5, "y":2}, - {"label":"W", "x":2.5, "y":2}, - {"label":"E", "x":3.5, "y":2}, - {"label":"R", "x":4.5, "y":2}, - {"label":"T", "x":5.5, "y":2}, - {"label":"Y", "x":6.5, "y":2}, - {"label":"U", "x":7.5, "y":2}, - {"label":"I", "x":8.5, "y":2}, - {"label":"O", "x":9.5, "y":2}, - {"label":"P", "x":10.5, "y":2}, - {"label":"{", "x":11.5, "y":2}, - {"label":"}", "x":12.5, "y":2}, - {"label":"|", "x":13.5, "y":2, "w":1.5}, - {"label":"7", "x":15, "y":2}, - {"label":"8", "x":16, "y":2}, - {"label":"9", "x":17, "y":2}, - {"label":"+", "x":18, "y":2}, + {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 2}, + {"matrix": [3, 2], "x": 2.5, "y": 2}, + {"matrix": [3, 3], "x": 3.5, "y": 2}, + {"matrix": [3, 4], "x": 4.5, "y": 2}, + {"matrix": [3, 5], "x": 5.5, "y": 2}, + {"matrix": [3, 6], "x": 6.5, "y": 2}, + {"matrix": [3, 7], "x": 7.5, "y": 2}, + {"matrix": [3, 8], "x": 8.5, "y": 2}, + {"matrix": [9, 8], "x": 9.5, "y": 2}, + {"matrix": [9, 7], "x": 10.5, "y": 2}, + {"matrix": [9, 5], "x": 11.5, "y": 2}, + {"matrix": [9, 4], "x": 12.5, "y": 2}, + {"matrix": [8, 4], "x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [9, 6], "x": 15, "y": 2}, + {"matrix": [9, 2], "x": 16, "y": 2}, + {"matrix": [9, 1], "x": 17, "y": 2}, + {"matrix": [9, 0], "x": 18, "y": 2}, - {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, - {"label":"A", "x":1.75, "y":3}, - {"label":"S", "x":2.75, "y":3}, - {"label":"D", "x":3.75, "y":3}, - {"label":"F", "x":4.75, "y":3}, - {"label":"G", "x":5.75, "y":3}, - {"label":"H", "x":6.75, "y":3}, - {"label":"J", "x":7.75, "y":3}, - {"label":"K", "x":8.75, "y":3}, - {"label":"L", "x":9.75, "y":3}, - {"label":":", "x":10.75, "y":3}, - {"label":"\"", "x":11.75, "y":3}, - {"label":"Enter", "x":12.75, "y":3, "w":2.25}, - {"label":"4", "x":15, "y":3}, - {"label":"5", "x":16, "y":3}, - {"label":"6", "x":17, "y":3}, - {"x":18, "y":3}, + {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 3}, + {"matrix": [2, 2], "x": 2.75, "y": 3}, + {"matrix": [2, 3], "x": 3.75, "y": 3}, + {"matrix": [2, 4], "x": 4.75, "y": 3}, + {"matrix": [2, 5], "x": 5.75, "y": 3}, + {"matrix": [2, 6], "x": 6.75, "y": 3}, + {"matrix": [2, 7], "x": 7.75, "y": 3}, + {"matrix": [2, 8], "x": 8.75, "y": 3}, + {"matrix": [8, 8], "x": 9.75, "y": 3}, + {"matrix": [8, 7], "x": 10.75, "y": 3}, + {"matrix": [8, 5], "x": 11.75, "y": 3}, + {"matrix": [9, 3], "x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [8, 6], "x": 15, "y": 3}, + {"matrix": [8, 2], "x": 16, "y": 3}, + {"matrix": [8, 1], "x": 17, "y": 3}, + {"matrix": [8, 0], "x": 18, "y": 3}, - {"label":"Shift", "x":0, "y":4, "w":1.25}, - {"x":1.25, "y":4}, - {"label":"Z", "x":2.25, "y":4}, - {"label":"X", "x":3.25, "y":4}, - {"label":"C", "x":4.25, "y":4}, - {"label":"V", "x":5.25, "y":4}, - {"label":"B", "x":6.25, "y":4}, - {"label":"N", "x":7.25, "y":4}, - {"label":"M", "x":8.25, "y":4}, - {"label":"<", "x":9.25, "y":4}, - {"label":">", "x":10.25, "y":4}, - {"label":"?", "x":11.25, "y":4}, - {"label":"Shift", "x":12.25, "y":4, "w":1.75}, - {"label":"\u2191", "x":14, "y":4}, - {"label":"1", "x":15, "y":4}, - {"label":"2", "x":16, "y":4}, - {"label":"3", "x":17, "y":4}, - {"label":"Enter", "x":18, "y":4}, + {"matrix": [1, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 4}, + {"matrix": [1, 2], "x": 2.25, "y": 4}, + {"matrix": [1, 3], "x": 3.25, "y": 4}, + {"matrix": [1, 4], "x": 4.25, "y": 4}, + {"matrix": [1, 5], "x": 5.25, "y": 4}, + {"matrix": [1, 6], "x": 6.25, "y": 4}, + {"matrix": [1, 7], "x": 7.25, "y": 4}, + {"matrix": [1, 8], "x": 8.25, "y": 4}, + {"matrix": [7, 8], "x": 9.25, "y": 4}, + {"matrix": [7, 7], "x": 10.25, "y": 4}, + {"matrix": [7, 5], "x": 11.25, "y": 4}, + {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [7, 3], "x": 14, "y": 4}, + {"matrix": [7, 6], "x": 15, "y": 4}, + {"matrix": [7, 2], "x": 16, "y": 4}, + {"matrix": [7, 1], "x": 17, "y": 4}, + {"matrix": [7, 0], "x": 18, "y": 4}, - {"label":"Ctrl", "x":0, "y":5, "w":1.25}, - {"label":"Win", "x":1.25, "y":5, "w":1.25}, - {"label":"Alt", "x":2.5, "y":5, "w":1.25}, - {"x":3.75, "y":5, "w":6.25}, - {"label":"Alt", "x":10, "y":5}, - {"label":"Win", "x":11, "y":5}, - {"x":12, "y":5}, - {"label":"\u2190", "x":13, "y":5}, - {"label":"\u2193", "x":14, "y":5}, - {"label":"\u2192", "x":15, "y":5}, - {"label":"0", "x":16, "y":5}, - {"label":".", "x":17, "y":5}, - {"x":18, "y":5}] + {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [0, 8], "x": 10, "y": 5}, + {"matrix": [0, 7], "x": 11, "y": 5}, + {"matrix": [0, 5], "x": 12, "y": 5}, + {"matrix": [0, 4], "x": 13, "y": 5}, + {"matrix": [0, 3], "x": 14, "y": 5}, + {"matrix": [6, 6], "x": 15, "y": 5}, + {"matrix": [6, 2], "x": 16, "y": 5}, + {"matrix": [6, 1], "x": 17, "y": 5}, + {"matrix": [6, 0], "x": 18, "y": 5} + ] } } } diff --git a/keyboards/idobao/montex/v1/config.h b/keyboards/idobao/montex/v1/config.h index 5c612855fb..87ed689f66 100644 --- a/keyboards/idobao/montex/v1/config.h +++ b/keyboards/idobao/montex/v1/config.h @@ -16,22 +16,12 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D4, D6, D7, B4, B5, C6 } -#define MATRIX_COL_PINS { D5, D3, D2, D1, D0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN B1 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_CHRISTMAS @@ -47,4 +37,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/idobao/montex/v1/info.json b/keyboards/idobao/montex/v1/info.json index 725ddc0c4d..666ffbdf89 100644 --- a/keyboards/idobao/montex/v1/info.json +++ b/keyboards/idobao/montex/v1/info.json @@ -8,46 +8,54 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D3", "D2", "D1", "D0"], + "rows": ["D4", "D6", "D7", "B4", "B5", "C6"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B6" }, + "ws2812": { + "pin": "B1" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT_numpad_6x5": { "layout": [ - { "label": "0,0", "x": 0, "y": 0}, - { "label": "0,1", "x": 1, "y": 0}, - { "label": "0,2", "x": 2, "y": 0}, - { "label": "0,3", "x": 3, "y": 0}, - { "label": "0,4", "x": 4, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, - { "label": "1,0", "x": 0, "y": 1.25}, - { "label": "1,1", "x": 1, "y": 1.25}, - { "label": "1,2", "x": 2, "y": 1.25}, - { "label": "1,3", "x": 3, "y": 1.25}, - { "label": "1,4", "x": 4, "y": 1.25}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, - { "label": "2,0", "x": 0, "y": 2.25}, - { "label": "2,1", "x": 1, "y": 2.25}, - { "label": "2,2", "x": 2, "y": 2.25}, - { "label": "2,3", "x": 3, "y": 2.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + {"matrix": [2, 3], "x": 3, "y": 2.25}, - { "label": "3,0", "x": 0, "y": 3.25}, - { "label": "3,1", "x": 1, "y": 3.25}, - { "label": "3,2", "x": 2, "y": 3.25}, - { "label": "3,3", "x": 3, "y": 3.25}, - { "label": "3,4", "x": 4, "y": 2.25, "h": 2}, + {"matrix": [3, 0], "x": 0, "y": 3.25}, + {"matrix": [3, 1], "x": 1, "y": 3.25}, + {"matrix": [3, 2], "x": 2, "y": 3.25}, + {"matrix": [3, 3], "x": 3, "y": 3.25}, + {"matrix": [2, 4], "x": 4, "y": 2.25, "h": 2}, - { "label": "4,0", "x": 0, "y": 4.25}, - { "label": "4,1", "x": 1, "y": 4.25}, - { "label": "4,2", "x": 2, "y": 4.25}, - { "label": "4,3", "x": 3, "y": 4.25}, + {"matrix": [4, 0], "x": 0, "y": 4.25}, + {"matrix": [4, 1], "x": 1, "y": 4.25}, + {"matrix": [4, 2], "x": 2, "y": 4.25}, + {"matrix": [4, 3], "x": 3, "y": 4.25}, - { "label": "5,0", "x": 0, "y": 5.25}, - { "label": "5,1", "x": 1, "y": 5.25, "w": 2}, - { "label": "5,2", "x": 3, "y": 5.25}, - { "label": "5,3", "x": 4, "y": 4.25, "h": 2} + {"matrix": [5, 0], "x": 0, "y": 5.25}, + {"matrix": [5, 1], "x": 1, "y": 5.25, "w": 2}, + {"matrix": [5, 2], "x": 3, "y": 5.25}, + {"matrix": [5, 3], "x": 4, "y": 4.25, "h": 2} ] } } diff --git a/keyboards/idobao/montex/v1/v1.c b/keyboards/idobao/montex/v1/v1.c deleted file mode 100644 index e927383097..0000000000 --- a/keyboards/idobao/montex/v1/v1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 NachoxMacho -* -* 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/>. -*/ - -#include "v1.h" diff --git a/keyboards/idobao/montex/v1/v1.h b/keyboards/idobao/montex/v1/v1.h deleted file mode 100644 index d57097fa88..0000000000 --- a/keyboards/idobao/montex/v1/v1.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2021 NachoxMacho -* -* 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 - -#include "quantum.h" - -#define LAYOUT_numpad_6x5( \ - K00, K01, K02, K03, K04, \ - K10, K11, K12, K13, K14, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, K34, \ - K40, K41, K42, K43, \ - K50, K51, K52, K53 \ -) { \ - { K00, K01, K02, K03, K04 }, \ - { K10, K11, K12, K13, K14 }, \ - { K20, K21, K22, K23, K34 }, \ - { K30, K31, K32, K33, KC_NO }, \ - { K40, K41, K42, K43, KC_NO }, \ - { K50, K51, K52, K53, KC_NO } \ -} diff --git a/keyboards/idobao/montex/v1rgb/config.h b/keyboards/idobao/montex/v1rgb/config.h index a3b2a5ef92..789479de05 100755 --- a/keyboards/idobao/montex/v1rgb/config.h +++ b/keyboards/idobao/montex/v1rgb/config.h @@ -3,24 +3,7 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - */ -#define MATRIX_ROW_PINS { D4, D6, D7, B4, B5, C6 } -#define MATRIX_COL_PINS { D5, D3, D2, D1, D0 } - -#define DIODE_DIRECTION ROW2COL - -#define RGB_DI_PIN B1 - -#if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE) +#if defined(RGB_MATRIX_ENABLE) // The number of LEDs connected #define RGB_MATRIX_LED_COUNT 31 diff --git a/keyboards/idobao/montex/v1rgb/info.json b/keyboards/idobao/montex/v1rgb/info.json index 75add6a896..5980cab117 100755 --- a/keyboards/idobao/montex/v1rgb/info.json +++ b/keyboards/idobao/montex/v1rgb/info.json @@ -6,39 +6,55 @@ "pid": "0x0127", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "WS2812" + }, + "matrix_pins": { + "cols": ["D5", "D3", "D2", "D1", "D0"], + "rows": ["D4", "D6", "D7", "B4", "B5", "C6"] + }, + "ws2812": { + "pin": "B1" + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["numpad_6x5"], "layouts": { "LAYOUT_numpad_6x5": { "layout": [ - { "label": "K00 (D4,D5)", "x": 0, "y": 0 }, - { "label": "K01 (D4,D3)", "x": 1, "y": 0 }, - { "label": "K02 (D4,D2)", "x": 2, "y": 0 }, - { "label": "K03 (D4,D1)", "x": 3, "y": 0 }, - { "label": "K04 (D4,D0)", "x": 4, "y": 0 }, - { "label": "K10 (D6,D5)", "x": 0, "y": 1 }, - { "label": "K11 (D6,D3)", "x": 1, "y": 1 }, - { "label": "K12 (D6,D2)", "x": 2, "y": 1 }, - { "label": "K13 (D6,D1)", "x": 3, "y": 1 }, - { "label": "K14 (D6,D0)", "x": 4, "y": 1 }, - { "label": "K20 (D7,D5)", "x": 0, "y": 2 }, - { "label": "K21 (D7,D3)", "x": 1, "y": 2 }, - { "label": "K22 (D7,D2)", "x": 2, "y": 2 }, - { "label": "K23 (D7,D1)", "x": 3, "y": 2 }, - { "label": "K24 (D7,D0)", "x": 4, "y": 2, "h": 2 }, - { "label": "K30 (B4,D5)", "x": 0, "y": 3 }, - { "label": "K31 (B4,D3)", "x": 1, "y": 3 }, - { "label": "K32 (B4,D2)", "x": 2, "y": 3 }, - { "label": "K33 (B4,D1)", "x": 3, "y": 3 }, - { "label": "K40 (B5,D5)", "x": 0, "y": 4 }, - { "label": "K41 (B5,D3)", "x": 1, "y": 4 }, - { "label": "K42 (B5,D2)", "x": 2, "y": 4 }, - { "label": "K43 (B5,D1)", "x": 3, "y": 4 }, - { "label": "K53 (C6,D1)", "x": 4, "y": 4, "h": 2 }, - { "label": "K50 (C6,D5)", "x": 0, "y": 5 }, - { "label": "K51 (C6,D3)", "x": 1, "y": 5, "w": 2 }, - { "label": "K52 (C6,D2)", "x": 3, "y": 5 } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [5, 3], "x": 4, "y": 4, "h": 2}, + + {"matrix": [5, 0], "x": 0, "y": 5}, + {"matrix": [5, 1], "x": 1, "y": 5, "w": 2}, + {"matrix": [5, 2], "x": 3, "y": 5} ] } } diff --git a/keyboards/idobao/montex/v1rgb/rules.mk b/keyboards/idobao/montex/v1rgb/rules.mk index 9a1656f5d6..88f044a7ec 100755 --- a/keyboards/idobao/montex/v1rgb/rules.mk +++ b/keyboards/idobao/montex/v1rgb/rules.mk @@ -10,4 +10,3 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 diff --git a/keyboards/idobao/montex/v1rgb/v1rgb.c b/keyboards/idobao/montex/v1rgb/v1rgb.c index 3d2a847c00..b70067cfcf 100755 --- a/keyboards/idobao/montex/v1rgb/v1rgb.c +++ b/keyboards/idobao/montex/v1rgb/v1rgb.c @@ -1,7 +1,7 @@ // Copyright 2022 peepeetee (@peepeetee) // SPDX-License-Identifier: GPL-2.0-or-later -#include "v1rgb.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/idobao/montex/v1rgb/v1rgb.h b/keyboards/idobao/montex/v1rgb/v1rgb.h deleted file mode 100755 index e069771c6f..0000000000 --- a/keyboards/idobao/montex/v1rgb/v1rgb.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2022 peepeetee (@peepeetee) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define ___ KC_NO - -#define LAYOUT_numpad_6x5( \ - K00, K01, K02, K03, K04, \ - K10, K11, K12, K13, K14, \ - K20, K21, K22, K23, K24, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43, K53, \ - K50, K51, K52 \ -) { \ - { K00, K01, K02, K03, K04 }, \ - { K10, K11, K12, K13, K14 }, \ - { K20, K21, K22, K23, K24 }, \ - { K30, K31, K32, K33, ___ }, \ - { K40, K41, K42, K43, ___ }, \ - { K50, K51, K52, K53, ___ }, \ -} diff --git a/keyboards/idobao/montex/v2/config.h b/keyboards/idobao/montex/v2/config.h index 47e51e9268..a7cd0d6114 100755 --- a/keyboards/idobao/montex/v2/config.h +++ b/keyboards/idobao/montex/v2/config.h @@ -3,11 +3,7 @@ #pragma once - -/* LED Matrix & Animations */ -#define RGB_DI_PIN B1 - -#if defined(RGB_DI_PIN) && defined(RGB_MATRIX_ENABLE) +#if defined(RGB_MATRIX_ENABLE) #ifndef ID27_DISABLE_UNDERGLOW #define RGB_MATRIX_LED_COUNT 31 // The number of LEDs connected #else diff --git a/keyboards/idobao/montex/v2/info.json b/keyboards/idobao/montex/v2/info.json index 55b330609f..f034db3c03 100755 --- a/keyboards/idobao/montex/v2/info.json +++ b/keyboards/idobao/montex/v2/info.json @@ -14,6 +14,12 @@ "backlight": false, "rgblight": false }, + "ws2812": { + "pin": "B1" + }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["D5", "D3", "D2", "D1", "D0"], "rows": ["D4", "D6", "D7", "B4", "B5", "C6"] @@ -28,38 +34,38 @@ "layouts": { "LAYOUT_numpad_6x5": { "layout": [ - { "matrix": [0, 0], "x": 0, "y": 0 }, - { "matrix": [0, 1], "x": 1, "y": 0 }, - { "matrix": [0, 2], "x": 2, "y": 0 }, - { "matrix": [0, 3], "x": 3, "y": 0 }, - { "matrix": [0, 4], "x": 4, "y": 0 }, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, - { "matrix": [1, 0], "x": 0, "y": 1 }, - { "matrix": [1, 1], "x": 1, "y": 1 }, - { "matrix": [1, 2], "x": 2, "y": 1 }, - { "matrix": [1, 3], "x": 3, "y": 1 }, - { "matrix": [1, 4], "x": 4, "y": 1 }, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, - { "matrix": [2, 0], "x": 0, "y": 2 }, - { "matrix": [2, 1], "x": 1, "y": 2 }, - { "matrix": [2, 2], "x": 2, "y": 2 }, - { "matrix": [2, 3], "x": 3, "y": 2 }, - { "matrix": [2, 4], "x": 4, "y": 2, "h": 2 }, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2, "h": 2}, - { "matrix": [3, 0], "x": 0, "y": 3 }, - { "matrix": [3, 1], "x": 1, "y": 3 }, - { "matrix": [3, 2], "x": 2, "y": 3 }, - { "matrix": [3, 3], "x": 3, "y": 3 }, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, - { "matrix": [4, 0], "x": 0, "y": 4 }, - { "matrix": [4, 1], "x": 1, "y": 4 }, - { "matrix": [4, 2], "x": 2, "y": 4 }, - { "matrix": [4, 3], "x": 3, "y": 4 }, - { "matrix": [5, 3], "x": 4, "y": 4, "h": 2 }, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [5, 3], "x": 4, "y": 4, "h": 2}, - { "matrix": [5, 0], "x": 0, "y": 5 }, - { "matrix": [5, 1], "x": 1, "y": 5, "w": 2 }, - { "matrix": [5, 2], "x": 3, "y": 5 } + {"matrix": [5, 0], "x": 0, "y": 5}, + {"matrix": [5, 1], "x": 1, "y": 5, "w": 2}, + {"matrix": [5, 2], "x": 3, "y": 5} ] } } diff --git a/keyboards/idobao/montex/v2/rules.mk b/keyboards/idobao/montex/v2/rules.mk index 205f56d5fd..d249ac15a7 100755 --- a/keyboards/idobao/montex/v2/rules.mk +++ b/keyboards/idobao/montex/v2/rules.mk @@ -2,4 +2,3 @@ # ** settings are data driven & stored in `info.json` ** RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 diff --git a/keyboards/idobao/montex/v2/v2.c b/keyboards/idobao/montex/v2/v2.c index 0f06aa708e..ad6e32a692 100755 --- a/keyboards/idobao/montex/v2/v2.c +++ b/keyboards/idobao/montex/v2/v2.c @@ -1,7 +1,7 @@ // Copyright 2022 IBNobody (@IBNobody) // SPDX-License-Identifier: GPL-2.0-or-later -#include "v2.h" +#include "quantum.h" #define __ NO_LED diff --git a/keyboards/idobao/montex/v2/v2.h b/keyboards/idobao/montex/v2/v2.h deleted file mode 100755 index 3f486480db..0000000000 --- a/keyboards/idobao/montex/v2/v2.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2022 IBNobody (@IBNobody) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" |