diff options
Diffstat (limited to 'keyboards/keychron/v1')
21 files changed, 205 insertions, 193 deletions
diff --git a/keyboards/keychron/v1/ansi/info.json b/keyboards/keychron/v1/ansi/info.json index d6d35f8474..e6326a9538 100644 --- a/keyboards/keychron/v1/ansi/info.json +++ b/keyboards/keychron/v1/ansi/info.json @@ -8,6 +8,9 @@ "pid": "0x0310", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,11 +26,11 @@ {"matrix":[0, 7], "x":7.5, "y":0}, {"matrix":[0, 8], "x":8.5, "y":0}, {"matrix":[0, 9], "x":9.75, "y":0}, - {"matrix":[0,10], "x":10.75, "y":0}, - {"matrix":[0,11], "x":11.75, "y":0}, - {"matrix":[0,12], "x":12.75, "y":0}, - {"matrix":[0,13], "x":14, "y":0}, - {"matrix":[0,15], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10.75, "y":0}, + {"matrix":[0, 11], "x":11.75, "y":0}, + {"matrix":[0, 12], "x":12.75, "y":0}, + {"matrix":[0, 13], "x":14, "y":0}, + {"matrix":[0, 15], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -39,11 +42,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,15], "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, 15], "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}, @@ -55,11 +58,11 @@ {"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,13], "x":13.5, "y":2.25, "w":1.5}, - {"matrix":[2,15], "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, 13], "x":13.5, "y":2.25, "w":1.5}, + {"matrix":[2, 15], "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}, @@ -71,10 +74,10 @@ {"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, "w":2.25}, - {"matrix":[3,15], "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, "w":2.25}, + {"matrix":[3, 15], "x":15.25, "y":3.25}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -85,21 +88,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":[4,14], "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":[4, 14], "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":[5,14], "x":14.25, "y":5.5}, - {"matrix":[5,15], "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":[5, 14], "x":14.25, "y":5.5}, + {"matrix":[5, 15], "x":15.25, "y":5.5} ] } } diff --git a/keyboards/keychron/v1/ansi/rules.mk b/keyboards/keychron/v1/ansi/rules.mk index 311ca648e1..f2dba218bf 100644 --- a/keyboards/keychron/v1/ansi/rules.mk +++ b/keyboards/keychron/v1/ansi/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output 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/v1/ansi_encoder/info.json b/keyboards/keychron/v1/ansi_encoder/info.json index af396f6bb6..303f1e6475 100644 --- a/keyboards/keychron/v1/ansi_encoder/info.json +++ b/keyboards/keychron/v1/ansi_encoder/info.json @@ -8,6 +8,9 @@ "pid": "0x0311", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "encoder": { "rotary": [ {"pin_a": "A10", "pin_b": "A8"} @@ -28,11 +31,11 @@ {"matrix":[0, 7], "x":7.5, "y":0}, {"matrix":[0, 8], "x":8.5, "y":0}, {"matrix":[0, 9], "x":9.75, "y":0}, - {"matrix":[0,10], "x":10.75, "y":0}, - {"matrix":[0,11], "x":11.75, "y":0}, - {"matrix":[0,12], "x":12.75, "y":0}, - {"matrix":[0,13], "x":14, "y":0}, - {"matrix":[0,15], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10.75, "y":0}, + {"matrix":[0, 11], "x":11.75, "y":0}, + {"matrix":[0, 12], "x":12.75, "y":0}, + {"matrix":[0, 13], "x":14, "y":0}, + {"matrix":[0, 15], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -44,11 +47,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,15], "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, 15], "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,11 +63,11 @@ {"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,13], "x":13.5, "y":2.25, "w":1.5}, - {"matrix":[2,15], "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, 13], "x":13.5, "y":2.25, "w":1.5}, + {"matrix":[2, 15], "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}, @@ -76,10 +79,10 @@ {"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, "w":2.25}, - {"matrix":[3,15], "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, "w":2.25}, + {"matrix":[3, 15], "x":15.25, "y":3.25}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -90,21 +93,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":[4,14], "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":[4, 14], "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":[5,14], "x":14.25, "y":5.5}, - {"matrix":[5,15], "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":[5, 14], "x":14.25, "y":5.5}, + {"matrix":[5, 15], "x":15.25, "y":5.5} ] } } diff --git a/keyboards/keychron/v1/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/v1/ansi_encoder/keymaps/default/keymap.c index 7f36fd988e..a5eed7de19 100644 --- a/keyboards/keychron/v1/ansi_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/v1/ansi_encoder/keymaps/default/keymap.c @@ -63,7 +63,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/v1/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/v1/ansi_encoder/keymaps/keychron/keymap.c index daa3d07512..f5e6247ca6 100644 --- a/keyboards/keychron/v1/ansi_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/v1/ansi_encoder/keymaps/keychron/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #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/v1/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/v1/ansi_encoder/keymaps/via/keymap.c index 282e530fff..2ff15e873d 100644 --- a/keyboards/keychron/v1/ansi_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/v1/ansi_encoder/keymaps/via/keymap.c @@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #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/v1/ansi_encoder/rules.mk b/keyboards/keychron/v1/ansi_encoder/rules.mk index ef55047753..5df3cbccaf 100644 --- a/keyboards/keychron/v1/ansi_encoder/rules.mk +++ b/keyboards/keychron/v1/ansi_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 diff --git a/keyboards/keychron/v1/iso/info.json b/keyboards/keychron/v1/iso/info.json index d9b11f5f55..4ebb8607f3 100644 --- a/keyboards/keychron/v1/iso/info.json +++ b/keyboards/keychron/v1/iso/info.json @@ -8,6 +8,9 @@ "pid": "0x0312", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,11 +26,11 @@ {"matrix":[0, 7], "x":7.5, "y":0}, {"matrix":[0, 8], "x":8.5, "y":0}, {"matrix":[0, 9], "x":9.75, "y":0}, - {"matrix":[0,10], "x":10.75, "y":0}, - {"matrix":[0,11], "x":11.75, "y":0}, - {"matrix":[0,12], "x":12.75, "y":0}, - {"matrix":[0,13], "x":14, "y":0}, - {"matrix":[0,15], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10.75, "y":0}, + {"matrix":[0, 11], "x":11.75, "y":0}, + {"matrix":[0, 12], "x":12.75, "y":0}, + {"matrix":[0, 13], "x":14, "y":0}, + {"matrix":[0, 15], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -39,11 +42,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,15], "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, 15], "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}, @@ -55,10 +58,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,15], "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, 15], "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}, @@ -70,11 +73,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,15], "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, 15], "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}, @@ -86,21 +89,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":[4,14], "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":[4, 14], "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":[5,14], "x":14.25, "y":5.5}, - {"matrix":[5,15], "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":[5, 14], "x":14.25, "y":5.5}, + {"matrix":[5, 15], "x":15.25, "y":5.5} ] } } diff --git a/keyboards/keychron/v1/iso/rules.mk b/keyboards/keychron/v1/iso/rules.mk index 311ca648e1..f2dba218bf 100644 --- a/keyboards/keychron/v1/iso/rules.mk +++ b/keyboards/keychron/v1/iso/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output 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/v1/iso_encoder/info.json b/keyboards/keychron/v1/iso_encoder/info.json index c08e7d4539..fcd2dbb793 100644 --- a/keyboards/keychron/v1/iso_encoder/info.json +++ b/keyboards/keychron/v1/iso_encoder/info.json @@ -8,6 +8,9 @@ "pid": "0x0313", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "encoder": { "rotary": [ {"pin_a": "A10", "pin_b": "A8"} @@ -28,11 +31,11 @@ {"matrix":[0, 7], "x":7.5, "y":0}, {"matrix":[0, 8], "x":8.5, "y":0}, {"matrix":[0, 9], "x":9.75, "y":0}, - {"matrix":[0,10], "x":10.75, "y":0}, - {"matrix":[0,11], "x":11.75, "y":0}, - {"matrix":[0,12], "x":12.75, "y":0}, - {"matrix":[0,13], "x":14, "y":0}, - {"matrix":[0,15], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10.75, "y":0}, + {"matrix":[0, 11], "x":11.75, "y":0}, + {"matrix":[0, 12], "x":12.75, "y":0}, + {"matrix":[0, 13], "x":14, "y":0}, + {"matrix":[0, 15], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -44,11 +47,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,15], "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, 15], "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 +63,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,15], "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, 15], "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 +78,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,15], "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, 15], "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 +94,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":[4,14], "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":[4, 14], "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":[5,14], "x":14.25, "y":5.5}, - {"matrix":[5,15], "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":[5, 14], "x":14.25, "y":5.5}, + {"matrix":[5, 15], "x":15.25, "y":5.5} ] } } diff --git a/keyboards/keychron/v1/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/v1/iso_encoder/keymaps/default/keymap.c index 91b784a074..2667e16d5e 100644 --- a/keyboards/keychron/v1/iso_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/v1/iso_encoder/keymaps/default/keymap.c @@ -63,7 +63,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/v1/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/v1/iso_encoder/keymaps/keychron/keymap.c index cf93ef4ce7..52e1a31654 100644 --- a/keyboards/keychron/v1/iso_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/v1/iso_encoder/keymaps/keychron/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #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/v1/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/v1/iso_encoder/keymaps/via/keymap.c index 91b784a074..2667e16d5e 100644 --- a/keyboards/keychron/v1/iso_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/v1/iso_encoder/keymaps/via/keymap.c @@ -63,7 +63,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/v1/iso_encoder/rules.mk b/keyboards/keychron/v1/iso_encoder/rules.mk index ef55047753..5df3cbccaf 100644 --- a/keyboards/keychron/v1/iso_encoder/rules.mk +++ b/keyboards/keychron/v1/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 diff --git a/keyboards/keychron/v1/jis/info.json b/keyboards/keychron/v1/jis/info.json index 8d06120f5d..efdb9664f1 100644 --- a/keyboards/keychron/v1/jis/info.json +++ b/keyboards/keychron/v1/jis/info.json @@ -8,6 +8,9 @@ "pid": "0x0314", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "processor": "STM32L432", "bootloader": "stm32-dfu", "layouts": { @@ -23,11 +26,11 @@ {"matrix":[0, 7], "x":7.5, "y":0}, {"matrix":[0, 8], "x":8.5, "y":0}, {"matrix":[0, 9], "x":9.75, "y":0}, - {"matrix":[0,10], "x":10.75, "y":0}, - {"matrix":[0,11], "x":11.75, "y":0}, - {"matrix":[0,12], "x":12.75, "y":0}, - {"matrix":[0,13], "x":14, "y":0}, - {"matrix":[0,15], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10.75, "y":0}, + {"matrix":[0, 11], "x":11.75, "y":0}, + {"matrix":[0, 12], "x":12.75, "y":0}, + {"matrix":[0, 13], "x":14, "y":0}, + {"matrix":[0, 15], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -39,12 +42,12 @@ {"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}, - {"matrix":[1,14], "x":14, "y":1.25}, - {"matrix":[1,15], "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}, + {"matrix":[1, 14], "x":14, "y":1.25}, + {"matrix":[1, 15], "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}, @@ -56,10 +59,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,15], "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, 15], "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}, @@ -71,11 +74,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,15], "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, 15], "x":15.25, "y":3.25}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -86,11 +89,11 @@ {"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,12], "x":12.25, "y":4.25}, - {"matrix":[4,13], "x":13.25, "y":4.25}, - {"matrix":[4,14], "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, 12], "x":12.25, "y":4.25}, + {"matrix":[4, 13], "x":13.25, "y":4.25}, + {"matrix":[4, 14], "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}, @@ -98,12 +101,12 @@ {"matrix":[5, 3], "x":3.5, "y":5.25}, {"matrix":[5, 6], "x":4.5, "y":5.25, "w":4.5}, {"matrix":[5, 9], "x":9, "y":5.25, "w":1.25}, - {"matrix":[5,10], "x":10.25, "y":5.25}, - {"matrix":[5,11], "x":11.25, "y":5.25}, - {"matrix":[5,12], "x":12.25, "y":5.25}, - {"matrix":[5,13], "x":13.25, "y":5.25}, - {"matrix":[5,14], "x":14.25, "y":5.25}, - {"matrix":[5,15], "x":15.25, "y":5.25} + {"matrix":[5, 10], "x":10.25, "y":5.25}, + {"matrix":[5, 11], "x":11.25, "y":5.25}, + {"matrix":[5, 12], "x":12.25, "y":5.25}, + {"matrix":[5, 13], "x":13.25, "y":5.25}, + {"matrix":[5, 14], "x":14.25, "y":5.25}, + {"matrix":[5, 15], "x":15.25, "y":5.25} ] } } diff --git a/keyboards/keychron/v1/jis/rules.mk b/keyboards/keychron/v1/jis/rules.mk index 311ca648e1..f2dba218bf 100644 --- a/keyboards/keychron/v1/jis/rules.mk +++ b/keyboards/keychron/v1/jis/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output 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/v1/jis_encoder/info.json b/keyboards/keychron/v1/jis_encoder/info.json index 7554498481..511d33f01e 100644 --- a/keyboards/keychron/v1/jis_encoder/info.json +++ b/keyboards/keychron/v1/jis_encoder/info.json @@ -8,6 +8,9 @@ "pid": "0x0315", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "CKLED2001" + }, "encoder": { "rotary": [ {"pin_a": "A10", "pin_b": "A8"} @@ -28,11 +31,11 @@ {"matrix":[0, 7], "x":7.5, "y":0}, {"matrix":[0, 8], "x":8.5, "y":0}, {"matrix":[0, 9], "x":9.75, "y":0}, - {"matrix":[0,10], "x":10.75, "y":0}, - {"matrix":[0,11], "x":11.75, "y":0}, - {"matrix":[0,12], "x":12.75, "y":0}, - {"matrix":[0,13], "x":14, "y":0}, - {"matrix":[0,15], "x":15.25, "y":0}, + {"matrix":[0, 10], "x":10.75, "y":0}, + {"matrix":[0, 11], "x":11.75, "y":0}, + {"matrix":[0, 12], "x":12.75, "y":0}, + {"matrix":[0, 13], "x":14, "y":0}, + {"matrix":[0, 15], "x":15.25, "y":0}, {"matrix":[1, 0], "x":0, "y":1.25}, {"matrix":[1, 1], "x":1, "y":1.25}, @@ -44,12 +47,12 @@ {"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}, - {"matrix":[1,14], "x":14, "y":1.25}, - {"matrix":[1,15], "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}, + {"matrix":[1, 14], "x":14, "y":1.25}, + {"matrix":[1, 15], "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}, @@ -61,10 +64,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,15], "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, 15], "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}, @@ -76,11 +79,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,15], "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, 15], "x":15.25, "y":3.25}, {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, {"matrix":[4, 2], "x":2.25, "y":4.25}, @@ -91,11 +94,11 @@ {"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,12], "x":12.25, "y":4.25}, - {"matrix":[4,13], "x":13.25, "y":4.25}, - {"matrix":[4,14], "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, 12], "x":12.25, "y":4.25}, + {"matrix":[4, 13], "x":13.25, "y":4.25}, + {"matrix":[4, 14], "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}, @@ -103,12 +106,12 @@ {"matrix":[5, 3], "x":3.5, "y":5.25}, {"matrix":[5, 6], "x":4.5, "y":5.25, "w":4.5}, {"matrix":[5, 9], "x":9, "y":5.25, "w":1.25}, - {"matrix":[5,10], "x":10.25, "y":5.25}, - {"matrix":[5,11], "x":11.25, "y":5.25}, - {"matrix":[5,12], "x":12.25, "y":5.25}, - {"matrix":[5,13], "x":13.25, "y":5.25}, - {"matrix":[5,14], "x":14.25, "y":5.25}, - {"matrix":[5,15], "x":15.25, "y":5.25} + {"matrix":[5, 10], "x":10.25, "y":5.25}, + {"matrix":[5, 11], "x":11.25, "y":5.25}, + {"matrix":[5, 12], "x":12.25, "y":5.25}, + {"matrix":[5, 13], "x":13.25, "y":5.25}, + {"matrix":[5, 14], "x":14.25, "y":5.25}, + {"matrix":[5, 15], "x":15.25, "y":5.25} ] } } diff --git a/keyboards/keychron/v1/jis_encoder/keymaps/default/keymap.c b/keyboards/keychron/v1/jis_encoder/keymaps/default/keymap.c index 5e93c2a6ba..05f0d38846 100644 --- a/keyboards/keychron/v1/jis_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/v1/jis_encoder/keymaps/default/keymap.c @@ -63,7 +63,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/v1/jis_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/v1/jis_encoder/keymaps/keychron/keymap.c index 927846ea8a..bef69ccea8 100644 --- a/keyboards/keychron/v1/jis_encoder/keymaps/keychron/keymap.c +++ b/keyboards/keychron/v1/jis_encoder/keymaps/keychron/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #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/v1/jis_encoder/keymaps/via/keymap.c b/keyboards/keychron/v1/jis_encoder/keymaps/via/keymap.c index 5e93c2a6ba..05f0d38846 100644 --- a/keyboards/keychron/v1/jis_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/v1/jis_encoder/keymaps/via/keymap.c @@ -63,7 +63,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/v1/jis_encoder/rules.mk b/keyboards/keychron/v1/jis_encoder/rules.mk index ef55047753..5df3cbccaf 100644 --- a/keyboards/keychron/v1/jis_encoder/rules.mk +++ b/keyboards/keychron/v1/jis_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 |