diff options
Diffstat (limited to 'keyboards/quarkeys/z40')
-rw-r--r-- | keyboards/quarkeys/z40/config.h | 5 | ||||
-rw-r--r-- | keyboards/quarkeys/z40/info.json | 113 | ||||
-rw-r--r-- | keyboards/quarkeys/z40/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/quarkeys/z40/z40.c | 2 | ||||
-rw-r--r-- | keyboards/quarkeys/z40/z40.h | 29 |
5 files changed, 63 insertions, 87 deletions
diff --git a/keyboards/quarkeys/z40/config.h b/keyboards/quarkeys/z40/config.h index 1ca7a35849..2f70b1e53b 100644 --- a/keyboards/quarkeys/z40/config.h +++ b/keyboards/quarkeys/z40/config.h @@ -14,11 +14,6 @@ #pragma once -#define DIODE_DIRECTION COL2ROW - -#define MATRIX_ROW_PINS { E6, B3, C7, C6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B6, B5, B4, D7, D6, D0, B1, B0 } -#define RGB_DI_PIN F1 #ifdef RGB_MATRIX_ENABLE #define RGB_MATRIX_LED_COUNT 47 #define RGB_MATRIX_KEYPRESSES // Reacts to Keypresses diff --git a/keyboards/quarkeys/z40/info.json b/keyboards/quarkeys/z40/info.json index 57159669a4..7b48e3d79e 100644 --- a/keyboards/quarkeys/z40/info.json +++ b/keyboards/quarkeys/z40/info.json @@ -8,62 +8,73 @@ "pid": "0x2801", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "WS2812" + }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "D0", "B1", "B0"], + "rows": ["E6", "B3", "C7", "C6"] + }, + "ws2812": { + "pin": "F1" + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":6, "y":1}, - {"x":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":6, "y":2}, - {"x":7, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "y":3}, - {"x":5, "y":3, "w":2}, - {"x":7, "y":3}, - {"x":8, "y":3}, - {"x":9, "y":3}, - {"x":10, "y":3}, - {"x":11, "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": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3, "w": 2}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3} ] } } - }
\ No newline at end of file +}
\ No newline at end of file diff --git a/keyboards/quarkeys/z40/rules.mk b/keyboards/quarkeys/z40/rules.mk index 89107d24a8..4554ab2970 100644 --- a/keyboards/quarkeys/z40/rules.mk +++ b/keyboards/quarkeys/z40/rules.mk @@ -14,4 +14,3 @@ AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = no # Enable this and unable RGB_MATRIX_ENABLE to use RGB light effect RGB_MATRIX_ENABLE = yes # Enable this and unable RGBLIGHT_ENABLE to use RGB Matrix effect -RGB_MATRIX_DRIVER = WS2812 # Comment out this line when RGBLIGHTING is enabled diff --git a/keyboards/quarkeys/z40/z40.c b/keyboards/quarkeys/z40/z40.c index 9bc188f04f..18ebec736b 100644 --- a/keyboards/quarkeys/z40/z40.c +++ b/keyboards/quarkeys/z40/z40.c @@ -12,8 +12,8 @@ / along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include "quantum.h" -#include "z40.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { // Key Matrix to LED Index diff --git a/keyboards/quarkeys/z40/z40.h b/keyboards/quarkeys/z40/z40.h deleted file mode 100644 index 9a599d9cd1..0000000000 --- a/keyboards/quarkeys/z40/z40.h +++ /dev/null @@ -1,29 +0,0 @@ -/* -/ Copyright 2022 quarkeys -/ 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( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \ - { k30, k31, k32, k33, k34, k35, XXX, k36, k37, k38, k39, k3A }\ -} |