Merge branch 'develop'

6 files changed, 81 insertions, 93 deletions

diff --git a/keyboards/keychron/q8/iso_encoder/info.json b/keyboards/keychron/q8/iso_encoder/info.json
index 45181452be..f55ccaf202 100644
--- a/keyboards/keychron/q8/iso_encoder/info.json
+++ b/keyboards/keychron/q8/iso_encoder/info.json
@@ -8,6 +8,14 @@
         "pid": "0x0183",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "B5", "pin_b": "A10"}
@@ -18,80 +26,80 @@
     "layouts": {
         "LAYOUT_iso_70": {
             "layout": [
-                {"matrix":[0, 0], "x":0.75, "y":0.25},
-                {"matrix":[0, 1], "x":1.75, "y":0.25},
-                {"matrix":[0, 2], "x":2.75, "y":0},
-                {"matrix":[0, 3], "x":3.75, "y":0.25},
-                {"matrix":[0, 4], "x":4.75, "y":0.25},
-                {"matrix":[0, 5], "x":5.75, "y":0.25},
-                {"matrix":[0, 6], "x":6.75, "y":0.25},
-                {"matrix":[0, 7], "x":9.5, "y":0.25},
-                {"matrix":[0, 8], "x":10.5, "y":0.25},
-                {"matrix":[0, 9], "x":11.5, "y":0.25},
-                {"matrix":[0,10], "x":12.5, "y":0.25},
-                {"matrix":[0,11], "x":13.5, "y":0},
-                {"matrix":[0,12], "x":14.5, "y":0.25},
-                {"matrix":[0,13], "x":15.5, "y":0.25, "w":2},
-                {"matrix":[0,14], "x":18, "y":0.25},
+                {"matrix": [0, 0], "x": 0.75, "y": 0.25},
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0},
+                {"matrix": [0, 3], "x": 3.75, "y": 0.25},
+                {"matrix": [0, 4], "x": 4.75, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.75, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.75, "y": 0.25},
+                {"matrix": [0, 7], "x": 9.5, "y": 0.25},
+                {"matrix": [0, 8], "x": 10.5, "y": 0.25},
+                {"matrix": [0, 9], "x": 11.5, "y": 0.25},
+                {"matrix": [0, 10], "x": 12.5, "y": 0.25},
+                {"matrix": [0, 11], "x": 13.5, "y": 0},
+                {"matrix": [0, 12], "x": 14.5, "y": 0.25},
+                {"matrix": [0, 13], "x": 15.5, "y": 0.25, "w": 2},
+                {"matrix": [0, 14], "x": 18, "y": 0.25},
 
-                {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5},
-                {"matrix":[1, 1], "x":2, "y":1.25},
-                {"matrix":[1, 2], "x":3.25, "y":1.25},
-                {"matrix":[1, 3], "x":4.25, "y":1.25},
-                {"matrix":[1, 4], "x":5.25, "y":1.25},
-                {"matrix":[1, 5], "x":6.25, "y":1.25},
-                {"matrix":[1, 6], "x":9, "y":1.25},
-                {"matrix":[1, 7], "x":10, "y":1.25},
-                {"matrix":[1, 8], "x":11, "y":1.25},
-                {"matrix":[1, 9], "x":12, "y":1.25},
-                {"matrix":[1,10], "x":13.25, "y":1.25},
-                {"matrix":[1,11], "x":14.25, "y":1.25},
-                {"matrix":[1,12], "x":15.25, "y":1.25},
-                {"matrix":[1,14], "x":18.25, "y":1.5},
+                {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 9, "y": 1.25},
+                {"matrix": [1, 7], "x": 10, "y": 1.25},
+                {"matrix": [1, 8], "x": 11, "y": 1.25},
+                {"matrix": [1, 9], "x": 12, "y": 1.25},
+                {"matrix": [1, 10], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 12], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 14], "x": 18.25, "y": 1.5},
 
