diff options
| author | lokher <lokher@gmail.com> | 2023-07-10 15:46:20 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-10 15:46:20 +0800 |
| commit | 0e22694fe0973c1974f370f2b635fc1dbb2f858e (patch) | |
| tree | 8ae34d3bd24384b106c4a43495a33f6b33468405 | |
| parent | 9d185f8c6d9cff5b2f826329752ce1a99d5332bc (diff) | |
| parent | 8f02a197d63969d28e64b5380540315230e9beee (diff) | |
Merge pull request #140 from lalalademaxiya1/keychron-q3_pro
Update Q3 Pro
34 files changed, 2577 insertions, 261 deletions
diff --git a/keyboards/keychron/q3_pro/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q3_pro/ansi_encoder/ansi_encoder.c index 79a02ccfc5..e5685ac4b5 100644..100755 --- a/keyboards/keychron/q3_pro/ansi_encoder/ansi_encoder.c +++ b/keyboards/keychron/q3_pro/ansi_encoder/ansi_encoder.c @@ -25,7 +25,7 @@ const ckled2001_led g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { * | | G location * | | | B location * | | | | */ -// {0, I_1, G_1, H_1}, + {0, I_1, G_1, H_1}, {0, I_2, G_2, H_2}, {0, I_3, G_3, H_3}, {0, I_4, G_4, H_4}, @@ -38,7 +38,6 @@ const ckled2001_led g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { {0, I_11, G_11, H_11}, {0, I_12, G_12, H_12}, {0, I_13, G_13, H_13}, - {0, I_14, G_14, H_14}, {0, I_15, G_15, H_15}, {0, I_16, G_16, H_16}, {1, C_4, A_4, B_4}, // 16 @@ -61,7 +60,6 @@ const ckled2001_led g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { {0, C_16, A_16, B_16}, {1, C_2, A_2, B_2}, // 17 - {1, F_13, D_13, E_13}, {0, F_1, D_1, E_1}, {0, F_2, D_2, E_2}, {0, F_3, D_3, E_3}, @@ -80,7 +78,6 @@ const ckled2001_led g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { {0, F_16, D_16, E_16}, {1, C_1, A_1, B_1}, // 17 - {1, F_12, D_12, E_12}, {1, C_16, A_16, B_16}, {1, C_15, A_15, B_15}, {1, C_14, A_14, B_14}, @@ -95,7 +92,6 @@ const ckled2001_led g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { {1, C_5, A_5, B_5}, {1, C_3, A_3, B_3}, // 13 - {1, F_8, D_8, E_8}, {1, I_16, G_16, H_16}, {1, I_14, G_14, H_14}, {1, I_13, G_13, H_13}, @@ -110,7 +106,6 @@ const ckled2001_led g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { {1, I_3, G_3, H_3}, {1, I_1, G_1, H_1}, // 13 - {1, F_7, D_7, E_7}, {1, F_16, D_16, E_16}, {1, F_15, D_15, E_15}, {1, F_14, D_14, E_14}, @@ -123,36 +118,4 @@ const ckled2001_led g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { {1, F_1, D_1, E_1}, {1, I_2, G_2, H_2}, }; - -#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, __ }, - { 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, __, 64, __, __, __, 51 }, - { 66, __, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, __, 77, __, 78, __, 65 }, - { 80, 81, 82, __, __, __, 83, __, __, __, 84, 85, 86, 87, 88, 89, 90, 79 }, - }, - { - // LED Index to Physical Position - {21,0}, {44,0}, {56,0}, {68,0}, {79,0}, {96,0}, {108,0}, {120,0}, {131,0}, {149,0}, {160,0}, {172,0}, {183,0}, {201,0}, {212,0}, {224,0}, - {21,17}, {32,17}, {44,17}, {55,17}, {67,17}, {79,17}, {90,17}, {102,17}, {114,17}, {125,17}, {137,17}, {149,17}, {160,17}, {178,17}, {201,17}, {212,17}, {224,17}, - {0,23}, {23,29}, {38,29}, {50,29}, {61,29}, {73,29}, {85,29}, {96,29}, {108,29}, {119,29}, {131,29}, {143,29}, {154,29}, {166,29}, {180,29}, {201,29}, {212,29}, {224,29}, - {0,37}, {25,40}, {41,40}, {53,40}, {64,40}, {76,40}, {87,40}, {99,40}, {111,40}, {122,40}, {134,40}, {146,40}, {157,40}, {176,40}, - {0,50}, {28,52}, {47,52}, {58,52}, {70,52}, {82,52}, {93,52}, {105,52}, {116,52}, {128,52}, {140,52}, {151,52}, {173,52}, {212,52}, - {0,64}, {22,63}, {37,63}, {51,63}, {95,63}, {138,63}, {153,63}, {167,63}, {182,63}, {201,63}, {212,63}, {224,63}, - }, - { - // RGB LED Index to Flag - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 4, 8, 8, 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, - 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, - 4, 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, - 4, 1, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, - } -}; #endif diff --git a/keyboards/keychron/q3_pro/ansi_encoder/config.h b/keyboards/keychron/q3_pro/ansi_encoder/config.h index c111b5c6c0..68a07e6437 100644..100755 --- a/keyboards/keychron/q3_pro/ansi_encoder/config.h +++ b/keyboards/keychron/q3_pro/ansi_encoder/config.h @@ -17,37 +17,36 @@ #pragma once #ifdef RGB_MATRIX_ENABLE -/* RGB Matrix driver configuration */ +/* RGB Matrix Driver Configuration */ # define DRIVER_COUNT 2 - # define DRIVER_ADDR_1 0b1110111 # define DRIVER_ADDR_2 0b1110100 + +/* RGB Matrix Configuration */ # define DRIVER_1_LED_COUNT 47 -# define DRIVER_2_LED_COUNT 44 +# define DRIVER_2_LED_COUNT 40 # define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_COUNT + DRIVER_2_LED_COUNT) -/* Scan phase of led driver set as MSKPHASE_9CHANNEL(defined as 0x03 in CKLED2001.h) */ -# define PHASE_CHANNEL MSKPHASE_9CHANNEL - -/* Set LED driver current */ -# define CKLED2001_CURRENT_TUNE \ - { 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20 } - /* Set to infinit, which is use in USB mode by default */ # define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE /* Allow shutdown of led driver to save power */ # define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE + /* Turn off backlight on low brightness to save power */ # define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 32 -# define LOW_BAT_IND_INDEX 83 +/* Indication led */ +# define CAPS_LOCK_INDEX 50 +# define LOW_BAT_IND_INDEX 79 -/* 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 -#endif // RGB_MATRIX_ENABLE +# define RGB_MATRIX_KEYPRESSES + +/* Use the first 9 channels of led driver */ +# define PHASE_CHANNEL MSKPHASE_9CHANNEL + +/* Set LED driver current */ +# define CKLED2001_CURRENT_TUNE \ + { 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28 } +#endif diff --git a/keyboards/keychron/q3_pro/ansi_encoder/info.json b/keyboards/keychron/q3_pro/ansi_encoder/info.json index 50b57d199e..43c8d820e1 100644..100755 --- a/keyboards/keychron/q3_pro/ansi_encoder/info.json +++ b/keyboards/keychron/q3_pro/ansi_encoder/info.json @@ -1,114 +1,212 @@ { "usb": { - "pid": "0x0630", + "pid": "0x0633", "device_version": "1.0.0" }, + "encoder": { + "rotary": [ + {"pin_a": "A4", "pin_b": "A0"} + ] + }, + "matrix_pins": { + "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], + "rows": ["B5", "B4", "B3", "A15", "A14", "A13"], + "custom": true, + "custom_lite": true + }, "layouts": { - "LAYOUT_ansi_92": { + "LAYOUT_tkl_f13_ansi": { "layout": [ - {"matrix":[0,0], "x":0, "y":0.25}, + {"matrix":[0, 0], "x":0, "y":0}, + {"matrix":[0, 1], "x":1.25, "y":0}, + {"matrix":[0, 2], "x":2.25, "y":0}, + {"matrix":[0, 3], "x":3.25, "y":0}, + {"matrix":[0, 4], "x":4.25, "y":0}, + {"matrix":[0, 5], "x":5.5, "y":0}, + {"matrix":[0, 6], "x":6.5, "y":0}, + {"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,14], "x":15.75, "y":0}, + {"matrix":[0,15], "x":16.75, "y":0}, + {"matrix":[3,12], "x":17.75, "y":0}, - {"matrix":[0,1], "x":1.25, "y":0}, - {"matrix":[0,2], "x":3.25, "y":0}, - {"matrix":[0,3], "x":4.25, "y":0}, - {"matrix":[0,4], "x":5.25, "y":0}, - {"matrix":[0,5], "x":6.25, "y":0}, - {"matrix":[0,6], "x":7.75, "y":0}, - {"matrix":[0,7], "x":8.75, "y":0}, - {"matrix":[0,8], "x":9.75, "y":0}, - {"matrix":[0,9], "x":10.75, "y":0}, - {"matrix":[0,10], "x":12.25, "y":0}, - {"matrix":[0,11], "x":13.25, "y":0}, - {"matrix":[0,12], "x":14.25, "y":0}, - {"matrix":[0,13], "x":15.25, "y":0}, - {"matrix":[0,14], "x":16.5, "y":0}, - {"matrix":[0,15], "x":17.5, "y":0}, - {"matrix":[0,16], "x":18.5, "y":0}, + {"matrix":[1, 0], "x":0, "y":1.25}, + {"matrix":[1, 1], "x":1, "y":1.25}, + {"matrix":[1, 2], "x":2, "y":1.25}, + {"matrix":[1, 3], "x":3, "y":1.25}, + {"matrix":[1, 4], "x":4, "y":1.25}, + {"matrix":[1, 5], "x":5, "y":1.25}, + {"matrix":[1, 6], "x":6, "y":1.25}, + {"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.75, "y":1.25}, + {"matrix":[1,15], "x":16.75, "y":1.25}, + {"matrix":[3,14], "x":17.75, "y":1.25}, - {"matrix":[1,0], "x":1.25, "y":1.25}, - {"matrix":[1,1], "x":2.25, "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":7.25, "y":1.25}, - {"matrix":[1,7], "x":8.25, "y":1.25}, - {"matrix":[1,8], "x":9.25, "y":1.25}, - {"matrix":[1,9], "x":10.25, "y":1.25}, - {"matrix":[1,10], "x":11.25, "y":1.25}, - {"matrix":[1,11], "x":12.25, "y":1.25}, - {"matrix":[1,12], "x":13.25, "y":1.25}, - {"matrix":[1,13], "x":14.25, "y":1.25, "w":2}, - {"matrix":[1,14], "x":16.5, "y":1.25}, - {"matrix":[1,15], "x":17.5, "y":1.25}, - {"matrix":[1,16], "x":18.5, "y":1.25}, + {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, + {"matrix":[2, 1], "x":1.5, "y":2.25}, + {"matrix":[2, 2], "x":2.5, "y":2.25}, + {"matrix":[2, 3], "x":3.5, "y":2.25}, + {"matrix":[2, 4], "x":4.5, "y":2.25}, + {"matrix":[2, 5], "x":5.5, "y":2.25}, + {"matrix":[2, 6], "x":6.5, "y":2.25}, + {"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,14], "x":15.75, "y":2.25}, + {"matrix":[2,15], "x":16.75, "y":2.25}, + {"matrix":[3,15], "x":17.75, "y":2.25}, - {"matrix":[1,17], "x":0, "y":1.5}, + {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75}, + {"matrix":[3, 1], "x":1.75, "y":3.25}, + {"matrix":[3, 2], "x":2.75, "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":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":[2,0], "x":1.25, "y":2.25, "w":1.5}, - {"matrix":[2,1], "x":2.75, "y":2.25}, - {"matrix":[2,2], "x":3.75, "y":2.25}, - {"matrix":[2,3], "x":4.75, "y":2.25}, - {"matrix":[2,4], "x":5.75, "y":2.25}, - {"matrix":[2,5], "x":6.75, "y":2.25}, - {"matrix":[2,6], "x":7.75, "y":2.25}, - {"matrix":[2,7], "x":8.75, "y":2.25}, - {"matrix":[2,8], "x":9.75, "y":2.25}, - {"matrix":[2,9], "x":10.75, "y":2.25}, - {"matrix":[2,10], "x":11.75, "y":2.25}, - {"matrix":[2,11], "x":12.75, "y":2.25}, - {"matrix":[2,12], "x":13.75, "y":2.25}, - {"matrix":[2,13], "x":14.75, "y":2.25, "w":1.5}, - {"matrix":[2,14], "x":16.5, "y":2.25}, - {"matrix":[2,15], "x":17.5, "y":2.25}, - {"matrix":[2,16], "x":18.5, "y":2.25}, + {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25}, + {"matrix":[4, 2], "x":2.25, "y":4.25}, + {"matrix":[4, 3], "x":3.25, "y":4.25}, + {"matrix":[4, 4], "x":4.25, "y":4.25}, + {"matrix":[4, 5], "x":5.25, "y":4.25}, + {"matrix":[4, 6], "x":6.25, "y":4.25}, + {"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":2.75}, + {"matrix":[4,15], "x":16.75, "y":4.25}, - {"matrix":[3,17], "x":0, "y":2.75}, + {"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, "w":1.25}, + {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25}, + {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25}, + {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25}, + {"matrix":[5,14], "x":15.75, "y":5.25}, + {"matrix":[5,15], "x":16.75, "y":5.25}, + {"matrix":[4,14], "x":17.75, "y":5.25} + ] + } + }, + "rgb_matrix": { + "layout": [ + {"matrix":[0, 0], "flags":1, "x":0, "y":0}, + {"matrix":[0, 1], "flags":1, "x":16, "y":0}, + {"matrix":[0, 2], "flags":1, "x":29, "y":0}, + {"matrix":[0, 3], "flags":1, "x":42, "y":0}, + {"matrix":[0, 4], "flags":1, "x":55, "y":0}, + {"matrix":[0, 5], "flags":1, "x":71, "y":0}, + {"matrix":[0, 6], "flags":1, "x":84, "y":0}, + {"matrix":[0, 7], "flags":1, "x":97, "y":0}, + {"matrix":[0, 8], "flags":1, "x":110, "y":0}, + {"matrix":[0, 9], "flags":1, "x":126, "y":0}, + {"matrix":[0, 10], "flags":1, "x":139, "y":0}, + {"matrix":[0, 11], "flags":1, "x":152, "y":0}, + {"matrix":[0, 12], "flags":1, "x":165, "y":0}, + {"matrix":[0, 14], "flags":1, "x":198, "y":0}, + {"matrix":[0, 15], "flags":1, "x":211, "y":0}, + {"matrix":[3, 12], "flags":1, "x":224, "y":0}, - {"matrix":[3,0], "x":1.25, "y":3.25, "w":1.75}, - {"matrix":[3,1], "x":3, "y":3.25}, - {"matrix":[3,2], "x":4, "y":3.25}, - {"matrix":[3,3], "x":5, "y":3.25}, - {"matrix":[3,4], "x":6, "y":3.25}, - {"matrix":[3,5], "x":7, "y":3.25}, - {"matrix":[3,6], "x":8, "y":3.25}, - {"matrix":[3,7], "x":9, "y":3.25}, - {"matrix":[3,8], "x":10, "y":3.25}, - {"matrix":[3,9], "x":11, "y":3.25}, - {"matrix":[3,10], "x":12, "y":3.25}, - {"matrix":[3,11], "x":13, "y":3.25}, - {"matrix":[3,13], "x":14, "y":3.25, "w":2.25}, + {"matrix":[1, 0], "flags":1, "x":0, "y":15}, + {"matrix":[1, 1], "flags":8, "x":13, "y":15}, + {"matrix":[1, 2], "flags":8, "x":26, "y":15}, + {"matrix":[1, 3], "flags":8, "x":39, "y":15}, + {"matrix":[1, 4], "flags":4, "x":52, "y":15}, + {"matrix":[1, 5], "flags":4, "x":65, "y":15}, + {"matrix":[1, 6], "flags":4, "x":78, "y":15}, + {"matrix":[1, 7], "flags":4, "x":91, "y":15}, + {"matrix":[1, 8], "flags":4, "x":104, "y":15}, + {"matrix":[1, 9], "flags":4, "x":117, "y":15}, + {"matrix":[1, 10], "flags":4, "x":130, "y":15}, + {"matrix":[1, 11], "flags":4, "x":143, "y":15}, + {"matrix":[1, 12], "flags":4, "x":156, "y":15}, + {"matrix":[1, 13], "flags":1, "x":176, "y":15}, + {"matrix":[1, 14], "flags":1, "x":198, "y":15}, + {"matrix":[1, 15], "flags":1, "x":211, "y":15}, + {"matrix":[3, 14], "flags":1, "x":224, "y":15}, - {"matrix":[4,17], "x":0, "y":4}, + {"matrix":[2, 0], "flags":1, "x":3, "y":28}, + {"matrix":[2, 1], "flags":4, "x":19, "y":28}, + {"matrix":[2, 2], "flags":4, "x":32, "y":28}, + {"matrix":[2, 3], "flags":4, "x":45, "y":28}, + {"matrix":[2, 4], "flags":4, "x":59, "y":28}, + {"matrix":[2, 5], "flags":4, "x":72, "y":28}, + {"matrix":[2, 6], "flags":4, "x":85, "y":28}, + {"matrix":[2, 7], "flags":4, "x":98, "y":28}, + {"matrix":[2, 8], "flags":4, "x":111, "y":28}, + {"matrix":[2, 9], "flags":4, "x":124, "y":28}, + {"matrix":[2, 10], "flags":4, "x":137, "y":28}, + {"matrix":[2, 11], "flags":4, "x":150, "y":28}, + {"matrix":[2, 12], "flags":4, "x":163, "y":28}, + {"matrix":[2, 13], "flags":1, "x":179, "y":28}, + {"matrix":[2, 14], "flags":1, "x":198, "y":28}, + {"matrix":[2, 15], "flags":1, "x":211, "y":28}, + {"matrix":[3, 15], "flags":1, "x":224, "y":28}, - {"matrix":[4,0], "x":1.25, "y":4.25, "w":2.25}, - {"matrix":[4,2], "x":3.5, "y":4.25}, - {"matrix":[4,3], "x":4.5, "y":4.25}, - {"matrix":[4,4], "x":5.5, "y":4.25}, - {"matrix":[4,5], "x":6.5, "y":4.25}, - {"matrix":[4,6], "x":7.5, "y":4.25}, - {"matrix":[4,7], "x":8.5, "y":4.25}, - {"matrix":[4,8], "x":9.5, "y":4.25}, - {"matrix":[4,9], "x":10.5, "y":4.25}, - {"matrix":[4,10], "x":11.5, "y":4.25}, - {"matrix":[4,11], "x":12.5, "y":4.25}, - {"matrix":[4,13], "x":13.5, "y":4.25, "w":2.75}, - {"matrix":[4,15], "x":17.5, "y":4.25}, + {"matrix":[3, 0], "flags":8, "x":5, "y":40}, + {"matrix":[3, 1], "flags":4, "x":23, "y":40}, + {"matrix":[3, 2], "flags":4, "x":36, "y":40}, + {"matrix":[3, 3], "flags":4, "x":49, "y":40}, + {"matrix":[3, 4], "flags":4, "x":62, "y":40}, + {"matrix":[3, 5], "flags":4, "x":75, "y":40}, + {"matrix":[3, 6], "flags":4, "x":88, "y":40}, + {"matrix":[3, 7], "flags":4, "x":101, "y":40}, + {"matrix":[3, 8], "flags":4, "x":114, "y":40}, + {"matrix":[3, 9], "flags":4, "x":127, "y":40}, + {"matrix":[3, 10], "flags":4, "x":140, "y":40}, + {"matrix":[3, 11], "flags":4, "x":153, "y":40}, + {"matrix":[3, 13], "flags":1, "x":174, "y":40}, - {"matrix":[5,17], "x":0, "y":5.25}, + {"matrix":[4, 0], "flags":1, "x":8, "y":52}, + {"matrix":[4, 2], "flags":4, "x":29, "y":52}, + {"matrix":[4, 3], "flags":4, "x":42, "y":52}, + {"matrix":[4, 4], "flags":4, "x":55, "y":52}, + {"matrix":[4, 5], "flags":4, "x":68, "y":52}, + {"matrix":[4, 6], "flags":4, "x":81, "y":52}, + {"matrix":[4, 7], "flags":4, "x":94, "y":52}, + {"matrix":[4, 8], "flags":4, "x":107, "y":52}, + {"matrix":[4, 9], "flags":4, "x":120, "y":52}, + {"matrix":[4, 10], "flags":4, "x":140, "y":52}, + {"matrix":[4, 11], "flags":4, "x":153, "y":52}, + {"matrix":[4, 13], "flags":1, "x":171, "y":52}, + {"matrix":[4, 15], "flags":1, "x":211, "y":52}, - {"matrix":[5,0], "x":1.25, "y":5.25, "w":1.25}, - {"matrix":[5,1], "x":2.5, "y":5.25, "w":1.25}, - {"matrix":[5,2], "x":3.75, "y":5.25, "w":1.25}, - {"matrix":[5,6], "x":5, "y":5.25, "w":6.25}, - {"matrix":[5,10], "x":11.25, "y":5.25, "w":1.25}, - {"matrix":[5,11], "x":12.5, "y":5.25, "w":1.25}, - {"matrix":[5,12], "x":13.75, "y":5.25, "w":1.25}, - {"matrix":[5,13], "x":15, "y":5.25, "w":1.25}, - {"matrix":[5,14], "x":16.5, "y":5.25}, - {"matrix":[5,15], "x":17.5, "y":5.25}, - {"matrix":[5,16], "x":18.5, "y":5.25} - ] - } + {"matrix":[5, 0], "flags":1, "x":2, "y":64}, + {"matrix":[5, 1], "flags":1, "x":18, "y":64}, + {"matrix":[5, 2], "flags":1, "x":34, "y":64}, + {"matrix":[5, 6], "flags":4, "x":83, "y":64}, + {"matrix":[5, 10], "flags":1, "x":131, "y":64}, + {"matrix":[5, 11], "flags":1, "x":148, "y":64}, + {"matrix":[5, 12], "flags":1, "x":164, "y":64}, + {"matrix":[5, 13], "flags":1, "x":180, "y":64}, + {"matrix":[5, 14], "flags":1, "x":198, "y":64}, + {"matrix":[5, 15], "flags":1, "x":211, "y":64}, + {"matrix":[4, 14], "flags":1, "x":224, "y":64} + ] } } diff --git a/keyboards/keychron/q3_pro/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q3_pro/ansi_encoder/keymaps/default/keymap.c index 2a8a218ef7..61ef956bb1 100644..100755 --- a/keyboards/keychron/q3_pro/ansi_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/q3_pro/ansi_encoder/keymaps/default/keymap.c @@ -14,49 +14,48 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "q3_pro.h" #include QMK_KEYBOARD_H -// clang-format off enum layers{ MAC_BASE, MAC_FN, WIN_BASE, - WIN_FN + WIN_FN, }; +// clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [MAC_BASE] = LAYOUT_ansi_92( - KC_MUTE, KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_SIRI, RGB_MOD, - KC_GRV, 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_INS, KC_HOME, KC_PGUP, - _______, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, - _______, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - _______, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - _______, KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, KC_ROPT, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + [MAC_BASE] = LAYOUT_tkl_f13_ansi( + KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_MUTE, KC_SNAP, KC_SIRI, RGB_MOD, + KC_GRV, 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_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - [MAC_FN] = LAYOUT_ansi_92( - RGB_TOG, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, RGB_TOG, - _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + [MAC_FN] = LAYOUT_tkl_f13_ansi( + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, RGB_TOG, _______, _______, RGB_TOG, + _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), - [WIN_BASE] = LAYOUT_ansi_92( - KC_MUTE, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_CTANA, RGB_MOD, - KC_GRV, 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_INS, KC_HOME, KC_PGUP, - _______, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, - _______, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - _______, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - _______, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + [WIN_BASE] = LAYOUT_tkl_f13_ansi( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE, KC_PSCR, KC_CTANA, RGB_MOD, + KC_GRV, 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_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LCMD, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - [WIN_FN] = LAYOUT_ansi_92( - RGB_TOG, _______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_TOG, - _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _ |