diff options
Diffstat (limited to 'keyboards/lazydesigners')
34 files changed, 555 insertions, 908 deletions
diff --git a/keyboards/lazydesigners/bolt/bolt.c b/keyboards/lazydesigners/bolt/bolt.c deleted file mode 100644 index 074d6bfd5a..0000000000 --- a/keyboards/lazydesigners/bolt/bolt.c +++ /dev/null @@ -1 +0,0 @@ -#include "bolt.h" diff --git a/keyboards/lazydesigners/bolt/bolt.h b/keyboards/lazydesigners/bolt/bolt.h deleted file mode 100644 index 412ed7b099..0000000000 --- a/keyboards/lazydesigners/bolt/bolt.h +++ /dev/null @@ -1,32 +0,0 @@ -/* -Copyright 2020 LAZYDESIGNERS - -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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K311, \ - K300, K301, K303, K304, K306, K307, K308, K309, K310 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211 }, \ - { K300, K301, KC_NO, K303, K304, KC_NO, K306, K307, K308, K309, K310, K311 } \ -} diff --git a/keyboards/lazydesigners/bolt/config.h b/keyboards/lazydesigners/bolt/config.h index 380b5575e9..218631d1d5 100644 --- a/keyboards/lazydesigners/bolt/config.h +++ b/keyboards/lazydesigners/bolt/config.h @@ -17,15 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { F0, C7, B6, D5 } -#define MATRIX_COL_PINS { F1, F4, F5, F6, F7, C6, B3, B7, D0, D3, D2, D1 } - -#define DIODE_DIRECTION COL2ROW - /* RBG underglow */ -#define RGB_DI_PIN E6 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -41,4 +33,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/lazydesigners/bolt/info.json b/keyboards/lazydesigners/bolt/info.json index 98874151a8..a12226cf51 100644 --- a/keyboards/lazydesigners/bolt/info.json +++ b/keyboards/lazydesigners/bolt/info.json @@ -8,57 +8,68 @@ "pid": "0x0041", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E6" + }, + "matrix_pins": { + "cols": ["F1", "F4", "F5", "F6", "F7", "C6", "B3", "B7", "D0", "D3", "D2", "D1"], + "rows": ["F0", "C7", "B6", "D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ - {"label":"K000 (F0,F1)", "x":0, "y":0}, - {"label":"K001 (F0,F4)", "x":1, "y":0}, - {"label":"K002 (F0,F5)", "x":2, "y":0}, - {"label":"K003 (F0,F6)", "x":3, "y":0}, - {"label":"K004 (F0,F7)", "x":4, "y":0}, - {"label":"K005 (F0,C6)", "x":5, "y":0}, - {"label":"K006 (F0,B3)", "x":7.5, "y":0}, - {"label":"K007 (F0,B7)", "x":8.5, "y":0}, - {"label":"K008 (F0,D0)", "x":9.5, "y":0}, - {"label":"K009 (F0,D3)", "x":10.5, "y":0}, - {"label":"K010 (F0,D2)", "x":11.5, "y":0}, - {"label":"K011 (F0,D1)", "x":12.5, "y":0, "w":1.75}, - {"label":"K100 (C7,F1)", "x":0, "y":1, "w":1.25}, - {"label":"K101 (C7,F4)", "x":1.25, "y":1}, - {"label":"K102 (C7,F5)", "x":2.25, "y":1}, - {"label":"K103 (C7,F6)", "x":3.25, "y":1}, - {"label":"K104 (C7,F7)", "x":4.25, "y":1}, - {"label":"K105 (C7,C6)", "x":5.25, "y":1}, - {"label":"K106 (C7,B3)", "x":7.75, "y":1}, - {"label":"K107 (C7,B7)", "x":8.75, "y":1}, - {"label":"K108 (C7,D0)", "x":9.75, "y":1}, - {"label":"K109 (C7,D3)", "x":10.75, "y":1}, - {"label":"K110 (C7,D2)", "x":11.75, "y":1}, - {"label":"K111 (C7,D1)", "x":12.75, "y":1, "w":1.5}, - {"label":"K200 (B6,F1)", "x":0, "y":2, "w":1.75}, - {"label":"K201 (B6,F4)", "x":1.75, "y":2}, - {"label":"K202 (B6,F5)", "x":2.75, "y":2}, - {"label":"K203 (B6,F6)", "x":3.75, "y":2}, - {"label":"K204 (B6,F7)", "x":4.75, "y":2}, - {"label":"K205 (B6,C6)", "x":5.75, "y":2}, - {"label":"K206 (B6,B3)", "x":7.25, "y":2}, - {"label":"K207 (B6,B7)", "x":8.25, "y":2}, - {"label":"K208 (B6,D0)", "x":9.25, "y":2}, - {"label":"K209 (B6,D3)", "x":10.25, "y":2}, - {"label":"K210 (B6,D2)", "x":11.25, "y":2}, - {"label":"K211 (B6,D1)", "x":12.25, "y":2}, - {"label":"K311 (D5,D1)", "x":13.25, "y":2}, - {"label":"K300 (D5,F1)", "x":0, "y":3, "w":1.25}, - {"label":"K301 (D5,F4)", "x":1.25, "y":3, "w":1.25}, - {"label":"K303 (D5,F6)", "x":3.25, "y":3, "w":1.25}, - {"label":"K304 (D5,F7)", "x":4.5, "y":3, "w":2.25}, - {"label":"K306 (D5,B3)", "x":7.25, "y":3, "w":2.25}, - {"label":"K307 (D5,B7)", "x":9.5, "y":3}, - {"label":"K308 (D5,D0)", "x":11.25, "y":3}, - {"label":"K309 (D5,D3)", "x":12.25, "y":3}, - {"label":"K310 (D5,D2)", "x":13.25, "y":3} + {"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": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + {"matrix": [0, 9], "x": 10.5, "y": 0}, + {"matrix": [0, 10], "x": 11.5, "y": 0}, + {"matrix": [0, 11], "x": 12.5, "y": 0, "w": 1.75}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 7.75, "y": 1}, + {"matrix": [1, 7], "x": 8.75, "y": 1}, + {"matrix": [1, 8], "x": 9.75, "y": 1}, + {"matrix": [1, 9], "x": 10.75, "y": 1}, + {"matrix": [1, 10], "x": 11.75, "y": 1}, + {"matrix": [1, 11], "x": 12.75, "y": 1, "w": 1.5}, + + {"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": 7.25, "y": 2}, + {"matrix": [2, 7], "x": 8.25, "y": 2}, + {"matrix": [2, 8], "x": 9.25, "y": 2}, + {"matrix": [2, 9], "x": 10.25, "y": 2}, + {"matrix": [2, 10], "x": 11.25, "y": 2}, + {"matrix": [2, 11], "x": 12.25, "y": 2}, + {"matrix": [3, 11], "x": 13.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 3.25, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 4.5, "y": 3, "w": 2.25}, + {"matrix": [3, 6], "x": 7.25, "y": 3, "w": 2.25}, + {"matrix": [3, 7], "x": 9.5, "y": 3}, + {"matrix": [3, 8], "x": 11.25, "y": 3}, + {"matrix": [3, 9], "x": 12.25, "y": 3}, + {"matrix": [3, 10], "x": 13.25, "y": 3} ] } } diff --git a/keyboards/lazydesigners/cassette8/cassette8.c b/keyboards/lazydesigners/cassette8/cassette8.c deleted file mode 100755 index a36de6d7a6..0000000000 --- a/keyboards/lazydesigners/cassette8/cassette8.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 LAZYDESIGNERS - * - * 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 "cassette8.h" diff --git a/keyboards/lazydesigners/cassette8/cassette8.h b/keyboards/lazydesigners/cassette8/cassette8.h deleted file mode 100755 index 9b640638f6..0000000000 --- a/keyboards/lazydesigners/cassette8/cassette8.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright 2021 LAZYDESIGNERS - * - * 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( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13 \ -) { \ - { K00, K01, K02, K03, }, \ - { K10, K11, K12, K13 }, \ -} diff --git a/keyboards/lazydesigners/cassette8/config.h b/keyboards/lazydesigners/cassette8/config.h index 8992272f7b..23284233ef 100755 --- a/keyboards/lazydesigners/cassette8/config.h +++ b/keyboards/lazydesigners/cassette8/config.h @@ -16,17 +16,7 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B3, B2 } -#define MATRIX_COL_PINS { B5, B4, B1, B0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* RBG underglow */ -#define RGB_DI_PIN C2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -42,5 +32,3 @@ /* #define RGBLIGHT_HUE_STEP 8 */ /* #define RGBLIGHT_SAT_STEP 8 */ /* #define RGBLIGHT_VAL_STEP 8 */ -#endif - diff --git a/keyboards/lazydesigners/cassette8/info.json b/keyboards/lazydesigners/cassette8/info.json index fd2733321b..d01080fabf 100755 --- a/keyboards/lazydesigners/cassette8/info.json +++ b/keyboards/lazydesigners/cassette8/info.json @@ -8,19 +8,28 @@ "pid": "0x0008", "device_version": "0.0.1" }, + "ws2812": { + "pin": "C2" + }, + "matrix_pins": { + "cols": ["B5", "B4", "B1", "B0"], + "rows": ["B3", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ - {"label":"1", "x":0, "y":0}, - {"label":"2", "x":1, "y":0}, - {"label":"3", "x":2, "y":0}, - {"label":"4", "x":3, "y":0}, - {"label":"5", "x":0, "y":1}, - {"label":"6", "x":1, "y":1}, - {"label":"7", "x":2, "y":1}, - {"label":"8", "x":3, "y":1} + {"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": [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} ] } } diff --git a/keyboards/lazydesigners/dimple/config.h b/keyboards/lazydesigners/dimple/config.h index 1f625bafb8..0dc7502eac 100644 --- a/keyboards/lazydesigners/dimple/config.h +++ b/keyboards/lazydesigners/dimple/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D0, D1, D2, D3 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, D4, D6, D7, B4, B5, B6, C6, C7 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE @@ -32,8 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define LOCKING_RESYNC_ENABLE /* RBG underglow */ -#define RGB_DI_PIN B7 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -49,4 +39,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/lazydesigners/dimple/ortho/info.json b/keyboards/lazydesigners/dimple/ortho/info.json index 5bd57ed1b7..a5fc41c143 100644 --- a/keyboards/lazydesigners/dimple/ortho/info.json +++ b/keyboards/lazydesigners/dimple/ortho/info.json @@ -8,151 +8,168 @@ "pid": "0x0040", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], + "rows": ["D0", "D1", "D2", "D3"] + }, + "diode_direction": "COL2ROW", + "ws2812": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_2u": { "layout": [ - {"label":"Esc", "x":0, "y":0, "w":1.25}, - {"label":"Q", "x":1.25, "y":0}, - {"label":"W", "x":2.25, "y":0}, - {"label":"E", "x":3.25, "y":0}, - {"label":"R", "x":4.25, "y":0}, - {"label":"T", "x":5.25, "y":0}, - {"label":"Y", "x":6.25, "y":0}, - {"label":"U", "x":7.25, "y":0}, - {"label":"I", "x":8.25, "y":0}, - {"label":"O", "x":9.25, "y":0}, - {"label":"P", "x":10.25, "y":0}, - {"label":"BackSpace", "x":11.25, "y":0, "w":1.25}, - {"label":"Tab", "x":0, "y":1, "w":1.25}, - {"label":"A", "x":1.25, "y":1}, - {"label":"S", "x":2.25, "y":1}, - {"label":"D", "x":3.25, "y":1}, - {"label":"F", "x":4.25, "y":1}, - {"label":"G", "x":5.25, "y":1}, - {"label":"H", "x":6.25, "y":1}, - {"label":"J", "x":7.25, "y":1}, - {"label":"K", "x":8.25, "y":1}, - {"label":"L", "x":9.25, "y":1}, - {"label":"'", "x":10.25, "y":1}, - {"label":"Enter", "x":11.25, "y":1, "w":1.25}, - {"label":"Shift", "x":0, "y":2, "w":1.25}, - {"label":"Z", "x":1.25, "y":2}, - {"label":"X", "x":2.25, "y":2}, - {"label":"C", "x":3.25, "y":2}, - {"label":"V", "x":4.25, "y":2}, - {"label":"B", "x":5.25, "y":2}, - {"label":"N", "x":6.25, "y":2}, - {"label":"M", "x":7.25, "y":2}, - {"label":",", "x":8.25, "y":2}, - {"label":".", "x":9.25, "y":2}, - {"label":"Up", "x":10.25, "y":2}, - {"label":"FN", "x":11.25, "y":2, "w":1.25}, - {"label":"Ctrl", "x":0.75, "y":3}, - {"label":"Gui", "x":1.75, "y":3}, - {"label":"Alt", "x":2.75, "y":3}, - {"label":"Space", "x":3.75, "y":3, "w":2}, - {"label":"FN", "x":5.75, "y":3}, - {"label":"Space", "x":6.75, "y":3, "w":2}, - {"label":"Left", "x":8.75, "y":3}, - {"label":"Down", "x":9.75, "y":3}, - {"label":"Right", "x":10.75, "y":3} - ] + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25}, + {"matrix": [0, 1], "x": 1.25, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + {"matrix": [0, 5], "x": 5.25, "y": 0}, + {"matrix": [0, 6], "x": 6.25, "y": 0}, + {"matrix": [0, 7], "x": 7.25, "y": 0}, + {"matrix": [0, 8], "x": 8.25, "y": 0}, + {"matrix": [0, 9], "x": 9.25, "y": 0}, + {"matrix": [0, 10], "x": 10.25, "y": 0}, + {"matrix": [0, 11], "x": 11.25, "y": 0, "w": 1.25}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 10], "x": 10.25, "y": 1}, + {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 2}, + {"matrix": [2, 2], "x": 2.25, "y": 2}, + {"matrix": [2, 3], "x": 3.25, "y": 2}, + {"matrix": [2, 4], "x": 4.25, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + {"matrix": [2, 6], "x": 6.25, "y": 2}, + {"matrix": [2, 7], "x": 7.25, "y": 2}, + {"matrix": [2, 8], "x": 8.25, "y": 2}, + {"matrix": [2, 9], "x": 9.25, "y": 2}, + {"matrix": [2, 10], "x": 10.25, "y": 2}, + {"matrix": [2, 11], "x": 11.25, "y": 2, "w": 1.25}, + + {"matrix": [3, 0], "x": 0.75, "y": 3}, + {"matrix": [3, 2], "x": 1.75, "y": 3}, + {"matrix": [3, 3], "x": 2.75, "y": 3}, + {"matrix": [3, 4], "x": 3.75, "y": 3, "w": 2}, + {"matrix": [3, 5], "x": 5.75, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3, "w": 2}, + {"matrix": [3, 7], "x": 8.75, "y": 3}, + {"matrix": [3, 8], "x": 9.75, "y": 3}, + {"matrix": [3, 9], "x": 10.75, "y": 3} + ] }, "LAYOUT_ortho_3u": { "layout": [ - {"label":"Esc", "x":0, "y":0, "w":1.25}, - {"label":"Q", "x":1.25, "y":0}, - {"label":"W", "x":2.25, "y":0}, - {"label":"E", "x":3.25, "y":0}, - {"label":"R", "x":4.25, "y":0}, - {"label":"T", "x":5.25, "y":0}, - {"label":"Y", "x":6.25, "y":0}, - {"label":"U", "x":7.25, "y":0}, - {"label":"I", "x":8.25, "y":0}, - {"label":"O", "x":9.25, "y":0}, - {"label":"P", "x":10.25, "y":0}, - {"label":"BackSpace", "x":11.25, "y":0, "w":1.25}, - {"label":"Tab", "x":0, "y":1, "w":1.25}, - {"label":"A", "x":1.25, "y":1}, - {"label":"S", "x":2.25, "y":1}, - {"label":"D", "x":3.25, "y":1}, - {"label":"F", "x":4.25, "y":1}, - {"label":"G", "x":5.25, "y":1}, - {"label":"H", "x":6.25, "y":1}, - {"label":"J", "x":7.25, "y":1}, - {"label":"K", "x":8.25, "y":1}, - {"label":"L", "x":9.25, "y":1}, - {"label":"'", "x":10.25, "y":1}, - {"label":"Enter", "x":11.25, "y":1, "w":1.25}, - {"label":"Shift", "x":0, "y":2, "w":1.25}, - {"label":"Z", "x":1.25, "y":2}, - {"label":"X", "x":2.25, "y":2}, - {"label":"C", "x":3.25, "y":2}, - {"label":"V", "x":4.25, "y":2}, - {"label":"B", "x":5.25, "y":2}, - {"label":"N", "x":6.25, "y":2}, - {"label":"M", "x":7.25, "y":2}, - {"label":",", "x":8.25, "y":2}, - {"label":".", "x":9.25, "y":2}, - {"label":"Up", "x":10.25, "y":2}, - {"label":"FN", "x":11.25, "y":2, "w":1.25}, - {"label":"Ctrl", "x":0.75, "y":3}, - {"label":"Gui", "x":1.75, "y":3}, - {"label":"Alt", "x":2.75, "y":3}, - {"label":"Raise", "x":3.75, "y":3}, - {"label":"FN", "x":4.75, "y":3,"w":3}, - {"label":"Lower", "x":7.75, "y":3}, - {"label":"Left", "x":8.75, "y":3}, - {"label":"Down", "x":9.75, "y":3}, - {"label":"Right", "x":10.75, "y":3} - ] + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25}, + {"matrix": [0, 1], "x": 1.25, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + {"matrix": [0, 5], "x": 5.25, "y": 0}, + {"matrix": [0, 6], "x": 6.25, "y": 0}, + {"matrix": [0, 7], "x": 7.25, "y": 0}, + {"matrix": [0, 8], "x": 8.25, "y": 0}, + {"matrix": [0, 9], "x": 9.25, "y": 0}, + {"matrix": [0, 10], "x": 10.25, "y": 0}, + {"matrix": [0, 11], "x": 11.25, "y": 0, "w": 1.25}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 10], "x": 10.25, "y": 1}, + {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 2}, + {"matrix": [2, 2], "x": 2.25, "y": 2}, + {"matrix": [2, 3], "x": 3.25, "y": 2}, + {"matrix": [2, 4], "x": 4.25, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + {"matrix": [2, 6], "x": 6.25, "y": 2}, + {"matrix": [2, 7], "x": 7.25, "y": 2}, + {"matrix": [2, 8], "x": 8.25, "y": 2}, + {"matrix": [2, 9], "x": 9.25, "y": 2}, + {"matrix": [2, 10], "x": 10.25, "y": 2}, + {"matrix": [2, 11], "x": 11.25, "y": 2, "w": 1.25}, + + {"matrix": [3, 0], "x": 0.75, "y": 3}, + {"matrix": [3, 2], "x": 1.75, "y": 3}, + {"matrix": [3, 3], "x": 2.75, "y": 3}, + {"matrix": [3, 4], "x": 3.75, "y": 3}, + {"matrix": [3, 5], "x": 4.75, "y": 3, "w": 3}, + {"matrix": [3, 6], "x": 7.75, "y": 3}, + {"matrix": [3, 7], "x": 8.75, "y": 3}, + {"matrix": [3, 8], "x": 9.75, "y": 3}, + {"matrix": [3, 9], "x": 10.75, "y": 3} + ] }, "LAYOUT_ortho_7u": { "layout": [ - {"label":"Esc", "x":0, "y":0, "w":1.25}, - {"label":"Q", "x":1.25, "y":0}, - {"label":"W", "x":2.25, "y":0}, - {"label":"E", "x":3.25, "y":0}, - {"label":"R", "x":4.25, "y":0}, - {"label":"T", "x":5.25, "y":0}, - {"label":"Y", "x":6.25, "y":0}, - {"label":"U", "x":7.25, "y":0}, - {"label":"I", "x":8.25, "y":0}, - {"label":"O", "x":9.25, "y":0}, - {"label":"P", "x":10.25, "y":0}, - {"label":"Back<br>Space", "x":11.25, "y":0, "w":1.25}, - {"label":"Tab", "x":0, "y":1, "w":1.25}, - {"label":"A", "x":1.25, "y":1}, - {"label":"S", "x":2.25, "y":1}, - {"label":"D", "x":3.25, "y":1}, - {"label":"F", "x":4.25, "y":1}, - {"label":"G", "x":5.25, "y":1}, - {"label":"H", "x":6.25, "y":1}, - {"label":"J", "x":7.25, "y":1}, - {"label":"K", "x":8.25, "y":1}, - {"label":"L", "x":9.25, "y":1}, - {"label":"'", "x":10.25, "y":1}, - {"label":"Enter", "x":11.25, "y":1, "w":1.25}, - {"label":"Shift", "x":0, "y":2, "w":1.25}, - {"label":"Z", "x":1.25, "y":2}, - {"label":"X", "x":2.25, "y":2}, - {"label":"C", "x":3.25, "y":2}, - {"label":"V", "x":4.25, "y":2}, - {"label":"B", "x":5.25, "y":2}, - {"label":"N", "x":6.25, "y":2}, - {"label":"M", "x":7.25, "y":2}, - {"label":",", "x":8.25, "y":2}, - {"label":".", "x":9.25, "y":2}, - {"label":"Up", "x":10.25, "y":2}, - {"label":"FN", "x":11.25, "y":2, "w":1.25}, - {"label":"Ctrl", "x":0.75, "y":3}, - {"label":"Gui", "x":1.75, "y":3}, - {"label":"Space", "x":2.75, "y":3, "w":7}, - {"label":"Down", "x":9.75, "y":3}, - {"label":"Right", "x":10.75, "y":3} - ] + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25}, + {"matrix": [0, 1], "x": 1.25, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + {"matrix": [0, 5], "x": 5.25, "y": 0}, + {"matrix": [0, 6], "x": 6.25, "y": 0}, + {"matrix": [0, 7], "x": 7.25, "y": 0}, + {"matrix": [0, 8], "x": 8.25, "y": 0}, + {"matrix": [0, 9], "x": 9.25, "y": 0}, + {"matrix": [0, 10], "x": 10.25, "y": 0}, + {"matrix": [0, 11], "x": 11.25, "y": 0, "w": 1.25}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 10], "x": 10.25, "y": 1}, + {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 2}, + {"matrix": [2, 2], "x": 2.25, "y": 2}, + {"matrix": [2, 3], "x": 3.25, "y": 2}, + {"matrix": [2, 4], "x": 4.25, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + {"matrix": [2, 6], "x": 6.25, "y": 2}, + {"matrix": [2, 7], "x": 7.25, "y": 2}, + {"matrix": [2, 8], "x": 8.25, "y": 2}, + {"matrix": [2, 9], "x": 9.25, "y": 2}, + {"matrix": [2, 10], "x": 10.25, "y": 2}, + {"matrix": [2, 11], "x": 11.25, "y": 2, "w": 1.25}, + + {"matrix": [3, 0], "x": 0.75, "y": 3}, + {"matrix": [3, 2], "x": 1.75, "y": 3}, + {"matrix": [3, 5], "x": 2.75, "y": 3, "w": 7}, + {"matrix": [3, 8], "x": 9.75, "y": 3}, + {"matrix": [3, 9], "x": 10.75, "y": 3} + ] } } } diff --git a/keyboards/lazydesigners/dimple/ortho/ortho.c b/keyboards/lazydesigners/dimple/ortho/ortho.c deleted file mode 100644 index da76fde176..0000000000 --- a/keyboards/lazydesigners/dimple/ortho/ortho.c +++ /dev/null @@ -1,15 +0,0 @@ -/* - Copyright 2021 LAZYDESIGNERS - 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 "ortho.h" diff --git a/keyboards/lazydesigners/dimple/ortho/ortho.h b/keyboards/lazydesigners/dimple/ortho/ortho.h deleted file mode 100644 index 592cf47de3..0000000000 --- a/keyboards/lazydesigners/dimple/ortho/ortho.h +++ /dev/null @@ -1,91 +0,0 @@ -/* - Copyright 2021 LAZYDESIGNERS - 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" - -/* - * ,-------------------------------------------------------------. - * | | | | | | | | | | | | | - * |-------------------------------------------------------------| - * | | | | | | | | | | | | | - * |-------------------------------------------------------------| - * | | | | | | | | | | | | | - * |-------------------------------------------------------------| - * | | | | 2U | | 2U | | | | - * `------------------------------------------------------' - */ - -#define LAYOUT_ortho_2u( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \ - K300, K302, K303, K304, K305, K306, K307, K308, K309 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211 }, \ - { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, KC_NO, KC_NO } \ -} - -/* - * ,-------------------------------------------------------------. - * | | | | | | | | | | | | | - * |-------------------------------------------------------------| - * | | | | | | | | | | | | | - * |-------------------------------------------------------------| - * | | | | | | | | | | | | | - * |-------------------------------------------------------------| - * | | | | | 3U | | | | | - * `------------------------------------------------------' - */ - -#define LAYOUT_ortho_3u( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \ - K300, K302, K303, K304, K305, K306, K307, K308, K309 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211 }, \ - { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, KC_NO, KC_NO } \ -} - -/* - * ,-------------------------------------------------------------. - * | | | | | | | | | | | | | - * |-------------------------------------------------------------| - * | | | | | | | | | | | | | - * |-------------------------------------------------------------| - * | | | | | | | | | | | | | - * |-------------------------------------------------------------| - * | | | 7U | | | - * `------------------------------------------------------' - */ - -#define LAYOUT_ortho_7u( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \ - K300, K302, K305, K308, K309 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211 }, \ - { K300, KC_NO, K302, KC_NO, KC_NO, K305, KC_NO, KC_NO, K308, K309, KC_NO, KC_NO } \ -} - - diff --git a/keyboards/lazydesigners/dimple/staggered/info.json b/keyboards/lazydesigners/dimple/staggered/info.json index 1161789c1e..a9b5b8751a 100644 --- a/keyboards/lazydesigners/dimple/staggered/info.json +++ b/keyboards/lazydesigners/dimple/staggered/info.json @@ -8,6 +8,14 @@ "pid": "0x0040", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B7" + }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], + "rows": ["D0", "D1", "D2", "D3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/lazydesigners/dimpleplus/config.h b/keyboards/lazydesigners/dimpleplus/config.h index 9d8dca9693..828667122d 100644 --- a/keyboards/lazydesigners/dimpleplus/config.h +++ b/keyboards/lazydesigners/dimpleplus/config.h @@ -17,15 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { B3, F0, E6, F4, F5 } -#define MATRIX_COL_PINS { F1, D5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 } - -#define DIODE_DIRECTION COL2ROW - /* RBG underglow */ -#define RGB_DI_PIN D2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -41,4 +33,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/lazydesigners/dimpleplus/dimpleplus.c b/keyboards/lazydesigners/dimpleplus/dimpleplus.c deleted file mode 100644 index 36eed8cc13..0000000000 --- a/keyboards/lazydesigners/dimpleplus/dimpleplus.c +++ /dev/null @@ -1 +0,0 @@ -#include "dimpleplus.h" diff --git a/keyboards/lazydesigners/dimpleplus/dimpleplus.h b/keyboards/lazydesigners/dimpleplus/dimpleplus.h deleted file mode 100644 index 93199dc6e0..0000000000 --- a/keyboards/lazydesigners/dimpleplus/dimpleplus.h +++ /dev/null @@ -1,47 +0,0 @@ -/* -Copyright 2020 LAZYDESIGNERS - -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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, \ - K400, K402, K403, K404, K406, K407, K408, K409 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, KC_NO }, \ - { K400, KC_NO, K402, K403, K404, KC_NO, K406, K407, K408, K409, KC_NO, KC_NO } \ -} - -#define LAYOUT_7u( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K211, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, \ - K400, K402, K404, K408, K409 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, KC_NO, K211 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310 }, \ - { K400, KC_NO, K402, KC_NO, K404, KC_NO, KC_NO, KC_NO, K408, K409, KC_NO, KC_NO } \ -} diff --git a/keyboards/lazydesigners/dimpleplus/info.json b/keyboards/lazydesigners/dimpleplus/info.json index fd9b7bc44c..0d47a51f95 100644 --- a/keyboards/lazydesigners/dimpleplus/info.json +++ b/keyboards/lazydesigners/dimpleplus/info.json @@ -8,123 +8,141 @@ "pid": "0x0061", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "D5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["B3", "F0", "E6", "F4", "F5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, + "ws2812": { + "pin": "D2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ - {"label":"K000 (B3,F1)", "x":0, "y":0}, - {"label":"K001 (B3,D5)", "x":1.5, "y":0}, - {"label":"K002 (B3,F6)", "x":2.5, "y":0}, - {"label":"K003 (B3,F7)", "x":3.5, "y":0}, - {"label":"K004 (B3,C7)", "x":4.5, "y":0}, - {"label":"K005 (B3,C6)", "x":5.5, "y":0}, - {"label":"K006 (B3,B6)", "x":6.5, "y":0}, - {"label":"K007 (B3,B5)", "x":7.5, "y":0}, - {"label":"K008 (B3,B4)", "x":8.5, "y":0}, - {"label":"K009 (B3,D7)", "x":9.5, "y":0}, - {"label":"K010 (B3,D6)", "x":10.5, "y":0}, - {"label":"K011 (B3,D4)", "x":11.5, "y":0}, - {"label":"K100 (F0,F1)", "x":0, "y":1.25}, - {"label":"K101 (F0,D5)", "x":1, "y":1.25}, - {"label":"K102 (F0,F6)", "x":2, "y":1.25}, - {"label":"K103 (F0,F7)", "x":3, "y":1.25}, - {"label":"K104 (F0,C7)", "x":4, "y":1.25}, - {"label":"K105 (F0,C6)", "x":5, "y":1.25}, - {"label":"K106 (F0,B6)", "x":6, "y":1.25}, - {"label":"K107 (F0,B5)", "x":7, "y":1.25}, - {"label":"K108 (F0,B4)", "x":8, "y":1.25}, - {"label":"K109 (F0,D7)", "x":9, "y":1.25}, - {"label":"K110 (F0,D6)", "x":10, "y":1.25}, - {"label":"K111 (F0,D4)", "x":11, "y":1.25, "w":1.5}, - {"label":"K200 (E6,F1)", "x":0, "y":2.25, "w":1.25}, - {"label":"K201 (E6,D5)", "x":1.25, "y":2.25}, - {"label":"K202 (E6,F6)", "x":2.25, "y":2.25}, - {"label":"K203 (E6,F7)", "x":3.25, "y":2.25}, - {"label":"K204 (E6,C7)", "x":4.25, "y":2.25}, - {"label":"K205 (E6,C6)", "x":5.25, "y":2.25}, - {"label":"K206 (E6,B6)", "x":6.25, "y":2.25}, - {"label":"K207 (E6,B5)", "x":7.25, "y":2.25}, - {"label":"K208 (E6,B4)", "x":8.25, "y":2.25}, - {"label":"K209 (E6,D7)", "x":9.25, "y":2.25}, - {"label":"K210 (E6,D6)", "x":10.25, "y":2.25}, - {"label":"K211 (E6,D4)", "x":11.25, "y":2.25, "w":1.25}, - {"label":"K300 (F4,F1)", "x":0, "y":3.25, "w":1.75}, - {"label":"K301 (F4,D5)", "x":1.75, "y":3.25}, - {"label":"K302 (F4,F6)", "x":2.75, "y":3.25}, - {"label":"K303 (F4,F7)", "x":3.75, "y":3.25}, - {"label":"K304 (F4,C7)", "x":4.75, "y":3.25}, - {"label":"K305 (F4,C6)", "x":5.75, "y":3.25}, - {"label":"K306 (F4,B6)", "x":6.75, "y":3.25}, - {"label":"K307 (F4,B5)", "x":7.75, "y":3.25}, - {"label":"K308 (F4,B4)", "x":8.75, "y":3.25}, - {"label":"K309 (F4,D7)", "x":9.75, "y":3.25}, - {"label":"K310 (F4,D6)", "x":10.75, "y":3.25, "w":1.75}, - {"label":"K400 (F5,F1)", "x":0.75, "y":4.25}, - {"label":"K402 (F5,F6)", "x":1.75, "y":4.25}, - {"label":"K403 (F5,F7)", "x":2.75, "y":4.25}, - {"label":"K404 (F5,C7)", "x":3.75, "y":4.25, "w":2.25}, - {"label":"K406 (F5,B6)", "x":6, "y":4.25, "w":2.75}, - {"label":"K407 (F5,B5)", "x":8.75, "y":4.25}, - {"label":"K408 (F5,B4)", "x":9.75, "y":4.25}, - {"label":"K409 (F5,D7)", "x":10.75, "y":4.25} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.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": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 10.5, "y": 0}, + {"matrix": [0, 11], "x": 11.5, "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": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 2.25}, + {"matrix": [2, 2], "x": 2.25, "y": 2.25}, + {"matrix": [2, 3], "x": 3.25, "y": 2.25}, + {"matrix": [2, 4], "x": 4.25, "y": 2.25}, + {"matrix": [2, 5], "x": 5.25, "y": 2.25}, + {"matrix": [2, 6], "x": 6.25, "y": 2.25}, + {"matrix": [2, 7], "x": 7.25, "y": 2.25}, + {"matrix": [2, 8], "x": 8.25, "y": 2.25}, + {"matrix": [2, 9], "x": 9.25, "y": 2.25}, + {"matrix": [2, 10], "x": 10.25, "y": 2.25}, + {"matrix": [2, 11], "x": 11.25, "y": 2.25, "w": 1.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": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25, "w": 1.75}, + + {"matrix": [4, 0], "x": 0.75, "y": 4.25}, + {"matrix": [4, 2], "x": 1.75, "y": 4.25}, + {"matrix": [4, 3], "x": 2.75, "y": 4.25}, + {"matrix": [4, 4], "x": 3.75, "y": 4.25, "w": 2.25}, + {"matrix": [4, 6], "x": 6, "y": 4.25, "w": 2.75}, + {"matrix": [4, 7], "x": 8.75, "y": 4.25}, + {"matrix": [4, 8], "x": 9.75, "y": 4.25}, + {"matrix": [4, 9], "x": 10.75, "y": 4.25} ] }, "LAYOUT_7u": { "layout": [ - {"label":"K000 (B3,F1)", "x":0, "y":0}, - {"label":"K001 (B3,D5)", "x":1.5, "y":0}, - {"label":"K002 (B3,F6)", "x":2.5, "y":0}, - {"label":"K003 (B3,F7)", "x":3.5, "y":0}, - {"label":"K004 (B3,C7)", "x":4.5, "y":0}, - {"label":"K005 (B3,C6)", "x":5.5, "y":0}, - {"label":"K006 (B3,B6)", "x":6.5, "y":0}, - {"label":"K007 (B3,B5)", "x":7.5, "y":0}, - {"label":"K008 (B3,B4)", "x":8.5, "y":0}, - {"label":"K009 (B3,D7)", "x":9.5, "y":0}, - {"label":"K010 (B3,D6)", "x":10.5, "y":0, "w":2.0}, - {"label":"K100 (F0,F1)", "x":0, "y":1.25}, - {"label":"K101 (F0,D5)", "x":1, "y":1.25}, - {"label":"K102 (F0,F6)", "x":2, "y":1.25}, - {"label":"K103 (F0,F7)", "x":3, "y":1.25}, - {"label":"K104 (F0,C7)", "x":4, "y":1.25}, - {"label":"K105 (F0,C6)", "x":5, "y":1.25}, - {"label":"K106 (F0,B6)", "x":6, "y":1.25}, - {"label":"K107 (F0,B5)", "x":7, "y":1.25}, - {"label":"K108 (F0,B4)", "x":8, "y":1.25}, - {"label":"K109 (F0,D7)", "x":9, "y":1.25}, - {"label":"K110 (F0,D6)", "x":10, "y":1.25}, - {"label":"K111 (F0,D4)", "x":11, "y":1.25, "w":1.5}, - {"label":"K200 (E6,F1)", "x":0, "y":2.25, "w":1.25}, - {"label":"K201 (E6,D5)", "x":1.25, "y":2.25}, - {"label":"K202 (E6,F6)", "x":2.25, "y":2.25}, - {"label":"K203 (E6,F7)", "x":3.25, "y":2.25}, - {"label":"K204 (E6,C7)", "x":4.25, "y":2.25}, - {"label":"K205 (E6,C6)", "x":5.25, "y":2.25}, - {"label":"K206 (E6,B6)", "x":6.25, "y":2.25}, - {"label":"K207 (E6,B5)", "x":7.25, "y":2.25}, - {"label":"K208 (E6,B4)", "x":8.25, "y":2.25}, - {"label":"K209 (E6,D7)", "x":9.25, "y":2.25}, - {"label":"K211 (E6,D4)", "x":10.25, "y":2.25, "w":2.25}, - {"label":"K300 (F4,F1)", "x":0, "y":3.25, "w":1.75}, - {"label":"K301 (F4,D5)", "x":1.75, "y":3.25}, - {"label":"K302 (F4,F6)", "x":2.75, "y":3.25}, - {"label":"K303 (F4,F7)", "x":3.75, "y":3.25}, - {"label":"K304 (F4,C7)", "x":4.75, "y":3.25}, - {"label":"K305 (F4,C6)", "x":5.75, "y":3.25}, - {"label":"K306 (F4,B6)", "x":6.75, "y":3.25}, - {"label":"K307 (F4,B5)", "x":7.75, "y":3.25}, - {"label":"K308 (F4,B4)", "x":8.75, "y":3.25}, - {"label":"K309 (F4,D7)", "x":9.75, "y":3.25}, - {"label":"K310 (F4,D6)", "x":10.75, "y":3.25, "w":1.75}, - {"label":"K400 (F5,F1)", "x":0.75, "y":4.25}, - {"label":"K402 (F5,F6)", "x":1.75, "y":4.25}, - {"label":"K404 (F5,C7)", "x":2.75, "y":4.25, "w":7.00}, - {"label":"K408 (F5,B4)", "x":9.75, "y":4.25}, - {"label":"K409 (F5,D7)", "x":10.75, "y":4.25} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.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": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 10.5, "y": 0, "w": 2}, + + {"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": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 2.25}, + {"matrix": [2, 2], "x": 2.25, "y": 2.25}, + {"matrix": [2, 3], "x": 3.25, "y": 2.25}, + {"matrix": [2, 4], "x": 4.25, "y": 2.25}, + {"matrix": [2, 5], "x": 5.25, "y": 2.25}, + {"matrix": [2, 6], "x": 6.25, "y": 2.25}, + {"matrix": [2, 7], "x": 7.25, "y": 2.25}, + {"matrix": [2, 8], "x": 8.25, "y": 2.25}, + {"matrix": [2, 9], "x": 9.25, "y": 2.25}, + {"matrix": [2, 11], "x": 10.25, "y": 2.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": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25, "w": 1.75}, + + {"matrix": [4, 0], "x": 0.75, "y": 4.25}, + {"matrix": [4, 2], "x": 1.75, "y": 4.25}, + {"matrix": [4, 4], "x": 2.75, "y": 4.25, "w": 7}, + {"matrix": [4, 8], "x": 9.75, "y": 4.25}, + {"matrix": [4, 9], "x": 10.75, "y": 4.25} ] } } diff --git a/keyboards/lazydesigners/the30/config.h b/keyboards/lazydesigners/the30/config.h deleted file mode 100644 index fcb62244c4..0000000000 --- a/keyboards/lazydesigners/the30/config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2019 Erovia - -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 - - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D0, D1, D2 } -#define MATRIX_COL_PINS { B1, B2, B3, D4, D6, D7, B4, B5, B6, C6 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/lazydesigners/the30/info.json b/keyboards/lazydesigners/the30/info.json index 94d5067377..fab36b7f9c 100644 --- a/keyboards/lazydesigners/the30/info.json +++ b/keyboards/lazydesigners/the30/info.json @@ -8,6 +8,11 @@ "pid": "0x0030", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "B2", "B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6"], + "rows": ["D0", "D1", "D2"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, @@ -17,36 +22,38 @@ "layouts": { "LAYOUT_ortho_3x10": { "layout": [ - {"label":"Q", "x":0, "y":0}, - {"label":"W", "x":1, "y":0}, - {"label":"E", "x":2, "y":0}, - {"label":"R", "x":3, "y":0}, - {"label":"T", "x":4, "y":0}, - {"label":"Y", "x":5, "y":0}, - {"label":"U", "x":6, "y":0}, - {"label":"I", "x":7, "y":0}, - {"label":"O", "x":8, "y":0}, - {"label":"P", "x":9, "y":0}, - {"label":"A", "x":0, "y":1}, - {"label":"S", "x":1, "y":1}, - {"label":"D", "x":2, "y":1}, - {"label":"F", "x":3, "y":1}, - {"label":"G", "x":4, "y":1}, - {"label":"H", "x":5, "y":1}, - {"label":"J", "x":6, "y":1}, - {"label":"K", "x":7, "y":1}, - {"label":"L", "x":8, "y":1}, - {"label":"ENTER", "x":9, "y":1}, - {"label":"Z", "x":0, "y":2}, - {"label":"X", "x":1, "y":2}, - {"label":"C", "x":2, "y":2}, - {"label":"V", "x":3, "y":2}, - {"label":"B", "x":4, "y":2}, - {"label":"N", "x":5, "y":2}, - {"label":"M", "x":6, "y":2}, - {"label":",", "x":7, "y":2}, - {"label":".", "x":8, "y":2}, - {"label":"/", "x":9, "y":2} + {"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": [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": [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} ] } } diff --git a/keyboards/lazydesigners/the30/the30.c b/keyboards/lazydesigners/the30/the30.c deleted file mode 100644 index c41e16dc08..0000000000 --- a/keyboards/lazydesigners/the30/the30.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Erovia - * - * 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 "the30.h" diff --git a/keyboards/lazydesigners/the30/the30.h b/keyboards/lazydesigners/the30/the30.h deleted file mode 100644 index 82a6bf8ba5..0000000000 --- a/keyboards/lazydesigners/the30/the30.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2019 Erovia - * - * 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_ortho_3x10( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \ -} diff --git a/keyboards/lazydesigners/the40/config.h b/keyboards/lazydesigners/the40/config.h index 6f625c41bd..8a326c3ba0 100644 --- a/keyboards/lazydesigners/the40/config.h +++ b/keyboards/lazydesigners/the40/config.h @@ -17,14 +17,6 @@ #pragma once - -#define MATRIX_ROW_PINS { D0, D1, B6, F5 } -#define MATRIX_COL_PINS { F4, F6, F7, B5, B4, D7, D6, D4, D5, D3, D2, B0 } - -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN C7 -#ifdef RGB_DI_PIN #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -40,4 +32,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/lazydesigners/the40/info.json b/keyboards/lazydesigners/the40/info.json index 009e6fe006..78c020d65b 100644 --- a/keyboards/lazydesigners/the40/info.json +++ b/keyboards/lazydesigners/the40/info.json @@ -8,10 +8,18 @@ "pid": "0x0042", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F6", "F7", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B0"], + "rows": ["D0", "D1", "B6", "F5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true }, + "ws2812": { + "pin": "C7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/lazydesigners/the40/the40.c b/keyboards/lazydesigners/the40/the40.c deleted file mode 100644 index cd1a22a9c3..0000000000 --- a/keyboards/lazydesigners/the40/the40.c +++ /dev/null @@ -1,14 +0,0 @@ -/* - Copyright 2020 LAZYDESIGNERS - 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 "the40.h" diff --git a/keyboards/lazydesigners/the50/config.h b/keyboards/lazydesigners/the50/config.h index 96b226f6e8..366d9d3325 100644 --- a/keyboards/lazydesigners/the50/config.h +++ b/keyboards/lazydesigners/the50/config.h @@ -1,21 +1,10 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0, B1, B2, B3 } -#define MATRIX_COL_PINS { B5, D0, D1, D2, D3, D4, D5, D6, D7, C6, C7, F4, F5, F6, F7 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* 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 E6 -#ifdef RGB_DI_PIN #define RGBLED_NUM 1 #define RGBLIGHT_SLEEP -#endif diff --git a/keyboards/lazydesigners/the50/info.json b/keyboards/lazydesigners/the50/info.json index 9a54671b46..a82f180e57 100644 --- a/keyboards/lazydesigners/the50/info.json +++ b/keyboards/lazydesigners/the50/info.json @@ -8,69 +8,85 @@ "pid": "0x0050", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7"], + "rows": ["B0", "B1", "B2", "B3"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 6 }, + "ws2812": { + "pin": "E6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"Q", "x":1, "y":0}, - {"label":"W", "x":2, "y":0}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0}, - {"label":"T", "x":5, "y":0}, - {"label":"Y", "x":6, "y":0}, - {"label":"U", "x":7, "y":0}, - {"label":"I", "x":8, "y":0}, - {"label":"O", "x":9, "y":0}, - {"label":"P", "x":10, "y":0}, - {"label":"Back<br>Space", "x":11, "y":0}, - {"label":"7", "x":12.25, "y":0}, - {"label":"8", "x":13.25, "y":0}, - {"label":"9", "x":14.25, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.25}, - {"label":"A", "x":1.25, "y":1}, - {"label":"S", "x":2.25, "y":1}, - {"label":"D", "x":3.25, "y":1}, - {"label":"F", "x":4.25, "y":1}, - {"label":"G", "x":5.25, "y":1}, - {"label":"H", "x":6.25, "y":1}, - {"label":"J", "x":7.25, "y":1}, - {"label":"K", "x":8.25, "y":1}, - {"label":"L", "x":9.25, "y":1}, - {"label":"Enter", "x":10.25, "y":1, "w":1.75}, - {"label":"4", "x":12.25, "y":1}, - {"label":"5", "x":13.25, "y":1}, - {"label":"6", "x":14.25, "y":1}, - {"label":"Shift", "x":0, "y":2, "w":1.75}, - {"label":"Z", "x":1.75, "y":2}, - {"label":"X", "x":2.75, "y":2}, - {"label":"C", "x":3.75, "y":2}, - {"label":"V", "x":4.75, "y":2}, - {"label":"B", "x":5.75, "y":2}, - {"label":"N", "x":6.75, "y":2}, - {"label":"M", "x":7.75, "y":2}, - {"label":"<", "x":8.75, "y":2}, - {"label":">", "x":9.75, "y":2}, - {"label":"Fn", "x":10.75, "y":2, "w":1.25}, - {"label":"1", "x":12.25, "y":2}, - {"label":"2", "x":13.25, "y":2}, - {"label":"3", "x":14.25, "y":2}, - {"label":"Hyper", "x":0, "y":3, "w":1.25}, - {"label":"Super", "x":1.25, "y":3}, - {"label":"Meta", "x":2.25, "y":3, "w":1.25}, - {"label":"Space", "x":3.5, "y":3, "w":2.25}, - {"label":"Space", "x":5.75, "y":3, "w":2.75}, - {"label":"Meta", "x":8.5, "y":3, "w":1.25}, - {"label":"Super", "x":9.75, "y":3}, - {"label":"Hyper", "x":10.75, "y":3, "w":1.25}, - {"label":"0", "x":12.25, "y":3}, - {"label":".", "x":13.25, "y":3}, - {"label":"Enter", "x":14.25, "y":3}] + {"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.25, "y": 0}, + {"matrix": [0, 13], "x": 13.25, "y": 0}, + {"matrix": [0, 14], "x": 14.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75}, + + {"matrix": [1, 12], "x": 12.25, "y": 1}, + {"matrix": [1, 13], "x": 13.25, "y": 1}, + {"matrix": [1, 14], "x": 14.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 1.25}, + + {"matrix": [2, 12], "x": 12.25, "y": 2}, + {"matrix": [2, 13], "x": 13.25, "y": 2}, + {"matrix": [2, 14], "x": 14.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.25}, + {"matrix": [3, 7], "x": 5.75, "y": 3, "w": 2.75}, + {"matrix": [3, 9], "x": 8.5, "y": 3, "w": 1.25}, + {"matrix": [3, 10], "x": 9.75, "y": 3}, + {"matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25}, + + {"matrix": [3, 12], "x": 12.25, "y": 3}, + {"matrix": [3, 13], "x": 13.25, "y": 3}, + {"matrix": [3, 14], "x": 14.25, "y": 3} + ] } } } diff --git a/keyboards/lazydesigners/the50/the50.h b/keyboards/lazydesigners/the50/the50.h index 1cf613aada..e796e9161c 100644 --- a/keyboards/lazydesigners/the50/the50.h +++ b/keyboards/lazydesigners/the50/the50.h @@ -2,31 +2,5 @@ #include "quantum.h" -#define XXXX KC_NO - -/* - * ,-----------------------------------------------------------. ,--------------. - * | | | | | | | | | | | | | | | | | - * |-----------------------------------------------------------| |--------------| - * | | | | | | | | | | | | | | | | - * |-----------------------------------------------------------| |--------------| - * | | | | | | | | | | | | | | | | - * |-----------------------------------------------------------| |--------------| - * | | | | | | | | | | | | | - * `-----------------------------------------------------------' `--------------' - */ - -#define LAYOUT( \ -K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ -K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K111, K112, K113, K114, \ -K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \ -K300, K301, K302, K304, K307, K309, K310, K311, K312, K313, K314 \ -) { \ -{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ -{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, XXXX, K111, K112, K113, K114 }, \ -{ K200, XXXX, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \ -{ K300, K301, K302, XXXX, K304, XXXX, XXXX, K307, XXXX, K309, K310, K311, K312, K313, K314 } \ -} - void the50_led_on(void); void the50_led_off(void); diff --git a/keyboards/lazydesigners/the60/rev1/config.h b/keyboards/lazydesigners/the60/rev1/config.h index 0845f9db63..5f36081323 100755 --- a/keyboards/lazydesigners/the60/rev1/config.h +++ b/keyboards/lazydesigners/the60/rev1/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 } -#define MATRIX_COL_PINS { B5, D0, D1, D2, D3, D4, D5, D6, D7, C6, C7, F4, F5, F6, F7 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/lazydesigners/the60/rev1/info.json b/keyboards/lazydesigners/the60/rev1/info.json index 179dd59895..7c1fa4883e 100755 --- a/keyboards/lazydesigners/the60/rev1/info.json +++ b/keyboards/lazydesigners/the60/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "C6", "C7", "F4", "F5", "F6", "F7"], + "rows": ["B0", "B1", "B2", "B3", "B4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 6 @@ -17,72 +22,77 @@ "layouts": { "LAYOUT_split_spc_split_bspc": { "layout": [ - {"label":"~", "x":0, "y":0}, - {"label":"!", "x":1, "y":0}, - {"label":"@", "x":2, "y":0}, - {"label":"#", "x":3, "y":0}, - {"label":"$", "x":4, "y":0}, - {"label":"%", "x":5, "y":0}, - {"label":"^", "x":6, "y":0}, - {"label":"&", "x":7, "y":0}, - {"label":"*", "x":8, "y":0}, - {"label":"(", "x":9, "y":0}, - {"label":")", "x":10, "y":0}, - {"label":"_", "x":11, "y":0}, - {"label":"+", "x":12, "y":0}, - {"label":"Home", "x":13, "y":0}, - {"label":"Del", "x":14, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":1}, - {"label":"I", "x":8.5, "y":1}, - {"label":"O", "x":9.5, "y":1}, - {"label":"P", "x":10.5, "y":1}, - {"label":"|", "x":11.5, "y":1, "w":1.5}, - {"label":"}", "x":13, "y":1}, - {"label":"{", "x":14, "y":1}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":"Enter", "x":10.75, "y":2, "w":2.25}, - {"label":":", "x":13, "y":2}, - {"label":"\"", "x":14, "y":2}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":7.25, "y":3}, - {"label":"M", "x":8.25, "y":3}, - {"label":"<", "x":9.25, "y":3}, - {"label":">", "x":10.25, "y":3}, - {"label":"Shift", "x":11.25, "y":3, "w":1.75}, - {"label":"Up", "x":13, "y":3}, - {"label":"/", "x":14, "y":3}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"Win", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":2.25}, - {"x":6, "y":4, "w":2.75}, - {"label":"Alt", "x":8.75, "y":4, "w":1.25}, - {"label":"Menu", "x":10, "y":4}, - {"label":"Fn", "x":11, "y":4}, - {"label":"Left", "x":12, "y":4}, - {"label":"Down", "x":13, "y":4}, - {"label":"Right", "x":14, "y":4}] + {"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, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1, "w": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [1, 14], "x": 14, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 2.25}, + {"matrix": [2, 12], "x": 13, "y": 2}, + {"matrix": [2, 13], "x": 14, "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, "w": 1.75}, + {"matrix": [3, 12], "x": 13, "y": 3}, + {"matrix": [3, 13], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25}, + {"matrix": [4, 7], "x": 6, "y": 4, "w": 2.75}, + {"matrix": [4, 9], "x": 8.75, "y": 4, "w": 1.25}, + {"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/lazydesigners/the60/rev1/rev1.c b/keyboards/lazydesigners/the60/rev1/rev1.c deleted file mode 100755 index 1b6fbd7c2d..0000000000 --- a/keyboards/lazydesigners/the60/rev1/rev1.c +++ /dev/null @@ -1,2 +0,0 @@ -#include "rev1.h" - diff --git a/keyboards/lazydesigners/the60/rev1/rev1.h b/keyboards/lazydesigners/the60/rev1/rev1.h deleted file mode 100755 index e3708461c4..0000000000 --- a/keyboards/lazydesigners/the60/rev1/rev1.h +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once - -#include "quantum.h" - -/* - * ,--------------------------------------------------------------------------. - * | | | | | | | | | | | | | | | | - * |--------------------------------------------------------------------------| - * | | | | | | | | | | | | | | | - * |--------------------------------------------------------------------------| - * | | | | | | | | | | | | | | - * |--------------------------------------------------------------------------| - * | | | | | | | | | | | | | | - * |--------------------------------------------------------------------------| - * | | | | | | | | | | | | - * `--------------------------------------------------------------------------' - */ - -#define LAYOUT_split_spc_split_bspc( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ - K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \ - K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \ - K400, K402, K403, K404, K407, K409, K410, K411, K412, K413, K414 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, KC_NO, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, KC_NO }, \ - { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, KC_NO }, \ - { K400, KC_NO, K402, K403, K404, KC_NO, KC_NO, K407, KC_NO, K409, K410, K411, K412, K413, K414 } \ -} - diff --git a/keyboards/lazydesigners/the60/rev2/config.h b/keyboards/lazydesigners/the60/rev2/config.h index 11d38876d3..19bd7fbb1f 100755 --- a/keyboards/lazydesigners/the60/rev2/config.h +++ b/keyboards/lazydesigners/the60/rev2/config.h @@ -17,14 +17,6 @@ #pragma once - -#define MATRIX_ROW_PINS { B1, B2, B3, F0, F1 } -#define MATRIX_COL_PINS { F4, F7, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3 } - -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN D1 -#ifdef RGB_DI_PIN #define RGBLED_NUM 10 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -40,4 +32,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif diff --git a/keyboards/lazydesigners/the60/rev2/info.json b/keyboards/lazydesigners/the60/rev2/info.json index 355a8c7bc9..62eddefa13 100755 --- a/keyboards/lazydesigners/the60/rev2/info.json +++ b/keyboards/lazydesigners/the60/rev2/info.json @@ -8,11 +8,19 @@ "pid": "0x0062", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"], + "rows": ["B1", "B2", "B3", "F0", "F1"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5, "breathing": true }, + "ws2812": { + "pin": "D1" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/lazydesigners/the60/rev2/rev2.c b/keyboards/lazydesigners/the60/rev2/rev2.c deleted file mode 100755 index b1af81707d..0000000000 --- a/keyboards/lazydesigners/the60/rev2/rev2.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev2.h" |