-                {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75},
-                {"matrix":[2, 1], "x":2, "y":2.25},
-                {"matrix":[2, 2], "x":3.5, "y":2.25},
-                {"matrix":[2, 3], "x":4.5, "y":2.25},
-                {"matrix":[2, 4], "x":5.5, "y":2.25},
-                {"matrix":[2, 5], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":9.25, "y":2.25},
-                {"matrix":[2, 8], "x":10.25, "y":2.25},
-                {"matrix":[2, 9], "x":11.25, "y":2.25},
-                {"matrix":[2,10], "x":12.25, "y":2.25},
-                {"matrix":[2,11], "x":13.5, "y":2.25},
-                {"matrix":[2,12], "x":14.5, "y":2.25},
-                {"matrix":[2,13], "x":15.5, "y":2.25},
-                {"matrix":[1,13], "x":16.5, "y":1.25, "w":1.25, "h":2},
-                {"matrix":[2,14], "x":18.5, "y":2.5},
+                {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 2, "y": 2.25},
+                {"matrix": [2, 2], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 9.25, "y": 2.25},
+                {"matrix": [2, 8], "x": 10.25, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.25, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.25, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 14.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 15.5, "y": 2.25},
+                {"matrix": [1, 13], "x": 16.5, "y": 1.25, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 18.5, "y": 2.5},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25},
-                {"matrix":[3, 1], "x":1.25, "y":3.25},
-                {"matrix":[3, 2], "x":2.25, "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":8.5, "y":3.25},
-                {"matrix":[3, 8], "x":9.5, "y":3.25},
-                {"matrix":[3, 9], "x":10.5, "y":3.25},
-                {"matrix":[3,10], "x":11.5, "y":3.25},
-                {"matrix":[3,11], "x":12.5, "y":3.25},
-                {"matrix":[3,12], "x":14.25, "y":3.25},
-                {"matrix":[3,13], "x":15.25, "y":3.25, "w":1.75},
-                {"matrix":[3,14], "x":17.25, "y":3.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.25, "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": 8.5, "y": 3.25},
+                {"matrix": [3, 8], "x": 9.5, "y": 3.25},
+                {"matrix": [3, 9], "x": 10.5, "y": 3.25},
+                {"matrix": [3, 10], "x": 11.5, "y": 3.25},
+                {"matrix": [3, 11], "x": 12.5, "y": 3.25},
+                {"matrix": [3, 12], "x": 14.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 15.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3.5},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25},
-                {"matrix":[4, 2], "x":3.75, "y":4.25, "w":1.25},
-                {"matrix":[4, 3], "x":5, "y":4.25, "w":2.25},
-                {"matrix":[4, 6], "x":7.25, "y":4.25},
-                {"matrix":[4, 7], "x":8.75, "y":4.25},
-                {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75},
-                {"matrix":[4, 9], "x":12.5, "y":4.25},
-                {"matrix":[4,12], "x":16.25, "y":4.5},
-                {"matrix":[4,13], "x":17.25, "y":4.5},
-                {"matrix":[4,14], "x":18.25, "y":4.5}
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 2], "x": 3.75, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 5, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.75, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 9], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 16.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 17.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 18.25, "y": 4.5}
             ]
         }
     }
diff --git a/keyboards/keychron/q8/iso_encoder/iso_encoder.h b/keyboards/keychron/q8/iso_encoder/iso_encoder.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q8/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"
diff --git a/keyboards/keychron/q8/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q8/iso_encoder/keymaps/default/keymap.c
index a779fdc130..7db63d4118 100644
--- a/keyboards/keychron/q8/iso_encoder/keymaps/default/keymap.c
+++ b/keyboards/keychron/q8/iso_encoder/keymaps/default/keymap.c
@@ -67,7 +67,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)},
     [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
     [_FN1]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
diff --git a/keyboards/keychron/q8/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q8/iso_encoder/keymaps/keychron/keymap.c
index 4884aeaeae..b3abda2975 100644
--- a/keyboards/keychron/q8/iso_encoder/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/q8/iso_encoder/keymaps/keychron/keymap.c
@@ -65,7 +65,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)},
     [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
     [_FN1]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
diff --git a/keyboards/keychron/q8/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q8/iso_encoder/keymaps/via/keymap.c
index da409a551d..8b66a40c6b 100644
--- a/keyboards/keychron/q8/iso_encoder/keymaps/via/keymap.c
+++ b/keyboards/keychron/q8/iso_encoder/keymaps/via/keymap.c
@@ -67,7 +67,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)},
     [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
     [_FN1]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
diff --git a/keyboards/keychron/q8/iso_encoder/rules.mk b/keyboards/keychron/q8/iso_encoder/rules.mk
index 5240004b8c..6a772965ff 100644
--- a/keyboards/keychron/q8/iso_encoder/rules.mk
+++ b/keyboards/keychron/q8/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 = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash