diff options
Diffstat (limited to 'keyboards/keychron/q1/iso_encoder')
8 files changed, 44 insertions, 59 deletions
diff --git a/keyboards/keychron/q1/iso_encoder/config.h b/keyboards/keychron/q1/iso_encoder/config.h index b52fb88383..c1e84e44d3 100644 --- a/keyboards/keychron/q1/iso_encoder/config.h +++ b/keyboards/keychron/q1/iso_encoder/config.h @@ -16,10 +16,6 @@ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { D3, D2, B3, B2, B1, B0 } -#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 } - /* DIP switch */ #define DIP_SWITCH_MATRIX_GRID { {0,1} } diff --git a/keyboards/keychron/q1/iso_encoder/info.json b/keyboards/keychron/q1/iso_encoder/info.json index e4dce374c8..d8e1751de3 100644 --- a/keyboards/keychron/q1/iso_encoder/info.json +++ b/keyboards/keychron/q1/iso_encoder/info.json @@ -6,8 +6,17 @@ "usb": { "vid": "0x3434", "pid": "0x0103", - "device_version": "1.0.2" + "device_version": "1.0.2", + "force_nkro": true }, + "rgb_matrix": { + "driver": "IS31FL3733" + }, + "matrix_pins": { + "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["D3", "D2", "B3", "B2", "B1", "B0"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "E6", "pin_b": "B7"} @@ -27,12 +36,12 @@ {"matrix":[0, 7], "x":6.5, "y":0}, {"matrix":[0, 8], "x":7.5, "y":0}, {"matrix":[0, 9], "x":8.5, "y":0}, - {"matrix":[0,10], "x":9.75, "y":0}, - {"matrix":[0,11], "x":10.75, "y":0}, - {"matrix":[0,12], "x":11.75, "y":0}, - {"matrix":[0,13], "x":12.75, "y":0}, - {"matrix":[4,14], "x":14, "y":0}, - {"matrix":[0,14], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":9.75, "y":0}, + {"matrix":[0, 11], "x":10.75, "y":0}, + {"matrix":[0, 12], "x":11.75, "y":0}, + {"matrix":[0, 13], "x":12.75, "y":0}, + {"matrix":[4, 14], "x":14, "y":0}, + {"matrix":[0, 14], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -44,11 +53,11 @@ {"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}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1, 10], "x":10, "y":1.25}, + {"matrix":[1, 11], "x":11, "y":1.25}, + {"matrix":[1, 12], "x":12, "y":1.25}, + {"matrix":[1, 13], "x":13, "y":1.25, "w":2}, + {"matrix":[1, 14], "x":15.25, "y":1.25}, {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, {"matrix":[2, 1], "x":1.5, "y":2.25}, @@ -60,10 +69,10 @@ {"matrix":[2, 7], "x":7.5, "y":2.25}, {"matrix":[2, 8], "x":8.5, "y":2.25}, {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,14], "x":15.25, "y":2.25}, + {"matrix":[2, 10], "x":10.5, "y":2.25}, + {"matrix":[2, 11], "x":11.5, "y":2.25}, + {"matrix":[2, 12], "x":12.5, "y":2.25}, + {"matrix":[2, 14], "x":15.25, "y":2.25}, {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, {"matrix":[3, 1], "x":1.75, "y":3.25}, @@ -75,11 +84,11 @@ {"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}, - {"matrix":[3,11], "x":11.75, "y":3.25}, - {"matrix":[3,13], "x":12.75, "y":3.25}, - {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, - {"matrix":[3,14], "x":15.25, "y":3.25}, + {"matrix":[3, 10], "x":10.75, "y":3.25}, + {"matrix":[3, 11], "x":11.75, "y":3.25}, + {"matrix":[3, 13], "x":12.75, "y":3.25}, + {"matrix":[2, 13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3, 14], "x":15.25, "y":3.25}, {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25}, {"matrix":[4, 1], "x":1.25, "y":4.25}, @@ -91,21 +100,21 @@ {"matrix":[4, 7], "x":7.25, "y":4.25}, {"matrix":[4, 8], "x":8.25, "y":4.25}, {"matrix":[4, 9], "x":9.25, "y":4.25}, - {"matrix":[4,10], "x":10.25, "y":4.25}, - {"matrix":[4,11], "x":11.25, "y":4.25}, - {"matrix":[4,13], "x":12.25, "y":4.25, "w":1.75}, - {"matrix":[3,12], "x":14.25, "y":4.5}, + {"matrix":[4, 10], "x":10.25, "y":4.25}, + {"matrix":[4, 11], "x":11.25, "y":4.25}, + {"matrix":[4, 13], "x":12.25, "y":4.25, "w":1.75}, + {"matrix":[3, 12], "x":14.25, "y":4.5}, {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25}, {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25}, {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25}, {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":10, "y":5.25}, - {"matrix":[5,11], "x":11, "y":5.25}, - {"matrix":[5,12], "x":12, "y":5.25}, - {"matrix":[5,13], "x":13.25, "y":5.5}, - {"matrix":[4,12], "x":14.25, "y":5.5}, - {"matrix":[5,14], "x":15.25, "y":5.5} + {"matrix":[5, 10], "x":10, "y":5.25}, + {"matrix":[5, 11], "x":11, "y":5.25}, + {"matrix":[5, 12], "x":12, "y":5.25}, + {"matrix":[5, 13], "x":13.25, "y":5.5}, + {"matrix":[4, 12], "x":14.25, "y":5.5}, + {"matrix":[5, 14], "x":15.25, "y":5.5} ] } } diff --git a/keyboards/keychron/q1/iso_encoder/iso_encoder.c b/keyboards/keychron/q1/iso_encoder/iso_encoder.c index c6563ad318..c6b091fff1 100644 --- a/keyboards/keychron/q1/iso_encoder/iso_encoder.c +++ b/keyboards/keychron/q1/iso_encoder/iso_encoder.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "iso_encoder.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q1/iso_encoder/iso_encoder.h b/keyboards/keychron/q1/iso_encoder/iso_encoder.h deleted file mode 100644 index d62d707b4a..0000000000 --- a/keyboards/keychron/q1/iso_encoder/iso_encoder.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.com) - * - * 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"
\ No newline at end of file diff --git a/keyboards/keychron/q1/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q1/iso_encoder/keymaps/default/keymap.c index 840db80a5b..237d9a3f1e 100644 --- a/keyboards/keychron/q1/iso_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/q1/iso_encoder/keymaps/default/keymap.c @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q1/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q1/iso_encoder/keymaps/keychron/keymap.c index d78878d5e9..b007e56fba 100644 --- a/keyboards/keychron/q1/iso_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/q1/iso_encoder/keymaps/keychron/keymap.c @@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q1/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q1/iso_encoder/keymaps/via/keymap.c index 052fe8c58a..47f04d8a29 100644 --- a/keyboards/keychron/q1/iso_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/q1/iso_encoder/keymaps/via/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/keychron/q1/iso_encoder/rules.mk b/keyboards/keychron/q1/iso_encoder/rules.mk index 3eea458e72..d994ac1fad 100644 --- a/keyboards/keychron/q1/iso_encoder/rules.mk +++ b/keyboards/keychron/q1/iso_encoder/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = IS31FL3733 RAW_ENABLE = yes LTO_ENABLE = yes |