diff options
Diffstat (limited to 'keyboards/sawnsprojects')
24 files changed, 278 insertions, 486 deletions
diff --git a/keyboards/sawnsprojects/amber80/solder/config.h b/keyboards/sawnsprojects/amber80/solder/config.h index 53a07a179c..1cca19e506 100644 --- a/keyboards/sawnsprojects/amber80/solder/config.h +++ b/keyboards/sawnsprojects/amber80/solder/config.h @@ -16,25 +16,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 { B1, B2, B3, B7, D0, D1, F1, F0, D7, B4, D5, D3 } -#define MATRIX_COL_PINS { F4, F6, F7, C7, C6, B6, B5, D6, D4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* RGB */ -#define RGB_DI_PIN D2 -#ifdef RGB_DI_PIN #define RGBLED_NUM 22 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -51,4 +33,3 @@ #define RGBLIGHT_EFFECT_STATIC_GRADIENT #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING -#endif diff --git a/keyboards/sawnsprojects/amber80/solder/info.json b/keyboards/sawnsprojects/amber80/solder/info.json index 1e9870fa90..f7892d0286 100644 --- a/keyboards/sawnsprojects/amber80/solder/info.json +++ b/keyboards/sawnsprojects/amber80/solder/info.json @@ -8,11 +8,19 @@ "pid": "0xA801", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F6", "F7", "C7", "C6", "B6", "B5", "D6", "D4"], + "rows": ["B1", "B2", "B3", "B7", "D0", "D1", "F1", "F0", "D7", "B4", "D5", "D3"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "F5", "scroll_lock": "B0", "on_state": 0 }, + "ws2812": { + "pin": "D2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/sawnsprojects/amber80/solder/solder.c b/keyboards/sawnsprojects/amber80/solder/solder.c deleted file mode 100644 index b7dbe1e558..0000000000 --- a/keyboards/sawnsprojects/amber80/solder/solder.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 SawnsProjects - * - * 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 "solder.h" diff --git a/keyboards/sawnsprojects/eclipse/eclipse60/info.json b/keyboards/sawnsprojects/eclipse/eclipse60/info.json index 4793b44a41..b2a8de9593 100644 --- a/keyboards/sawnsprojects/eclipse/eclipse60/info.json +++ b/keyboards/sawnsprojects/eclipse/eclipse60/info.json @@ -28,7 +28,6 @@ "key_lock": false }, "rgblight": { - "pin": "B0", "led_count": 18, "hue_steps": 8, "saturation_steps": 8, @@ -48,6 +47,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "B0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sawnsprojects/eclipse/tinyneko/info.json b/keyboards/sawnsprojects/eclipse/tinyneko/info.json index 40ad2b7f80..7e7fe5a43e 100644 --- a/keyboards/sawnsprojects/eclipse/tinyneko/info.json +++ b/keyboards/sawnsprojects/eclipse/tinyneko/info.json @@ -28,7 +28,6 @@ "key_lock": false }, "rgblight": { - "pin": "B0", "led_count": 18, "hue_steps": 8, "saturation_steps": 8, @@ -48,6 +47,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "B0" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/sawnsprojects/krush/krush60/solder/config.h b/keyboards/sawnsprojects/krush/krush60/solder/config.h index 76f4acfbf6..936a988139 100644 --- a/keyboards/sawnsprojects/krush/krush60/solder/config.h +++ b/keyboards/sawnsprojects/krush/krush60/solder/config.h @@ -16,15 +16,6 @@ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { B1, B2, D1, D2, D4, D6, F6, F7, F5, F4 } -#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D5, D3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN F1 -#ifdef RGB_DI_PIN #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -42,4 +33,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif
\ No newline at end of file diff --git a/keyboards/sawnsprojects/krush/krush60/solder/info.json b/keyboards/sawnsprojects/krush/krush60/solder/info.json index a54172480d..4c6e26dc54 100644 --- a/keyboards/sawnsprojects/krush/krush60/solder/info.json +++ b/keyboards/sawnsprojects/krush/krush60/solder/info.json @@ -8,10 +8,18 @@ "pid": "0x6B32", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D5", "D3"], + "rows": ["B1", "B2", "D1", "D2", "D4", "D6", "F6", "F7", "F5", "F4"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "F0", "on_state": 0 }, + "ws2812": { + "pin": "F1" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { diff --git a/keyboards/sawnsprojects/krush/krush60/solder/solder.c b/keyboards/sawnsprojects/krush/krush60/solder/solder.c deleted file mode 100644 index 2fb9b24f8c..0000000000 --- a/keyboards/sawnsprojects/krush/krush60/solder/solder.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 SawnsProjects - * - * 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 "solder.h"
\ No newline at end of file diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/config.h b/keyboards/sawnsprojects/krush/krush65/hotswap/config.h index 8a947093dc..602670158b 100644 --- a/keyboards/sawnsprojects/krush/krush65/hotswap/config.h +++ b/keyboards/sawnsprojects/krush/krush65/hotswap/config.h @@ -16,21 +16,12 @@ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { B1, B2, D4, F1, F0 } -#define MATRIX_COL_PINS { B7, B3, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D0, D5, D6, D3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Encoders */ #define ENCODERS_CW_KEY { { 12, 3 } } #define ENCODERS_CCW_KEY { { 12, 4 } } /* RGB */ -#define RGB_DI_PIN E6 -#ifdef RGB_DI_PIN #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -48,4 +39,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif
\ No newline at end of file diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/encoder_actions.c b/keyboards/sawnsprojects/krush/krush65/hotswap/encoder_actions.c index 8a91dde19a..96fcc9a614 100644 --- a/keyboards/sawnsprojects/krush/krush65/hotswap/encoder_actions.c +++ b/keyboards/sawnsprojects/krush/krush65/hotswap/encoder_actions.c @@ -30,7 +30,8 @@ void encoder_action_unregister(void) { keyevent_t encoder_event = (keyevent_t) { .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index], .pressed = false, - .time = (timer_read() | 1) + .time = timer_read(), + .type = KEY_EVENT }; encoder_state[index] = 0; action_exec(encoder_event); @@ -42,10 +43,11 @@ void encoder_action_register(uint8_t index, bool clockwise) { keyevent_t encoder_event = (keyevent_t) { .key = clockwise ? encoder_cw[index] : encoder_ccw[index], .pressed = true, - .time = (timer_read() | 1) + .time = timer_read(), + .type = KEY_EVENT }; encoder_state[index] = (clockwise ^ 1) | (clockwise << 1); action_exec(encoder_event); } -#endif
\ No newline at end of file +#endif diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/hotswap.c b/keyboards/sawnsprojects/krush/krush65/hotswap/hotswap.c index 8fd9a2fa14..824e7364be 100644 --- a/keyboards/sawnsprojects/krush/krush65/hotswap/hotswap.c +++ b/keyboards/sawnsprojects/krush/krush65/hotswap/hotswap.c @@ -15,17 +15,3 @@ */ #include "hotswap.h" - -#ifdef ENCODER_ENABLE -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { return false; } - if (index == 0) { - if (clockwise) { - tap_code_delay(KC_VOLU, 10); - } else { - tap_code_delay(KC_VOLD, 10); - } - } - return true; -} -#endif
\ No newline at end of file diff --git a/keyboards/sawnsprojects/krush/krush65/hotswap/info.json b/keyboards/sawnsprojects/krush/krush65/hotswap/info.json index 3872047ef8..481b503520 100644 --- a/keyboards/sawnsprojects/krush/krush65/hotswap/info.json +++ b/keyboards/sawnsprojects/krush/krush65/hotswap/info.json @@ -8,6 +8,11 @@ "pid": "0x5B31", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B7", "B3", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D0", "D5", "D6", "D3"], + "rows": ["B1", "B2", "D4", "F1", "F0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D1", "pin_b": "D2"} @@ -17,6 +22,9 @@ "caps_lock": "B0", "on_state": 0 }, + "ws2812": { + "pin": "E6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/sawnsprojects/krush/krush65/solder/config.h b/keyboards/sawnsprojects/krush/krush65/solder/config.h index 76f4acfbf6..146d07f1fe 100644 --- a/keyboards/sawnsprojects/krush/krush65/solder/config.h +++ b/keyboards/sawnsprojects/krush/krush65/solder/config.h @@ -16,15 +16,6 @@ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { B1, B2, D1, D2, D4, D6, F6, F7, F5, F4 } -#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D5, D3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN F1 -#ifdef RGB_DI_PIN #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -41,5 +32,4 @@ #define RGBLIGHT_EFFECT_STATIC_GRADIENT #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#endif
\ No newline at end of file +#define RGBLIGHT_EFFECT_TWINKLE
\ No newline at end of file diff --git a/keyboards/sawnsprojects/krush/krush65/solder/info.json b/keyboards/sawnsprojects/krush/krush65/solder/info.json index 9666127299..0d9dc6d58c 100644 --- a/keyboards/sawnsprojects/krush/krush65/solder/info.json +++ b/keyboards/sawnsprojects/krush/krush65/solder/info.json @@ -8,6 +8,11 @@ "pid": "0x6B31", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D5", "D3"], + "rows": ["B1", "B2", "D1", "D2", "D4", "D6", "F6", "F7", "F5", "F4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D0", "pin_b": "B3"} @@ -17,6 +22,9 @@ "caps_lock": "F0", "on_state": 0 }, + "ws2812": { + "pin": "F1" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { @@ -26,231 +34,231 @@ "layouts": { "LAYOUT_65_ansi_blocker_split_bs_sp": { "layout": [ - {"label":"K00 (B1,C7)", "x":0, "y":0}, - {"label":"K10 (B2,C7)", "x":1, "y":0}, - {"label":"K01 (B1,C6)", "x":2, "y":0}, - {"label":"K11 (B2,C6)", "x":3, "y":0}, - {"label":"K02 (B1,B6)", "x":4, "y":0}, - {"label":"K12 (B2,B6)", "x":5, "y":0}, - {"label":"K03 (B1,B5)", "x":6, "y":0}, - {"label":"K13 (B2,B5)", "x":7, "y":0}, - {"label":"K04 (B1,B4)", "x":8, "y":0}, - {"label":"K14 (B2,B4)", "x":9, "y":0}, - {"label":"K05 (B1,D7)", "x":10, "y":0}, - {"label":"K15 (B2,D7)", "x":11, "y":0}, - {"label":"K06 (B1,D5)", "x":12, "y":0}, - {"label":"K26 (D1,D5)", "x":13, "y":0}, - {"label":"K17 (B2,D3)", "x":14, "y":0}, - {"label":"K07 (B1,D3)", "x":15, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, + {"matrix": [1, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "x": 8, "y": 0}, + {"matrix": [1, 4], "x": 9, "y": 0}, + {"matrix": [0, 5], "x": 10, "y": 0}, + {"matrix": [1, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [2, 6], "x": 13, "y": 0}, + {"matrix": [1, 7], "x": 14, "y": 0}, + {"matrix": [0, 7], "x": 15, "y": 0}, - {"label":"K20 (D1,C7)", "x":0, "y":1, "w":1.5}, - {"label":"K30 (D2,C7)", "x":1.5, "y":1}, - {"label":"K21 (D1,C6)", "x":2.5, "y":1}, - {"label":"K31 (D2,C6)", "x":3.5, "y":1}, - {"label":"K22 (D1,B6)", "x":4.5, "y":1}, - {"label":"K32 (D2,B6)", "x":5.5, "y":1}, - {"label":"K23 (D1,B5)", "x":6.5, "y":1}, - {"label":"K33 (D2,B5)", "x":7.5, "y":1}, - {"label":"K24 (D1,B4)", "x":8.5, "y":1}, - {"label":"K34 (D2,B4)", "x":9.5, "y":1}, - {"label":"K25 (D1,D7)", "x":10.5, "y":1}, - {"label":"K35 (D2,D7)", "x":11.5, "y":1}, - {"label":"K36 (D2,D5)", "x":12.5, "y":1}, - {"label":"K46 (D4,D5)", "x":13.5, "y":1, "w":1.5}, - {"label":"K37 (D2,D3)", "x":15, "y":1}, + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 1.5, "y": 1}, + {"matrix": [2, 1], "x": 2.5, "y": 1}, + {"matrix": [3, 1], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [3, 2], "x": 5.5, "y": 1}, + {"matrix": [2, 3], "x": 6.5, "y": 1}, + {"matrix": [3, 3], "x": 7.5, "y": 1}, + {"matrix": [2, 4], "x": 8.5, "y": 1}, + {"matrix": [3, 4], "x": 9.5, "y": 1}, + {"matrix": [2, 5], "x": 10.5, "y": 1}, + {"matrix": [3, 5], "x": 11.5, "y": 1}, + {"matrix": [3, 6], "x": 12.5, "y": 1}, + {"matrix": [4, 6], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [3, 7], "x": 15, "y": 1}, - {"label":"K40 (D4,C7)", "x":0, "y":2, "w":1.75}, - {"label":"K50 (D6,C7)", "x":1.75, "y":2}, - {"label":"K41 (D4,C6)", "x":2.75, "y":2}, - {"label":"K51 (D6,C6)", "x":3.75, "y":2}, - {"label":"K42 (D4,B6)", "x":4.75, "y":2}, - {"label":"K52 (D6,B6)", "x":5.75, "y":2}, - {"label":"K43 (D4,B5)", "x":6.75, "y":2}, - {"label":"K53 (D6,B5)", "x":7.75, "y":2}, - {"label":"K44 (D4,B4)", "x":8.75, "y":2}, - {"label":"K54 (D6,B4)", "x":9.75, "y":2}, - {"label":"K45 (D4,D7)", "x":10.75, "y":2}, - {"label":"K55 (D6,D7)", "x":11.75, "y":2}, - {"label":"K47 (D4,D3)", "x":12.75, "y":2, "w":2.25}, - {"label":"K57 (D6,D3)", "x":15, "y":2}, + {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [5, 0], "x": 1.75, "y": 2}, + {"matrix": [4, 1], "x": 2.75, "y": 2}, + {"matrix": [5, 1], "x": 3.75, "y": 2}, + {"matrix": [4, 2], "x": 4.75, "y": 2}, + {"matrix": [5, 2], "x": 5.75, "y": 2}, + {"matrix": [4, 3], "x": 6.75, "y": 2}, + {"matrix": [5, 3], "x": 7.75, "y": 2}, + {"matrix": [4, 4], "x": 8.75, "y": 2}, + {"matrix": [5, 4], "x": 9.75, "y": 2}, + {"matrix": [4, 5], "x": 10.75, "y": 2}, + {"matrix": [5, 5], "x": 11.75, "y": 2}, + {"matrix": [4, 7], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [5, 7], "x": 15, "y": 2}, - {"label":"K60 (F6,C7)", "x":0, "y":3, "w":2.25}, - {"label":"K70 (F7,C7)", "x":2.25, "y":3}, - {"label":"K61 (F6,C6)", "x":3.25, "y":3}, - {"label":"K71 (F7,C6)", "x":4.25, "y":3}, - {"label":"K62 (F6,B6)", "x":5.25, "y":3}, - {"label":"K72 (F7,B6)", "x":6.25, "y":3}, - {"label":"K63 (F6,B5)", "x":7.25, "y":3}, - {"label":"K73 (F7,B5)", "x":8.25, "y":3}, - {"label":"K64 (F6,B4)", "x":9.25, "y":3}, - {"label":"K74 (F7,B4)", "x":10.25, "y":3}, - {"label":"K65 (F6,D7)", "x":11.25, "y":3}, - {"label":"K75 (F7,D7)", "x":12.25, "y":3, "w":1.75}, - {"label":"K77 (F7,D3)", "x":14, "y":3}, - {"label":"K67 (F6,D3)", "x":15, "y":3}, + {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [7, 0], "x": 2.25, "y": 3}, + {"matrix": [6, 1], "x": 3.25, "y": 3}, + {"matrix": [7, 1], "x": 4.25, "y": 3}, + {"matrix": [6, 2], "x": 5.25, "y": 3}, + {"matrix": [7, 2], "x": 6.25, "y": 3}, + {"matrix": [6, 3], "x": 7.25, "y": 3}, + {"matrix": [7, 3], "x": 8.25, "y": 3}, + {"matrix": [6, 4], "x": 9.25, "y": 3}, + {"matrix": [7, 4], "x": 10.25, "y": 3}, + {"matrix": [6, 5], "x": 11.25, "y": 3}, + {"matrix": [7, 5], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [7, 7], "x": 14, "y": 3}, + {"matrix": [6, 7], "x": 15, "y": 3}, - {"label":"K80 (F5,C7)", "x":0, "y":4, "w":1.25}, - {"label":"K90 (F4,C7)", "x":1.25, "y":4, "w":1.25}, - {"label":"K81 (F5,C6)", "x":2.5, "y":4, "w":1.25}, - {"label":"K82 (F5,B6)", "x":3.75, "y":4, "w":2.25}, - {"label":"K92 (F4,B6)", "x":6, "y":4, "w":1.25}, - {"label":"K93 (F4,B5)", "x":7.25, "y":4, "w":2.75}, - {"label":"K94 (F4,B4)", "x":10, "y":4, "w":1.25}, - {"label":"K85 (F5,D7)", "x":11.25, "y":4, "w":1.25}, - {"label":"K95 (F4,D7)", "x":13, "y":4}, - {"label":"K97 (F4,D3)", "x":14, "y":4}, - {"label":"K87 (F5,D3)", "x":15, "y":4} + {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [8, 2], "x": 3.75, "y": 4, "w": 2.25}, + {"matrix": [9, 2], "x": 6, "y": 4, "w": 1.25}, + {"matrix": [9, 3], "x": 7.25, "y": 4, "w": 2.75}, + {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [9, 5], "x": 13, "y": 4}, + {"matrix": [9, 7], "x": 14, "y": 4}, + {"matrix": [8, 7], "x": 15, "y": 4} ] }, "LAYOUT_65_ansi_blocker": { "layout": [ - {"label":"K00 (B1,C7)", "x":0, "y":0}, - {"label":"K10 (B2,C7)", "x":1, "y":0}, - {"label":"K01 (B1,C6)", "x":2, "y":0}, - {"label":"K11 (B2,C6)", "x":3, "y":0}, - {"label":"K02 (B1,B6)", "x":4, "y":0}, - {"label":"K12 (B2,B6)", "x":5, "y":0}, - {"label":"K03 (B1,B5)", "x":6, "y":0}, - {"label":"K13 (B2,B5)", "x":7, "y":0}, - {"label":"K04 (B1,B4)", "x":8, "y":0}, - {"label":"K14 (B2,B4)", "x":9, "y":0}, - {"label":"K05 (B1,D7)", "x":10, "y":0}, - {"label":"K15 (B2,D7)", "x":11, "y":0}, - {"label":"K06 (B1,D5)", "x":12, "y":0}, - {"label":"K26 (D1,D5)", "x":13, "y":0, "w":2}, - {"label":"K07 (B1,D3)", "x":15, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, + {"matrix": [1, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "x": 8, "y": 0}, + {"matrix": [1, 4], "x": 9, "y": 0}, + {"matrix": [0, 5], "x": 10, "y": 0}, + {"matrix": [1, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [2, 6], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 7], "x": 15, "y": 0}, - {"label":"K20 (D1,C7)", "x":0, "y":1, "w":1.5}, - {"label":"K30 (D2,C7)", "x":1.5, "y":1}, - {"label":"K21 (D1,C6)", "x":2.5, "y":1}, - {"label":"K31 (D2,C6)", "x":3.5, "y":1}, - {"label":"K22 (D1,B6)", "x":4.5, "y":1}, - {"label":"K32 (D2,B6)", "x":5.5, "y":1}, - {"label":"K23 (D1,B5)", "x":6.5, "y":1}, - {"label":"K33 (D2,B5)", "x":7.5, "y":1}, - {"label":"K24 (D1,B4)", "x":8.5, "y":1}, - {"label":"K34 (D2,B4)", "x":9.5, "y":1}, - {"label":"K25 (D1,D7)", "x":10.5, "y":1}, - {"label":"K35 (D2,D7)", "x":11.5, "y":1}, - {"label":"K36 (D2,D5)", "x":12.5, "y":1}, - {"label":"K46 (D4,D5)", "x":13.5, "y":1, "w":1.5}, - {"label":"K37 (D2,D3)", "x":15, "y":1}, + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 1.5, "y": 1}, + {"matrix": [2, 1], "x": 2.5, "y": 1}, + {"matrix": [3, 1], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [3, 2], "x": 5.5, "y": 1}, + {"matrix": [2, 3], "x": 6.5, "y": 1}, + {"matrix": [3, 3], "x": 7.5, "y": 1}, + {"matrix": [2, 4], "x": 8.5, "y": 1}, + {"matrix": [3, 4], "x": 9.5, "y": 1}, + {"matrix": [2, 5], "x": 10.5, "y": 1}, + {"matrix": [3, 5], "x": 11.5, "y": 1}, + {"matrix": [3, 6], "x": 12.5, "y": 1}, + {"matrix": [4, 6], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [3, 7], "x": 15, "y": 1}, - {"label":"K40 (D4,C7)", "x":0, "y":2, "w":1.75}, - {"label":"K50 (D6,C7)", "x":1.75, "y":2}, - {"label":"K41 (D4,C6)", "x":2.75, "y":2}, - {"label":"K51 (D6,C6)", "x":3.75, "y":2}, - {"label":"K42 (D4,B6)", "x":4.75, "y":2}, - {"label":"K52 (D6,B6)", "x":5.75, "y":2}, - {"label":"K43 (D4,B5)", "x":6.75, "y":2}, - {"label":"K53 (D6,B5)", "x":7.75, "y":2}, - {"label":"K44 (D4,B4)", "x":8.75, "y":2}, - {"label":"K54 (D6,B4)", "x":9.75, "y":2}, - {"label":"K45 (D4,D7)", "x":10.75, "y":2}, - {"label":"K55 (D6,D7)", "x":11.75, "y":2}, - {"label":"K47 (D4,D3)", "x":12.75, "y":2, "w":2.25}, - {"label":"K57 (D6,D3)", "x":15, "y":2}, + {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [5, 0], "x": 1.75, "y": 2}, + {"matrix": [4, 1], "x": 2.75, "y": 2}, + {"matrix": [5, 1], "x": 3.75, "y": 2}, + {"matrix": [4, 2], "x": 4.75, "y": 2}, + {"matrix": [5, 2], "x": 5.75, "y": 2}, + {"matrix": [4, 3], "x": 6.75, "y": 2}, + {"matrix": [5, 3], "x": 7.75, "y": 2}, + {"matrix": [4, 4], "x": 8.75, "y": 2}, + {"matrix": [5, 4], "x": 9.75, "y": 2}, + {"matrix": [4, 5], "x": 10.75, "y": 2}, + {"matrix": [5, 5], "x": 11.75, "y": 2}, + {"matrix": [4, 7], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [5, 7], "x": 15, "y": 2}, - {"label":"K60 (F6,C7)", "x":0, "y":3, "w":2.25}, - {"label":"K70 (F7,C7)", "x":2.25, "y":3}, - {"label":"K61 (F6,C6)", "x":3.25, "y":3}, - {"label":"K71 (F7,C6)", "x":4.25, "y":3}, - {"label":"K62 (F6,B6)", "x":5.25, "y":3}, - {"label":"K72 (F7,B6)", "x":6.25, "y":3}, - {"label":"K63 (F6,B5)", "x":7.25, "y":3}, - {"label":"K73 (F7,B5)", "x":8.25, "y":3}, - {"label":"K64 (F6,B4)", "x":9.25, "y":3}, - {"label":"K74 (F7,B4)", "x":10.25, "y":3}, - {"label":"K65 (F6,D7)", "x":11.25, "y":3}, - {"label":"K75 (F7,D7)", "x":12.25, "y":3, "w":1.75}, - {"label":"K77 (F7,D3)", "x":14, "y":3}, - {"label":"K67 (F6,D3)", "x":15, "y":3}, + {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [7, 0], "x": 2.25, "y": 3}, + {"matrix": [6, 1], "x": 3.25, "y": 3}, + {"matrix": [7, 1], "x": 4.25, "y": 3}, + {"matrix": [6, 2], "x": 5.25, "y": 3}, + {"matrix": [7, 2], "x": 6.25, "y": 3}, + {"matrix": [6, 3], "x": 7.25, "y": 3}, + {"matrix": [7, 3], "x": 8.25, "y": 3}, + {"matrix": [6, 4], "x": 9.25, "y": 3}, + {"matrix": [7, 4], "x": 10.25, "y": 3}, + {"matrix": [6, 5], "x": 11.25, "y": 3}, + {"matrix": [7, 5], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [7, 7], "x": 14, "y": 3}, + {"matrix": [6, 7], "x": 15, "y": 3}, - {"label":"K80 (F5,C7)", "x":0, "y":4, "w":1.25}, - {"label":"K90 (F4,C7)", "x":1.25, "y":4, "w":1.25}, - {"label":"K81 (F5,C6)", "x":2.5, "y":4, "w":1.25}, - {"label":"K92 (F4,B6)", "x":3.75, "y":4, "w":6.25}, - {"label":"K94 (F4,B4)", "x":10, "y":4, "w":1.25}, - {"label":"K85 (F5,D7)", "x":11.25, "y":4, "w":1.25}, - {"label":"K95 (F4,D7)", "x":13, "y":4}, - {"label":"K97 (F4,D3)", "x":14, "y":4}, - {"label":"K87 (F5,D3)", "x":15, "y":4} + {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [9, 2], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [9, 5], "x": 13, "y": 4}, + {"matrix": [9, 7], "x": 14, "y": 4}, + {"matrix": [8, 7], "x": 15, "y": 4} ] }, "LAYOUT_65_ansi_blocker_split_bs": { "layout": [ - {"label":"K00 (B1,C7)", "x":0, "y":0}, - {"label":"K10 (B2,C7)", "x":1, "y":0}, - {"label":"K01 (B1,C6)", "x":2, "y":0}, - {"label":"K11 (B2,C6)", "x":3, "y":0}, - {"label":"K02 (B1,B6)", "x":4, "y":0}, - {"label":"K12 (B2,B6)", "x":5, "y":0}, - {"label":"K03 (B1,B5)", "x":6, "y":0}, - {"label":"K13 (B2,B5)", "x":7, "y":0}, - {"label":"K04 (B1,B4)", "x":8, "y":0}, - {"label":"K14 (B2,B4)", "x":9, "y":0}, - {"label":"K05 (B1,D7)", "x":10, "y":0}, - {"label":"K15 (B2,D7)", "x":11, "y":0}, - {"label":"K06 (B1,D5)", "x":12, "y":0}, - {"label":"K26 (D1,D5)", "x":13, "y":0}, - {"label":"K17 (B2,D3)", "x":14, "y":0}, - {"label":"K07 (B1,D3)", "x":15, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, + {"matrix": [1, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "x": 8, "y": 0}, + {"matrix": [1, 4], "x": 9, "y": 0}, + {"matrix": [0, 5], "x": 10, "y": 0}, + {"matrix": [1, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [2, 6], "x": 13, "y": 0}, + {"matrix": [1, 7], "x": 14, "y": 0}, + {"matrix": [0, 7], "x": 15, "y": 0}, - {"label":"K20 (D1,C7)", "x":0, "y":1, "w":1.5}, - {"label":"K30 (D2,C7)", "x":1.5, "y":1}, - {"label":"K21 (D1,C6)", "x":2.5, "y":1}, - {"label":"K31 (D2,C6)", "x":3.5, "y":1}, - {"label":"K22 (D1,B6)", "x":4.5, "y":1}, - {"label":"K32 (D2,B6)", "x":5.5, "y":1}, - {"label":"K23 (D1,B5)", "x":6.5, "y":1}, - {"label":"K33 (D2,B5)", "x":7.5, "y":1}, - {"label":"K24 (D1,B4)", "x":8.5, "y":1}, - {"label":"K34 (D2,B4)", "x":9.5, "y":1}, - {"label":"K25 (D1,D7)", "x":10.5, "y":1}, - {"label":"K35 (D2,D7)", "x":11.5, "y":1}, - {"label":"K36 (D2,D5)", "x":12.5, "y":1}, - {"label":"K46 (D4,D5)", "x":13.5, "y":1, "w":1.5}, - {"label":"K37 (D2,D3)", "x":15, "y":1}, + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 1.5, "y": 1}, + {"matrix": [2, 1], "x": 2.5, "y": 1}, + {"matrix": [3, 1], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [3, 2], "x": 5.5, "y": 1}, + {"matrix": [2, 3], "x": 6.5, "y": 1}, + {"matrix": [3, 3], "x": 7.5, "y": 1}, + {"matrix": [2, 4], "x": 8.5, "y": 1}, + {"matrix": [3, 4], "x": 9.5, "y": 1}, + {"matrix": [2, 5], "x": 10.5, "y": 1}, + {"matrix": [3, 5], "x": 11.5, "y": 1}, + {"matrix": [3, 6], "x": 12.5, "y": 1}, + {"matrix": [4, 6], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [3, 7], "x": 15, "y": 1}, - {"label":"K40 (D4,C7)", "x":0, "y":2, "w":1.75}, - {"label":"K50 (D6,C7)", "x":1.75, "y":2}, - {"label":"K41 (D4,C6)", "x":2.75, "y":2}, - {"label":"K51 (D6,C6)", "x":3.75, "y":2}, - {"label":"K42 (D4,B6)", "x":4.75, "y":2}, - {"label":"K52 (D6,B6)", "x":5.75, "y":2}, - {"label":"K43 (D4,B5)", "x":6.75, "y":2}, - {"label":"K53 (D6,B5)", "x":7.75, "y":2}, - {"label":"K44 (D4,B4)", "x":8.75, "y":2}, - {"label":"K54 (D6,B4)", "x":9.75, "y":2}, - {"label":"K45 (D4,D7)", "x":10.75, "y":2}, - {"label":"K55 (D6,D7)", "x":11.75, "y":2}, - {"label":"K47 (D4,D3)", "x":12.75, "y":2, "w":2.25}, - {"label":"K57 (D6,D3)", "x":15, "y":2}, + {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [5, 0], "x": 1.75, "y": 2}, + {"matrix": [4, 1], "x": 2.75, "y": 2}, + {"matrix": [5, 1], "x": 3.75, "y": 2}, + {"matrix": [4, 2], "x": 4.75, "y": 2}, + {"matrix": [5, 2], "x": 5.75, "y": 2}, + {"matrix": [4, 3], "x": 6.75, "y": 2}, + {"matrix": [5, 3], "x": 7.75, "y": 2}, + {"matrix": [4, 4], "x": 8.75, "y": 2}, + {"matrix": [5, 4], "x": 9.75, "y": 2}, + {"matrix": [4, 5], "x": 10.75, "y": 2}, + {"matrix": [5, 5], "x": 11.75, "y": 2}, + {"matrix": [4, 7], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [5, 7], "x": 15, "y": 2}, - {"label":"K60 (F6,C7)", "x":0, "y":3, "w":2.25}, - {"label":"K70 (F7,C7)", "x":2.25, "y":3}, - {"label":"K61 (F6,C6)", "x":3.25, "y":3}, - {"label":"K71 (F7,C6)", "x":4.25, "y":3}, - {"label":"K62 (F6,B6)", "x":5.25, "y":3}, - {"label":"K72 (F7,B6)", "x":6.25, "y":3}, - {"label":"K63 (F6,B5)", "x":7.25, "y":3}, - {"label":"K73 (F7,B5)", "x":8.25, "y":3}, - {"label":"K64 (F6,B4)", "x":9.25, "y":3}, - {"label":"K74 (F7,B4)", "x":10.25, "y":3}, - {"label":"K65 (F6,D7)", "x":11.25, "y":3}, - {"label":"K75 (F7,D7)", "x":12.25, "y":3, "w":1.75}, - {"label":"K77 (F7,D3)", "x":14, "y":3}, - {"label":"K67 (F6,D3)", "x":15, "y":3}, + {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [7, 0], "x": 2.25, "y": 3}, + {"matrix": [6, 1], "x": 3.25, "y": 3}, + {"matrix": [7, 1], "x": 4.25, "y": 3}, + {"matrix": [6, 2], "x": 5.25, "y": 3}, + {"matrix": [7, 2], "x": 6.25, "y": 3}, + {"matrix": [6, 3], "x": 7.25, "y": 3}, + {"matrix": [7, 3], "x": 8.25, "y": 3}, + {"matrix": [6, 4], "x": 9.25, "y": 3}, + {"matrix": [7, 4], "x": 10.25, "y": 3}, + {"matrix": [6, 5], "x": 11.25, "y": 3}, + {"matrix": [7, 5], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [7, 7], "x": 14, "y": 3}, + {"matrix": [6, 7], "x": 15, "y": 3}, - {"label":"K80 (F5,C7)", "x":0, "y":4, "w":1.25}, - {"label":"K90 (F4,C7)", "x":1.25, "y":4, "w":1.25}, - {"label":"K81 (F5,C6)", "x":2.5, "y":4, "w":1.25}, - {"label":"K92 (F4,B6)", "x":3.75, "y":4, "w":6.25}, - {"label":"K94 (F4,B4)", "x":10, "y":4, "w":1.25}, - {"label":"K85 (F5,D7)", "x":11.25, "y":4, "w":1.25}, - {"label":"K95 (F4,D7)", "x":13, "y":4}, - {"label":"K97 (F4,D3)", "x":14, "y":4}, - {"label":"K87 (F5,D3)", "x":15, "y":4} + {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [9, 2], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [9, 5], "x": 13, "y": 4}, + {"matrix": [9, 7], "x": 14, "y": 4}, + {"matrix": [8, 7], "x": 15, "y": 4} ] } } diff --git a/keyboards/sawnsprojects/krush/krush65/solder/solder.c b/keyboards/sawnsprojects/krush/krush65/solder/solder.c index 501d70d1bd..db6fec3950 100644 --- a/keyboards/sawnsprojects/krush/krush65/solder/solder.c +++ b/keyboards/sawnsprojects/krush/krush65/solder/solder.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "solder.h" +#include "quantum.h" /* Custom encoder control - handles CW/CCW turning of encoder * Default behavior: diff --git a/keyboards/sawnsprojects/krush/krush65/solder/solder.h b/keyboards/sawnsprojects/krush/krush65/solder/solder.h deleted file mode 100644 index 11140aac9c..0000000000 --- a/keyboards/sawnsprojects/krush/krush65/solder/solder.h +++ /dev/null @@ -1,96 +0,0 @@ -/* Copyright 2021 SawnsProjects - * - * 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 XXX KC_NO - -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───────┐ - * │00 │10 │01 │11 │02 │12 │03 │13 │04 │14 │05 │15 │06 │26 │17 │07 │ │26 │ 2u Backspace - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ └─┬─────┤ - * │20 │30 │21 │31 │22 │32 │23 │33 │24 │34 │25 │35 │36 │46 │37 │ │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ ┌──┴┐47 │ ISO Enter - * │40 │50 │41 │51 │42 │52 │43 │53 │44 │54 │45 │55 │47 │57 │ │46 │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ └───┴────┘ - * │60 │70 │61 │71 │62 │72 │63 │73 │64 │74 │65 │75 │77 │67 │ - * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ - * │80 │90 │81 │82 │92 │93 │94 │85 │ │95 │97 │87 │ Split Spacebar - * └────┴────┴────┴────────┴────┴──────────┴────┴────┘ └───┴───┴───┘ - * ┌────┬────┬────┬────────────────────────┬────┬────┐ - * │80 │90 │81 │92 │94 │85 │ Standard - * └────┴────┴────┴────────────────────────┴────┴────┘ - * ┌─────┬───┬─────┬───────────────────────────┬─────┐ - * │80 │90 │81 │92 │85 │ Tsangan - * └─────┴───┴─────┴───────────────────────────┴─────┘ - */ - -#define LAYOUT_65_ansi_blocker( \ - K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K07, \ - K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, K37, \ - K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, K57, \ - K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K77, K67, \ - K80, K90, K81, K92, K94, K85, K95, K97, K87 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07 }, \ - { K10, K11, K12, K13, K14, K15, XXX, XXX }, \ - { K20, K21, K22, K23, K24, K25, K26, XXX }, \ - { K30, K31, K32, K33, K34, K35, K36, K37 }, \ - { K40, K41, K42, K43, K44, K45, K46, K47 }, \ - { K50, K51, K52, K53, K54, K55, XXX, K57 }, \ - { K60, K61, K62, K63, K64, K65, XXX, K67 }, \ - { K70, K71, K72, K73, K74, K75, XXX, K77 }, \ - { K80, K81, XXX, XXX, XXX, K85, XXX, K87 }, \ - { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \ -} -#define LAYOUT_65_ansi_blocker_split_bs( \ - K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, K07, \ - K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, K37, \ - K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, K57, \ - K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K77, K67, \ - K80, K90, K81, K92, K94, K85, K95, K97, K87 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07 }, \ - { K10, K11, K12, K13, K14, K15, XXX, K17 }, \ - { K20, K21, K22, K23, K24, K25, K26, XXX }, \ - { K30, K31, K32, K33, K34, K35, K36, K37 }, \ - { K40, K41, K42, K43, K44, K45, K46, K47 }, \ - { K50, K51, K52, K53, K54, K55, XXX, K57 }, \ - { K60, K61, K62, K63, K64, K65, XXX, K67 }, \ - { K70, K71, K72, K73, K74, K75, XXX, K77 }, \ - { K80, K81, XXX, XXX, XXX, K85, XXX, K87 }, \ - { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \ -} -#define LAYOUT_65_ansi_blocker_split_bs_sp( \ - K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, K07, \ - K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, K37, \ - K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, K57, \ - K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K77, K67, \ - K80, K90, K81, K82, K92, K93, K94, K85, K95, K97, K87 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07 }, \ - { K10, K11, K12, K13, K14, K15, XXX, K17 }, \ - { K20, K21, K22, K23, K24, K25, K26, XXX }, \ - { K30, K31, K32, K33, K34, K35, K36, K37 }, \ - { K40, K41, K42, K43, K44, K45, K46, K47 }, \ - { K50, K51, K52, K53, K54, K55, XXX, K57 }, \ - { K60, K61, K62, K63, K64, K65, XXX, K67 }, \ - { K70, K71, K72, K73, K74, K75, XXX, K77 }, \ - { K80, K81, K82, XXX, XXX, K85, XXX, K87 }, \ - { K90, XXX, K92, K93, K94, K95, XXX, K97 }, \ -} diff --git a/keyboards/sawnsprojects/plaque80/info.json b/keyboards/sawnsprojects/plaque80/info.json index d45f9a3896..d4afc35bfc 100644 --- a/keyboards/sawnsprojects/plaque80/info.json +++ b/keyboards/sawnsprojects/plaque80/info.json @@ -25,7 +25,6 @@ "rgblight": true }, "rgblight": { - "pin": "F0", "led_count": 30, "sleep": true, "animations": { @@ -41,6 +40,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "F0" + }, "indicators": { "caps_lock": "E6", "scroll_lock": "D2" diff --git a/keyboards/sawnsprojects/satxri6key/config.h b/keyboards/sawnsprojects/satxri6key/config.h index f0c527387d..d180a0b733 100644 --- a/keyboards/sawnsprojects/satxri6key/config.h +++ b/keyboards/sawnsprojects/satxri6key/config.h @@ -16,24 +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 { F7, F6 } -#define MATRIX_COL_PINS { F1, F4, F5 } - -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN F0 -#ifdef RGB_DI_PIN #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -50,7 +32,6 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif #define RGB_MATRIX_LED_COUNT 6 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses diff --git a/keyboards/sawnsprojects/satxri6key/info.json b/keyboards/sawnsprojects/satxri6key/info.json index 50c304dda2..642f813a67 100644 --- a/keyboards/sawnsprojects/satxri6key/info.json +++ b/keyboards/sawnsprojects/satxri6key/info.json @@ -8,17 +8,26 @@ "pid": "0x0727", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F0" + }, + "matrix_pins": { + "cols": ["F1", "F4", "F5"], + "rows": ["F7", "F6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (F7,F1)", "x":0, "y":1}, - {"label":"K01 (F7,F4)", "x":1, "y":1}, - {"label":"K02 (F7,F5)", "x":2, "y":1}, - {"label":"K10 (F6,F1)", "x":0, "y":2}, - {"label":"K11 (F6,F4)", "x":1, "y":2}, - {"label":"K12 (F6,F5)", "x":2, "y":2} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1} ] } } diff --git a/keyboards/sawnsprojects/satxri6key/satxri6key.c b/keyboards/sawnsprojects/satxri6key/satxri6key.c index a1b988de8d..c335e0d3ef 100644 --- a/keyboards/sawnsprojects/satxri6key/satxri6key.c +++ b/keyboards/sawnsprojects/satxri6key/satxri6key.c @@ -14,7 +14,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "satxri6key.h" +#include "quantum.h" + #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { //Key Matrix to LED Indexccxxz diff --git a/keyboards/sawnsprojects/satxri6key/satxri6key.h b/keyboards/sawnsprojects/satxri6key/satxri6key.h deleted file mode 100644 index 2f5dca0e37..0000000000 --- a/keyboards/sawnsprojects/satxri6key/satxri6key.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2021 SawnsProjects - * - * 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,\ - K10, K11, K12\ - ) { \ - { K00, K01, K02 },\ - { K10, K11, K12 } \ -} diff --git a/keyboards/sawnsprojects/vcl65/solder/config.h b/keyboards/sawnsprojects/vcl65/solder/config.h index bd4258f12a..c18b8e95f1 100644 --- a/keyboards/sawnsprojects/vcl65/solder/config.h +++ b/keyboards/sawnsprojects/vcl65/solder/config.h @@ -16,15 +16,6 @@ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { F6, F7, F0, F4, B1 } -#define MATRIX_COL_PINS { B2, B5, F5, C7, B4, C6, D7, D6, D4, D5, D3, D2, B6, D1, D0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN B7 -#ifdef RGB_DI_PIN #define RGBLED_NUM 20 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -43,4 +34,3 @@ #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif
\ No newline at end of file diff --git a/keyboards/sawnsprojects/vcl65/solder/info.json b/keyboards/sawnsprojects/vcl65/solder/info.json index 1b0c638ecc..d91101d107 100644 --- a/keyboards/sawnsprojects/vcl65/solder/info.json +++ b/keyboards/sawnsprojects/vcl65/solder/info.json @@ -8,10 +8,18 @@ "pid": "0x1727", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "B5", "F5", "C7", "B4", "C6", "D7", "D6", "D4", "D5", "D3", "D2", "B6", "D1", "D0"], + "rows": ["F6", "F7", "F0", "F4", "B1"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "F1", "on_state": 0 }, + "ws2812": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/sawnsprojects/vcl65/solder/solder.c b/keyboards/sawnsprojects/vcl65/solder/solder.c deleted file mode 100644 index 2fb9b24f8c..0000000000 --- a/keyboards/sawnsprojects/vcl65/solder/solder.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 SawnsProjects - * - * 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 "solder.h"
\ No newline at end of file |