diff options
Diffstat (limited to 'keyboards/sawnsprojects')
26 files changed, 456 insertions, 726 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..acb401b361 100644 --- a/keyboards/sawnsprojects/amber80/solder/info.json +++ b/keyboards/sawnsprojects/amber80/solder/info.json @@ -8,106 +8,128 @@ "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": { "LAYOUT_all": { "layout": [ - { "label": "K00 (B1,F4)", "x": 0, "y": 0 }, - { "label": "K10 (B2,F4)", "x": 1.25, "y": 0 }, - { "label": "K01 (B1,F6)", "x": 2.25, "y": 0 }, - { "label": "K11 (B2,F6)", "x": 3.25, "y": 0 }, - { "label": "K02 (B1,F7)", "x": 4.25, "y": 0 }, - { "label": "K12 (B2,F7)", "x": 5.5, "y": 0 }, - { "label": "K03 (B1,C7)", "x": 6.5, "y": 0 }, - { "label": "K13 (B2,C7)", "x": 7.5, "y": 0 }, - { "label": "K04 (B1,C6)", "x": 8.5, "y": 0 }, - { "label": "K14 (B2,C6)", "x": 9.75, "y": 0 }, - { "label": "K05 (B1,B6)", "x": 10.75, "y": 0 }, - { "label": "K15 (B2,B6)", "x": 11.75, "y": 0 }, - { "label": "K06 (B1,B5)", "x": 12.75, "y": 0 }, - { "label": "K16 (B2,B5)", "x": 14, "y": 0 }, - { "label": "K17 (B2,D6)", "x": 15.25, "y": 0 }, - { "label": "K08 (B1,D4)", "x": 16.25, "y": 0 }, - { "label": "K18 (B2,D4)", "x": 17.25, "y": 0 }, - { "label": "K20 (B3,F4)", "x": 0, "y": 1.25 }, - { "label": "K30 (B7,F4)", "x": 1, "y": 1.25 }, - { "label": "K21 (B3,F6)", "x": 2, "y": 1.25 }, - { "label": "K31 (B7,F6)", "x": 3, "y": 1.25 }, - { "label": "K22 (B3,F7)", "x": 4, "y": 1.25 }, - { "label": "K32 (B7,F7)", "x": 5, "y": 1.25 }, - { "label": "K23 (B3,C7)", "x": 6, "y": 1.25 }, - { "label": "K33 (B7,C7)", "x": 7, "y": 1.25 }, - { "label": "K24 (B3,C6)", "x": 8, "y": 1.25 }, - { "label": "K34 (B7,C6)", "x": 9, "y": 1.25 }, - { "label": "K25 (B3,B6)", "x": 10, "y": 1.25 }, - { "label": "K35 (B7,B6)", "x": 11, "y": 1.25 }, - { "label": "K26 (B3,B5)", "x": 12, "y": 1.25 }, - { "label": "K36 (B7,B5)", "x": 13, "y": 1.25 }, - { "label": "K27 (B3,D6)", "x": 14, "y": 1.25 }, - { "label": "K37 (B7,D6)", "x": 15.25, "y": 1.25 }, - { "label": "K28 (B3,D4)", "x": 16.25, "y": 1.25 }, - { "label": "K38 (B7,D4)", "x": 17.25, "y": 1.25 }, - { "label": "K40 (D0,F4)", "x": 0, "y": 2.25, "w": 1.5 }, - { "label": "K50 (D1,F4)", "x": 1.5, "y": 2.25 }, - { "label": "K41 (D0,F6)", "x": 2.5, "y": 2.25 }, - { "label": "K51 (D1,F6)", "x": 3.5, "y": 2.25 }, - { "label": "K42 (D0,F7)", "x": 4.5, "y": 2.25 }, - { "label": "K52 (D1,F7)", "x": 5.5, "y": 2.25 }, - { "label": "K43 (D0,C7)", "x": 6.5, "y": 2.25 }, - { "label": "K53 (D1,C7)", "x": 7.5, "y": 2.25 }, - { "label": "K44 (D0,C6)", "x": 8.5, "y": 2.25 }, - { "label": "K54 (D1,C6)", "x": 9.5, "y": 2.25 }, - { "label": "K45 (D0,B6)", "x": 10.5, "y": 2.25 }, - { "label": "K55 (D1,B6)", "x": 11.5, "y": 2.25 }, - { "label": "K46 (D0,B5)", "x": 12.5, "y": 2.25 }, - { "label": "K56 (D1,B5)", "x": 13.5, "y": 2.25, "w": 1.5 }, - { "label": "K57 (D1,D6)", "x": 15.25, "y": 2.25 }, - { "label": "K48 (D0,D4)", "x": 16.25, "y": 2.25 }, - { "label": "K58 (D1,D4)", "x": 17.25, "y": 2.25 }, - { "label": "K60 (F1,F4)", "x": 0, "y": 3.25, "w": 1.75 }, - { "label": "K70 (F0,F4)", "x": 1.75, "y": 3.25 }, - { "label": "K61 (F1,F6)", "x": 2.75, "y": 3.25 }, - { "label": "K71 (F0,F6)", "x": 3.75, "y": 3.25 }, - { "label": "K62 (F1,F7)", "x": 4.75, "y": 3.25 }, - { "label": "K72 (F0,F7)", "x": 5.75, "y": 3.25 }, - { "label": "K63 (F1,C7)", "x": 6.75, "y": 3.25 }, - { "label": "K73 (F0,C7)", "x": 7.75, "y": 3.25 }, - { "label": "K64 (F1,C6)", "x": 8.75, "y": 3.25 }, - { "label": "K74 (F0,C6)", "x": 9.75, "y": 3.25 }, - { "label": "K65 (F1,B6)", "x": 10.75, "y": 3.25 }, - { "label": "K75 (F0,B6)", "x": 11.75, "y": 3.25 }, - { "label": "K76 (F0,B5)", "x": 12.75, "y": 3.25, "w": 2.25 }, - { "label": "K80 (D7,F4)", "x": 0, "y": 4.25, "w": 1.25 }, - { "label": "K90 (B4,F4)", "x": 1.25, "y": 4.25 }, - { "label": "K81 (D7,F6)", "x": 2.25, "y": 4.25 }, - { "label": "K91 (B4,F6)", "x": 3.25, "y": 4.25 }, - { "label": "K82 (D7,F7)", "x": 4.25, "y": 4.25 }, - { "label": "K92 (B4,F7)", "x": 5.25, "y": 4.25 }, - { "label": "K83 (D7,C7)", "x": 6.25, "y": 4.25 }, - { "label": "K93 (B4,C7)", "x": 7.25, "y": 4.25 }, - { "label": "K84 (D7,C6)", "x": 8.25, "y": 4.25 }, - { "label": "K94 (B4,C6)", "x": 9.25, "y": 4.25 }, - { "label": "K85 (D7,B6)", "x": 10.25, "y": 4.25 }, - { "label": "K95 (B4,B6)", "x": 11.25, "y": 4.25 }, - { "label": "K86 (D7,B5)", "x": 12.25, "y": 4.25, "w": 1.75 }, - { "label": "K96 (B4,B5)", "x": 14, "y": 4.25 }, - { "label": "K88 (D7,D4)", "x": 16.25, "y": 4.25 }, - { "label": "KA0 (D5,F4)", "x": 0, "y": 5.25, "w": 1.5 }, - { "label": "KB0 (D3,F4)", "x": 1.5, "y": 5.25 }, - { "label": "KA1 (D5,F6)", "x": 2.5, "y": 5.25, "w": 1.5 }, - { "label": "KB3 (D3,C7)", "x": 4, "y": 5.25, "w": 7 }, - { "label": "KA6 (D5,B5)", "x": 11, "y": 5.25, "w": 1.5 }, - { "label": "KB6 (D3,B5)", "x": 12.5, "y": 5.25 }, - { "label": "KA7 (D5,D6)", "x": 13.5, "y": 5.25, "w": 1.5 }, - { "label": "KB7 (D3,D6)", "x": 15.25, "y": 5.25 }, - { "label": "KA8 (D5,D4)", "x": 16.25, "y": 5.25 }, - { "label": "KB8 (D3,D4)", "x": 17.25, "y": 5.25 } + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [1, 0], "x": 1.25, "y": 0}, + {"matrix": [0, 1], "x": 2.25, "y": 0}, + {"matrix": [1, 1], "x": 3.25, "y": 0}, + {"matrix": [0, 2], "x": 4.25, "y": 0}, + + {"matrix": [1, 2], "x": 5.5, "y": 0}, + {"matrix": [0, 3], "x": 6.5, "y": 0}, + {"matrix": [1, 3], "x": 7.5, "y": 0}, + {"matrix": [0, 4], "x": 8.5, "y": 0}, + + {"matrix": [1, 4], "x": 9.75, "y": 0}, + {"matrix": [0, 5], "x": 10.75, "y": 0}, + {"matrix": [1, 5], "x": 11.75, "y": 0}, + {"matrix": [0, 6], "x": 12.75, "y": 0}, + + {"matrix": [1, 6], "x": 14, "y": 0}, + + {"matrix": [1, 7], "x": 15.25, "y": 0}, + {"matrix": [0, 8], "x": 16.25, "y": 0}, + {"matrix": [1, 8], "x": 17.25, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1.25}, + {"matrix": [3, 0], "x": 1, "y": 1.25}, + {"matrix": [2, 1], "x": 2, "y": 1.25}, + {"matrix": [3, 1], "x": 3, "y": 1.25}, + {"matrix": [2, 2], "x": 4, "y": 1.25}, + {"matrix": [3, 2], "x": 5, "y": 1.25}, + {"matrix": [2, 3], "x": 6, "y": 1.25}, + {"matrix": [3, 3], "x": 7, "y": 1.25}, + {"matrix": [2, 4], "x": 8, "y": 1.25}, + {"matrix": [3, 4], "x": 9, "y": 1.25}, + {"matrix": [2, 5], "x": 10, "y": 1.25}, + {"matrix": [3, 5], "x": 11, "y": 1.25}, + {"matrix": [2, 6], "x": 12, "y": 1.25}, + {"matrix": [3, 6], "x": 13, "y": 1.25}, + {"matrix": [2, 7], "x": 14, "y": 1.25}, + + {"matrix": [3, 7], "x": 15.25, "y": 1.25}, + {"matrix": [2, 8], "x": 16.25, "y": 1.25}, + {"matrix": [3, 8], "x": 17.25, "y": 1.25}, + + {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [5, 0], "x": 1.5, "y": 2.25}, + {"matrix": [4, 1], "x": 2.5, "y": 2.25}, + {"matrix": [5, 1], "x": 3.5, "y": 2.25}, + {"matrix": [4, 2], "x": 4.5, "y": 2.25}, + {"matrix": [5, 2], "x": 5.5, "y": 2.25}, + {"matrix": [4, 3], "x": 6.5, "y": 2.25}, + {"matrix": [5, 3], "x": 7.5, "y": 2.25}, + {"matrix": [4, 4], "x": 8.5, "y": 2.25}, + {"matrix": [5, 4], "x": 9.5, "y": 2.25}, + {"matrix": [4, 5], "x": 10.5, "y": 2.25}, + {"matrix": [5, 5], "x": 11.5, "y": 2.25}, + {"matrix": [4, 6], "x": 12.5, "y": 2.25}, + {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"matrix": [5, 7], "x": 15.25, "y": 2.25}, + {"matrix": [4, 8], "x": 16.25, "y": 2.25}, + {"matrix": [5, 8], "x": 17.25, "y": 2.25}, + + {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [7, 0], "x": 1.75, "y": 3.25}, + {"matrix": [6, 1], "x": 2.75, "y": 3.25}, + {"matrix": [7, 1], "x": 3.75, "y": 3.25}, + {"matrix": [6, 2], "x": 4.75, "y": 3.25}, + {"matrix": [7, 2], "x": 5.75, "y": 3.25}, + {"matrix": [6, 3], "x": 6.75, "y": 3.25}, + {"matrix": [7, 3], "x": 7.75, "y": 3.25}, + {"matrix": [6, 4], "x": 8.75, "y": 3.25}, + {"matrix": [7, 4], "x": 9.75, "y": 3.25}, + {"matrix": [6, 5], "x": 10.75, "y": 3.25}, + {"matrix": [7, 5], "x": 11.75, "y": 3.25}, + {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [9, 0], "x": 1.25, "y": 4.25}, + {"matrix": [8, 1], "x": 2.25, "y": 4.25}, + {"matrix": [9, 1], "x": 3.25, "y": 4.25}, + {"matrix": [8, 2], "x": 4.25, "y": 4.25}, + {"matrix": [9, 2], "x": 5.25, "y": 4.25}, + {"matrix": [8, 3], "x": 6.25, "y": 4.25}, + {"matrix": [9, 3], "x": 7.25, "y": 4.25}, + {"matrix": [8, 4], "x": 8.25, "y": 4.25}, + {"matrix": [9, 4], "x": 9.25, "y": 4.25}, + {"matrix": [8, 5], "x": 10.25, "y": 4.25}, + {"matrix": [9, 5], "x": 11.25, "y": 4.25}, + {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [9, 6], "x": 14, "y": 4.25}, + + {"matrix": [8, 8], "x": 16.25, "y": 4.25}, + + {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [11, 0], "x": 1.5, "y": 5.25}, + {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [11, 3], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [10, 6], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [11, 6], "x": 12.5, "y": 5.25}, + {"matrix": [10, 7], "x": 13.5, "y": 5.25, "w": 1.5}, + + {"matrix": [11, 7], "x": 15.25, "y": 5.25}, + {"matrix": [10, 8], "x": 16.25, "y": 5.25}, + {"matrix": [11, 8], "x": 17.25, "y": 5.25} ] } } 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/amber80/solder/solder.h b/keyboards/sawnsprojects/amber80/solder/solder.h deleted file mode 100644 index 9f76795162..0000000000 --- a/keyboards/sawnsprojects/amber80/solder/solder.h +++ /dev/null @@ -1,44 +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/>. - */ - -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT_all( \ - K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K17, K08, K18, \ - K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, K37, K28, K38, \ - K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K57, K48, K58, \ - K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K76, \ - K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K95, K86, K96, K88, \ - KA0, KB0, KA1, KB3, KA6, KB6, KA7, KB7, KA8, KB8 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, XXX, K08 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \ - { K40, K41, K42, K43, K44, K45, K46, XXX, K48 }, \ - { K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \ - { K60, K61, K62, K63, K64, K65, XXX, XXX, XXX }, \ - { K70, K71, K72, K73, K74, K75, K76, XXX, XXX }, \ - { K80, K81, K82, K83, K84, K85, K86, XXX, K88 }, \ - { K90, K91, K92, K93, K94, K95, K96, XXX, XXX }, \ - { KA0, KA1, XXX, XXX, XXX, XXX, KA6, KA7, KA8 }, \ - { KB0, XXX, XXX, KB3, XXX, XXX, KB6, KB7, KB8 }, \ -} - 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}, |