diff options
Diffstat (limited to 'keyboards/keychron/v8')
-rw-r--r-- | keyboards/keychron/v8/ansi/info.json | 146 | ||||
-rw-r--r-- | keyboards/keychron/v8/ansi/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/keychron/v8/ansi_encoder/info.json | 146 | ||||
-rw-r--r-- | keyboards/keychron/v8/ansi_encoder/keymaps/default/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/keychron/v8/ansi_encoder/keymaps/keychron/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/keychron/v8/ansi_encoder/keymaps/via/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/keychron/v8/ansi_encoder/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/keychron/v8/config.h | 7 | ||||
-rw-r--r-- | keyboards/keychron/v8/iso/info.json | 148 | ||||
-rw-r--r-- | keyboards/keychron/v8/iso/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/keychron/v8/iso_encoder/info.json | 148 | ||||
-rw-r--r-- | keyboards/keychron/v8/iso_encoder/keymaps/default/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/keychron/v8/iso_encoder/keymaps/keychron/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/keychron/v8/iso_encoder/keymaps/via/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/keychron/v8/iso_encoder/rules.mk | 1 |
15 files changed, 316 insertions, 295 deletions
diff --git a/keyboards/keychron/v8/ansi/info.json b/keyboards/keychron/v8/ansi/info.json index f1f2e75e4d..38e8be2c00 100644 --- a/keyboards/keychron/v8/ansi/info.json +++ b/keyboards/keychron/v8/ansi/info.json @@ -8,84 +8,92 @@ "pid": "0x0380", "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", "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_69": { "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}, + {"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}, - {"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,13], "x":16.25, "y":1.25, "w":1.5}, - {"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, 13], "x": 16.25, "y": 1.25, "w": 1.5}, + {"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.75, "y":2.25}, - {"matrix":[2,12], "x":14.75, "y":2.25}, - {"matrix":[2,13], "x":15.75, "y":2.25, "w":2.25}, - {"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.75, "y": 2.25}, + {"matrix": [2, 12], "x": 14.75, "y": 2.25}, + {"matrix": [2, 13], "x": 15.75, "y": 2.25, "w": 2.25}, + {"matrix": [2, 14], "x": 18.5, "y": 2.5}, - {"matrix":[3, 0], "x":0, "y":3.25, "w":2.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": 2.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/v8/ansi/rules.mk b/keyboards/keychron/v8/ansi/rules.mk index 6f738741e9..bdb97dbf1c 100644 --- a/keyboards/keychron/v8/ansi/rules.mk +++ b/keyboards/keychron/v8/ansi/rules.mk @@ -14,7 +14,6 @@ ENCODER_ENABLE = no # Enable Encoder ENCODER_MAP_ENABLE = no DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v8/ansi_encoder/info.json b/keyboards/keychron/v8/ansi_encoder/info.json index f6a9de655b..c2325070aa 100644 --- a/keyboards/keychron/v8/ansi_encoder/info.json +++ b/keyboards/keychron/v8/ansi_encoder/info.json @@ -8,6 +8,14 @@ "pid": "0x0381", "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": "A10", "pin_b": "B5"} @@ -18,79 +26,79 @@ "layouts": { "LAYOUT_ansi_69": { "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}, + {"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}, - {"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,13], "x":16.25, "y":1.25, "w":1.5}, - {"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, 13], "x": 16.25, "y": 1.25, "w": 1.5}, + {"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.75, "y":2.25}, - {"matrix":[2,12], "x":14.75, "y":2.25}, - {"matrix":[2,13], "x":15.75, "y":2.25, "w":2.25}, - {"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.75, "y": 2.25}, + {"matrix": [2, 12], "x": 14.75, "y": 2.25}, + {"matrix": [2, 13], "x": 15.75, "y": 2.25, "w": 2.25}, + {"matrix": [2, 14], "x": 18.5, "y": 2.5}, - {"matrix":[3, 0], "x":0, "y":3.25, "w":2.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": 2.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/v8/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/v8/ansi_encoder/keymaps/default/keymap.c index d1ea2f207d..a128a54a00 100644 --- a/keyboards/keychron/v8/ansi_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/v8/ansi_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/v8/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/v8/ansi_encoder/keymaps/keychron/keymap.c index 5af9838437..0058ebda38 100644 --- a/keyboards/keychron/v8/ansi_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/v8/ansi_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/v8/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/v8/ansi_encoder/keymaps/via/keymap.c index d1ea2f207d..a128a54a00 100644 --- a/keyboards/keychron/v8/ansi_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/v8/ansi_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/v8/ansi_encoder/rules.mk b/keyboards/keychron/v8/ansi_encoder/rules.mk index f2cbf4a660..d2bee999c8 100644 --- a/keyboards/keychron/v8/ansi_encoder/rules.mk +++ b/keyboards/keychron/v8/ansi_encoder/rules.mk @@ -14,7 +14,6 @@ ENCODER_ENABLE = yes # Enable Encoder ENCODER_MAP_ENABLE = no DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v8/config.h b/keyboards/keychron/v8/config.h index c5a3857f40..7c6076e199 100644 --- a/keyboards/keychron/v8/config.h +++ b/keyboards/keychron/v8/config.h @@ -16,13 +16,6 @@ #pragma once -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - -/* Key matrix pins */ -#define MATRIX_ROW_PINS { B4, B3, A15, A14, A13 } -#define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, A8, A9, H3 } - /* If uses PH3 with a stronger pull resistor then the following definition should be included */ // #define MATRIX_UNSELECT_DRIVE_HIGH diff --git a/keyboards/keychron/v8/iso/info.json b/keyboards/keychron/v8/iso/info.json index 22b363d072..585dcc979c 100644 --- a/keyboards/keychron/v8/iso/info.json +++ b/keyboards/keychron/v8/iso/info.json @@ -8,85 +8,93 @@ "pid": "0x0382", "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", "processor": "STM32L432", "bootloader": "stm32-dfu", "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, 6], "x":9.25, "y":2.25}, - {"matrix":[2, 7], "x":10.25, "y":2.25}, - {"matrix":[2, 8], "x":11.25, "y":2.25}, - {"matrix":[2, 9], "x":12.25, "y":2.25}, - {"matrix":[2,10], "x":13.5, "y":2.25}, - {"matrix":[2,11], "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, 6], "x": 9.25, "y": 2.25}, + {"matrix": [2, 7], "x": 10.25, "y": 2.25}, + {"matrix": [2, 8], "x": 11.25, "y": 2.25}, + {"matrix": [2, 9], "x": 12.25, "y": 2.25}, + {"matrix": [2, 10], "x": 13.5, "y": 2.25}, + {"matrix": [2, 11], "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/v8/iso/rules.mk b/keyboards/keychron/v8/iso/rules.mk index e306f3211e..fec3d8d15c 100644 --- a/keyboards/keychron/v8/iso/rules.mk +++ b/keyboards/keychron/v8/iso/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = no # Enable Encoder DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash diff --git a/keyboards/keychron/v8/iso_encoder/info.json b/keyboards/keychron/v8/iso_encoder/info.json index 2abaeda111..a0ddfcbeea 100644 --- a/keyboards/keychron/v8/iso_encoder/info.json +++ b/keyboards/keychron/v8/iso_encoder/info.json @@ -8,6 +8,14 @@ "pid": "0x0383", "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": "A10", "pin_b": "B5"} @@ -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, 6], "x":9.25, "y":2.25}, - {"matrix":[2, 7], "x":10.25, "y":2.25}, - {"matrix":[2, 8], "x":11.25, "y":2.25}, - {"matrix":[2, 9], "x":12.25, "y":2.25}, - {"matrix":[2,10], "x":13.5, "y":2.25}, - {"matrix":[2,11], "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, 6], "x": 9.25, "y": 2.25}, + {"matrix": [2, 7], "x": 10.25, "y": 2.25}, + {"matrix": [2, 8], "x": 11.25, "y": 2.25}, + {"matrix": [2, 9], "x": 12.25, "y": 2.25}, + {"matrix": [2, 10], "x": 13.5, "y": 2.25}, + {"matrix": [2, 11], "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/v8/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/v8/iso_encoder/keymaps/default/keymap.c index c7b37a025a..8d5e493e6a 100644 --- a/keyboards/keychron/v8/iso_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/v8/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/v8/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/v8/iso_encoder/keymaps/keychron/keymap.c index 6bbc52362d..fd39296536 100644 --- a/keyboards/keychron/v8/iso_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/v8/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/v8/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/v8/iso_encoder/keymaps/via/keymap.c index 1de6be16aa..7c6e4bb8a9 100644 --- a/keyboards/keychron/v8/iso_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/v8/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/v8/iso_encoder/rules.mk b/keyboards/keychron/v8/iso_encoder/rules.mk index f2cbf4a660..d2bee999c8 100644 --- a/keyboards/keychron/v8/iso_encoder/rules.mk +++ b/keyboards/keychron/v8/iso_encoder/rules.mk @@ -14,7 +14,6 @@ ENCODER_ENABLE = yes # Enable Encoder ENCODER_MAP_ENABLE = no DIP_SWITCH_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = embedded_flash |