From 7ca5fed13a1a1e06b1cfc999330c9cf0157a8316 Mon Sep 17 00:00:00 2001 From: lalalademaxiya1 <2831039915@qq.com> Date: Sat, 8 Jul 2023 15:02:02 +0800 Subject: Added q2 pro iso version --- .../keychron/q2_pro/ansi_encoder/ansi_encoder.c | 32 +-------- keyboards/keychron/q2_pro/ansi_encoder/config.h | 16 ++--- keyboards/keychron/q2_pro/ansi_encoder/info.json | 75 +++++++++++++++++++++- .../q2_pro/ansi_encoder/keymaps/default/keymap.c | 18 +++--- .../q2_pro/ansi_encoder/keymaps/via/keymap.c | 18 +++--- .../q2_pro/ansi_encoder/keymaps/via/rules.mk | 1 - 6 files changed, 99 insertions(+), 61 deletions(-) (limited to 'keyboards/keychron/q2_pro/ansi_encoder') diff --git a/keyboards/keychron/q2_pro/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q2_pro/ansi_encoder/ansi_encoder.c index ca92d5e5f1..9a04acfffd 100644 --- a/keyboards/keychron/q2_pro/ansi_encoder/ansi_encoder.c +++ b/keyboards/keychron/q2_pro/ansi_encoder/ansi_encoder.c @@ -38,7 +38,6 @@ const ckled2001_led g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { {0, C_5, A_5, B_5}, {0, C_4, A_4, B_4}, {0, C_3, A_3, B_3}, - {0, C_1, A_1, B_1}, {0, F_16, D_16, E_16}, {0, F_15, D_15, E_15}, @@ -94,35 +93,6 @@ const ckled2001_led g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { {1, F_4, D_4, E_4}, {1, F_3, D_3, E_3}, {1, F_2, D_2, E_2}, - {1, F_1, D_1, E_1} -}; - -#define __ NO_LED - -led_config_t g_led_config = { - { - // Key Matrix to LED Index - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, __, 14 }, - { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, __, 29 }, - { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, __, 42, __, 43 }, - { 44, __, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, __, 55, 56, __ }, - { 57, 58, 59, __, __, __, 60, __, __, __, 61, 62, 63, 64, 65, 66 } - }, - { - // LED Index to Physical Position - {0, 3}, {14, 3}, {29, 3}, {43, 3}, {58, 3}, {73, 3}, {87, 3}, {102, 3}, {117, 3}, {131, 3}, {146, 3}, {161, 3}, {175, 3}, {197, 3}, {223, 3}, - {3,17}, {21,17}, {36,17}, {51,17}, {65,17}, {80,17}, {95,17}, {109, 17}, {124, 17}, {139, 17}, {153, 17}, {168, 17}, {183, 17}, {201, 17}, {223, 17}, - {5,32}, {25,32}, {40,32}, {54,32}, {69,32}, {84,32}, {98,32}, {113, 32}, {128, 32}, {142, 32}, {157, 32}, {172, 32}, {195, 32}, {223, 32}, - {9,47}, {32,47}, {47,47}, {62,47}, {76,47}, {91,47}, {106, 47}, {120, 47}, {135, 47}, {150, 47}, {164, 47}, {185, 47}, {209, 47}, - {1,62}, {20,62}, {38,62}, {93,62}, {146, 62}, {161, 62}, {176, 62}, {194, 62}, {209, 62}, {223, 62} - }, - { - // RGB LED Index to Flag - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, - 1, 1, 1, 4, 1, 1, 1, 1, 1, 1 - } + {1, F_1, D_1, E_1}, }; #endif diff --git a/keyboards/keychron/q2_pro/ansi_encoder/config.h b/keyboards/keychron/q2_pro/ansi_encoder/config.h index 3fb1c48a04..ab43563dd4 100644 --- a/keyboards/keychron/q2_pro/ansi_encoder/config.h +++ b/keyboards/keychron/q2_pro/ansi_encoder/config.h @@ -24,7 +24,9 @@ # define DRIVER_COUNT 2 # define DRIVER_ADDR_1 0b1110111 # define DRIVER_ADDR_2 0b1110100 -# define DRIVER_1_LED_TOTAL 30 + +/* RGB Matrix Configuration */ +# define DRIVER_1_LED_TOTAL 29 # define DRIVER_2_LED_TOTAL 37 # define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) @@ -37,22 +39,20 @@ /* Turn off backllit if brightness value is low */ # define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48 -# define CAPS_LOCK_INDEX 30 - -# define LOW_BAT_IND_INDEX 60 +/* Indication led index */ +# define CAPS_LOCK_INDEX 29 +# define LOW_BAT_IND_INDEX 59 // RGB Matrix Animation modes. Explicitly enabled // For full list of effects, see: // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects - # define RGB_MATRIX_KEYPRESSES # define RGB_MATRIX_FRAMEBUFFER_EFFECTS -/* Scan phase of led driver set as MSKPHASE_9CHANNEL(defined as 0x03 in CKLED2001.h) */ +/* Use the first 9 channels of led driver */ # define PHASE_CHANNEL MSKPHASE_9CHANNEL /* Set LED driver current */ # define CKLED2001_CURRENT_TUNE \ - { 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30 } - + { 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40 } #endif diff --git a/keyboards/keychron/q2_pro/ansi_encoder/info.json b/keyboards/keychron/q2_pro/ansi_encoder/info.json index 98b0c077fb..0353c9eaed 100644 --- a/keyboards/keychron/q2_pro/ansi_encoder/info.json +++ b/keyboards/keychron/q2_pro/ansi_encoder/info.json @@ -20,7 +20,6 @@ {"matrix":[0,11], "x":11, "y":0.25}, {"matrix":[0,12], "x":12, "y":0.25}, {"matrix":[0,13], "x":13, "y":0.25, "w":2}, - {"matrix":[0,15], "x":15.25, "y":0}, {"matrix":[1,0], "x":0, "y":1.25, "w":1.5}, @@ -80,5 +79,79 @@ {"matrix":[4,15], "x":15.25, "y":4.5} ] } + }, + "rgb_matrix": { + "layout": [ + {"matrix":[0, 0], "flags":1, "x":0, "y":3}, + {"matrix":[0, 1], "flags":1, "x":14, "y":3}, + {"matrix":[0, 2], "flags":4, "x":29, "y":3}, + {"matrix":[0, 3], "flags":4, "x":43, "y":3}, + {"matrix":[0, 4], "flags":4, "x":58, "y":3}, + {"matrix":[0, 5], "flags":4, "x":73, "y":3}, + {"matrix":[0, 6], "flags":4, "x":87, "y":3}, + {"matrix":[0, 7], "flags":4, "x":102, "y":3}, + {"matrix":[0, 8], "flags":4, "x":117, "y":3}, + {"matrix":[0, 9], "flags":4, "x":131, "y":3}, + {"matrix":[0, 10], "flags":4, "x":146, "y":3}, + {"matrix":[0, 11], "flags":4, "x":161, "y":3}, + {"matrix":[0, 12], "flags":4, "x":175, "y":3}, + {"matrix":[0, 13], "flags":1, "x":197, "y":3}, + + {"matrix":[1, 0], "flags":1, "x":3, "y":17}, + {"matrix":[1, 1], "flags":8, "x":21, "y":17}, + {"matrix":[1, 2], "flags":8, "x":36, "y":17}, + {"matrix":[1, 3], "flags":8, "x":51, "y":17}, + {"matrix":[1, 4], "flags":4, "x":65, "y":17}, + {"matrix":[1, 5], "flags":4, "x":80, "y":17}, + {"matrix":[1, 6], "flags":4, "x":95, "y":17}, + {"matrix":[1, 7], "flags":4, "x":109, "y":17}, + {"matrix":[1, 8], "flags":4, "x":124, "y":17}, + {"matrix":[1, 9], "flags":4, "x":139, "y":17}, + {"matrix":[1, 10], "flags":4, "x":153, "y":17}, + {"matrix":[1, 11], "flags":4, "x":168, "y":17}, + {"matrix":[1, 12], "flags":4, "x":183, "y":17}, + {"matrix":[1, 13], "flags":1, "x":201, "y":17}, + {"matrix":[1, 15], "flags":1, "x":223, "y":17}, + + {"matrix":[2, 0], "flags":8, "x":5, "y":32}, + {"matrix":[2, 1], "flags":4, "x":25, "y":32}, + {"matrix":[2, 2], "flags":4, "x":40, "y":32}, + {"matrix":[2, 3], "flags":4, "x":54, "y":32}, + {"matrix":[2, 4], "flags":4, "x":69, "y":32}, + {"matrix":[2, 5], "flags":4, "x":84, "y":32}, + {"matrix":[2, 6], "flags":4, "x":98, "y":32}, + {"matrix":[2, 7], "flags":4, "x":113, "y":32}, + {"matrix":[2, 8], "flags":4, "x":128, "y":32}, + {"matrix":[2, 9], "flags":4, "x":142, "y":32}, + {"matrix":[2, 10], "flags":4, "x":157, "y":32}, + {"matrix":[2, 11], "flags":4, "x":172, "y":32}, + {"matrix":[2, 13], "flags":1, "x":195, "y":32}, + {"matrix":[2, 15], "flags":1, "x":223, "y":32}, + + {"matrix":[3, 0], "flags":1, "x":9, "y":47}, + {"matrix":[3, 2], "flags":4, "x":32, "y":47}, + {"matrix":[3, 3], "flags":4, "x":47, "y":47}, + {"matrix":[3, 4], "flags":4, "x":62, "y":47}, + {"matrix":[3, 5], "flags":4, "x":76, "y":47}, + {"matrix":[3, 6], "flags":4, "x":91, "y":47}, + {"matrix":[3, 7], "flags":4, "x":106, "y":47}, + {"matrix":[3, 8], "flags":4, "x":120, "y":47}, + {"matrix":[3, 9], "flags":4, "x":135, "y":47}, + {"matrix":[3, 10], "flags":4, "x":150, "y":47}, + {"matrix":[3, 11], "flags":4, "x":164, "y":47}, + {"matrix":[3, 13], "flags":1, "x":185, "y":47}, + {"matrix":[3, 14], "flags":1, "x":209, "y":49}, + + {"matrix":[4, 0], "flags":1, "x":1, "y":62}, + {"matrix":[4, 1], "flags":1, "x":20, "y":62}, + {"matrix":[4, 2], "flags":1, "x":38, "y":62}, + {"matrix":[4, 6], "flags":4, "x":93, "y":62}, + {"matrix":[4, 10], "flags":1, "x":146, "y":62}, + {"matrix":[4, 11], "flags":1, "x":161, "y":62}, + {"matrix":[4, 12], "flags":1, "x":176, "y":62}, + {"matrix":[4, 13], "flags":1, "x":194, "y":64}, + {"matrix":[4, 14], "flags":1, "x":209, "y":64}, + {"matrix":[4, 15], "flags":1, "x":223, "y":64} + ] } } diff --git a/keyboards/keychron/q2_pro/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q2_pro/ansi_encoder/keymaps/default/keymap.c index f8ad9414fb..30ccf36a45 100644 --- a/keyboards/keychron/q2_pro/ansi_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/q2_pro/ansi_encoder/keymaps/default/keymap.c @@ -16,15 +16,15 @@ #include QMK_KEYBOARD_H -// clang-format off -enum layers{ - MAC_BASE, - WIN_BASE, - MAC_FN1, - WIN_FN1, - FN2 +enum layers { + MAC_BASE, + WIN_BASE, + MAC_FN1, + WIN_FN1, + FN2, }; +// clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT_ansi_knob_67( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_MUTE, @@ -62,10 +62,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), }; -// clang-format on - #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN1] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, diff --git a/keyboards/keychron/q2_pro/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q2_pro/ansi_encoder/keymaps/via/keymap.c index 7dbd727462..2d94a88fe5 100644 --- a/keyboards/keychron/q2_pro/ansi_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/q2_pro/ansi_encoder/keymaps/via/keymap.c @@ -16,15 +16,15 @@ #include QMK_KEYBOARD_H -// clang-format off -enum layers{ - MAC_BASE, - WIN_BASE, - MAC_FN1, - WIN_FN1, - FN2 +enum layers { + MAC_BASE, + WIN_BASE, + MAC_FN1, + WIN_FN1, + FN2, }; +// clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [MAC_BASE] = LAYOUT_ansi_knob_67( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_MUTE, @@ -62,10 +62,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), }; -// clang-format on - #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [MAC_FN1] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, diff --git a/keyboards/keychron/q2_pro/ansi_encoder/keymaps/via/rules.mk b/keyboards/keychron/q2_pro/ansi_encoder/keymaps/via/rules.mk index b8562c8f4e..f1adcab005 100644 --- a/keyboards/keychron/q2_pro/ansi_encoder/keymaps/via/rules.mk +++ b/keyboards/keychron/q2_pro/ansi_encoder/keymaps/via/rules.mk @@ -1,3 +1,2 @@ VIA_ENABLE = yes ENCODER_MAP_ENABLE = yes -OPT_DEFS += -DDYNAMIC_KEYMAP_LAYER_COUNT=5 -- cgit v1.2.3