diff options
Diffstat (limited to 'keyboards/idobao')
68 files changed, 1131 insertions, 1451 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.2 |