diff options
36 files changed, 2530 insertions, 207 deletions
diff --git a/keyboards/keychron/q3_pro/ansi_encoder/info.json b/keyboards/keychron/q3_pro/ansi_encoder/info.json deleted file mode 100644 index 50b57d199e..0000000000 --- a/keyboards/keychron/q3_pro/ansi_encoder/info.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "usb": { - "pid": "0x0630", - "device_version": "1.0.0" - }, - "layouts": { - "LAYOUT_ansi_92": { - "layout": [ - {"matrix":[0,0], "x":0, "y":0.25}, - - {"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":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":[1,17], "x":0, "y":1.5}, - - {"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":[3,17], "x":0, "y":2.75}, - - {"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":[4,17], "x":0, "y":4}, - - {"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":[5,17], "x":0, "y":5.25}, - - {"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} - ] - } - } -} diff --git a/keyboards/keychron/q3_pro/ansi_encoder/rules.mk b/keyboards/keychron/q3_pro/ansi_encoder/rules.mk deleted file mode 100644 index f886ea2e8e..0000000000 --- a/keyboards/keychron/q3_pro/ansi_encoder/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally blank
\ No newline at end of file diff --git a/keyboards/keychron/q3_pro/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q3_pro/ansi_encoder_v1/ansi_encoder_v1.c index 79a02ccfc5..08052a4316 100644 --- a/keyboards/keychron/q3_pro/ansi_encoder/ansi_encoder.c +++ b/keyboards/keychron/q3_pro/ansi_encoder_v1/ansi_encoder_v1.c @@ -25,7 +25,6 @@ const ckled2001_led g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { * | | G location * | | | B location * | | | | */ -// {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}, @@ -123,36 +122,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_v1/config.h index c111b5c6c0..371dcbb729 100644 --- a/keyboards/keychron/q3_pro/ansi_encoder/config.h +++ b/keyboards/keychron/q3_pro/ansi_encoder_v1/config.h @@ -17,16 +17,17 @@ #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 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) */ +/* Use the first 9 channels of led driver */ # define PHASE_CHANNEL MSKPHASE_9CHANNEL /* Set LED driver current */ @@ -38,6 +39,7 @@ /* 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 @@ -47,7 +49,10 @@ * 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 + +/* Specifed (0,1) which programmed as "ESC" key on this keyboard as bootmagic key */ +#define BOOTMAGIC_LITE_ROW 0 +#define BOOTMAGIC_LITE_COLUMN 1 diff --git a/keyboards/keychron/q3_pro/ansi_encoder_v1/info.json b/keyboards/keychron/q3_pro/ansi_encoder_v1/info.json new file mode 100644 index 0000000000..81d4640229 --- /dev/null +++ b/keyboards/keychron/q3_pro/ansi_encoder_v1/info.json @@ -0,0 +1,234 @@ +{ + "usb": { + "pid": "0x0630", + "device_version": "1.0.0" + }, + "matrix_size": { + "rows": 6, + "cols": 18 + }, + "matrix_pins": { + "rows": ["B5", "B4", "B3", "A15", "A14", "A13"], + "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], + "custom": true, + "custom_lite": true + }, + "diode_direction": "ROW2COL", + "encoder": { + "rotary": [ + { + "pin_a": "A10", + "pin_b": "A0", + "resolution": 4 + } + ] + }, + "layouts": { + "LAYOUT_ansi_92": { + "layout": [ + {"matrix":[0,0], "x":0, "y":0.25}, + + {"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":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":[1,17], "x":0, "y":1.5}, + + {"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":[3,17], "x":0, "y":2.75}, + + {"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":[4,17], "x":0, "y":4}, + + {"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":[5,17], "x":0, "y":5.25}, + + {"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} + ] + } + }, + "rgb_matrix": { + "layout": [ + {"matrix":[0, 1], "flags":1, "x":21, "y":0}, + {"matrix":[0, 2], "flags":1, "x":44, "y":0}, + {"matrix":[0, 3], "flags":1, "x":56, "y":0}, + {"matrix":[0, 4], "flags":1, "x":68, "y":0}, + {"matrix":[0, 5], "flags":1, "x":79, "y":0}, + {"matrix":[0, 6], "flags":1, "x":96, "y":0}, + {"matrix":[0, 7], "flags":1, "x":108, "y":0}, + {"matrix":[0, 8], "flags":1, "x":120, "y":0}, + {"matrix":[0, 9], "flags":1, "x":131, "y":0}, + {"matrix":[0, 10], "flags":1, "x":149, "y":0}, + {"matrix":[0, 11], "flags":1, "x":160, "y":0}, + {"matrix":[0, 12], "flags":1, "x":172, "y":0}, + {"matrix":[0, 13], "flags":1, "x":183, "y":0}, + {"matrix":[0, 14], "flags":1, "x":201, "y":0}, + {"matrix":[0, 15], "flags":1, "x":212, "y":0}, + {"matrix":[0, 16], "flags":1, "x":224, "y":0}, + + {"matrix":[1, 0], "flags":1, "x":21, "y":17}, + {"matrix":[1, 1], "flags":8, "x":32, "y":17}, + {"matrix":[1, 2], "flags":8, "x":44, "y":17}, + {"matrix":[1, 3], "flags":8, "x":55, "y":17}, + {"matrix":[1, 4], "flags":4, "x":67, "y":17}, + {"matrix":[1, 5], "flags":4, "x":79, "y":17}, + {"matrix":[1, 6], "flags":4, "x":90, "y":17}, + {"matrix":[1, 7], "flags":4, "x":102, "y":17}, + {"matrix":[1, 8], "flags":4, "x":114, "y":17}, + {"matrix":[1, 9], "flags":4, "x":125, "y":17}, + {"matrix":[1, 10], "flags":4, "x":137, "y":17}, + {"matrix":[1, 11], "flags":4, "x":149, "y":17}, + {"matrix":[1, 12], "flags":4, "x":160, "y":17}, + {"matrix":[1, 13], "flags":1, "x":178, "y":17}, + {"matrix":[1, 14], "flags":1, "x":201, "y":17}, + {"matrix":[1, 15], "flags":1, "x":212, "y":17}, + {"matrix":[1, 16], "flags":1, "x":224, "y":17}, + + {"matrix":[1, 17], "flags":4, "x":0, "y":23}, + {"matrix":[2, 0], "flags":1, "x":25, "y":29}, + {"matrix":[2, 1], "flags":4, "x":41, "y":29}, + {"matrix":[2, 2], "flags":4, "x":53, "y":29}, + {"matrix":[2, 3], "flags":4, "x":64, "y":29}, + {"matrix":[2, 4], "flags":4, "x":76, "y":29}, + {"matrix":[2, 5], "flags":4, "x":87, "y":29}, + {"matrix":[2, 6], "flags":4, "x":99, "y":29}, + {"matrix":[2, 7], "flags":4, "x":111, "y":29}, + {"matrix":[2, 8], "flags":4, "x":122, "y":29}, + {"matrix":[2, 9], "flags":4, "x":131, "y":29}, + {"matrix":[2, 10], "flags":4, "x":143, "y":29}, + {"matrix":[2, 11], "flags":4, "x":154, "y":29}, + {"matrix":[2, 12], "flags":4, "x":166, "y":29}, + {"matrix":[2, 13], "flags":1, "x":180, "y":29}, + {"matrix":[2, 14], "flags":1, "x":201, "y":29}, + {"matrix":[2, 15], "flags":1, "x":212, "y":29}, + {"matrix":[2, 16], "flags":1, "x":224, "y":29}, + + {"matrix":[3, 17], "flags":4, "x":0, "y":37}, + {"matrix":[3, 0], "flags":8, "x":25, "y":40}, + {"matrix":[3, 1], "flags":4, "x":41, "y":40}, + {"matrix":[3, 2], "flags":4, "x":53, "y":40}, + {"matrix":[3, 3], "flags":4, "x":64, "y":40}, + {"matrix":[3, 4], "flags":4, "x":76, "y":40}, + {"matrix":[3, 5], "flags":4, "x":87, "y":40}, + {"matrix":[3, 6], "flags":4, "x":99, "y":40}, + {"matrix":[3, 7], "flags":4, "x":111, "y":40}, + {"matrix":[3, 8], "flags":4, "x":122, "y":40}, + {"matrix":[3, 9], "flags":4, "x":134, "y":40}, + {"matrix":[3, 10], "flags":4, "x":146, "y":40}, + {"matrix":[3, 11], "flags":4, "x":157, "y":40}, + {"matrix":[3, 13], "flags":1, "x":176, "y":40}, + + {"matrix":[4, 17], "flags":4, "x":0, "y":50}, + {"matrix":[4, 0], "flags":1, "x":28, "y":52}, + {"matrix":[4, 2], "flags":4, "x":47, "y":52}, + {"matrix":[4, 3], "flags":4, "x":58, "y":52}, + {"matrix":[4, 4], "flags":4, "x":70, "y":52}, + {"matrix":[4, 5], "flags":4, "x":82, "y":52}, + {"matrix":[4, 6], "flags":4, "x":93, "y":52}, + {"matrix":[4, 7], "flags":4, "x":105, "y":52}, + {"matrix":[4, 8], "flags":4, "x":116, "y":52}, + {"matrix":[4, 9], "flags":4, "x":128, "y":52}, + {"matrix":[4, 10], "flags":4, "x":140, "y":52}, + {"matrix":[4, 11], "flags":4, "x":151, "y":52}, + {"matrix":[4, 13], "flags":1, "x":173, "y":52}, + {"matrix":[4, 15], "flags":1, "x":212, "y":52}, + + {"matrix":[5, 17], "flags":4, "x":0, "y":64}, + {"matrix":[5, 0], "flags":1, "x":22, "y":64}, + {"matrix":[5, 1], "flags":1, "x":37, "y":64}, + {"matrix":[5, 2], "flags":1, "x":51, "y":64}, + {"matrix":[5, 6], "flags":4, "x":95, "y":64}, + {"matrix":[5, 10], "flags":1, "x":138, "y":64}, + {"matrix":[5, 11], "flags":1, "x":153, "y":64}, + {"matrix":[5, 12], "flags":1, "x":167, "y":64}, + {"matrix":[5, 13], "flags":1, "x":182, "y":64}, + {"matrix":[5, 14], "flags":1, "x":201, "y":64}, + {"matrix":[5, 15], "flags":1, "x":212, "y":64}, + {"matrix":[5, 16], "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_v1/keymaps/default/keymap.c index 2a8a218ef7..307c1783c1 100644 --- a/keyboards/keychron/q3_pro/ansi_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/q3_pro/ansi_encoder_v1/keymaps/default/keymap.c @@ -14,7 +14,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "q3_pro.h" #include QMK_KEYBOARD_H // clang-format off @@ -22,7 +21,7 @@ enum layers{ MAC_BASE, MAC_FN, WIN_BASE, - WIN_FN + WIN_FN, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/keychron/q3_pro/ansi_encoder/keymaps/default/rules.mk b/keyboards/keychron/q3_pro/ansi_encoder_v1/keymaps/default/rules.mk index ee32568148..ee32568148 100644 --- a/keyboards/keychron/q3_pro/ansi_encoder/keymaps/default/rules.mk +++ b/keyboards/keychron/q3_pro/ansi_encoder_v1/keymaps/default/rules.mk diff --git a/keyboards/keychron/q3_pro/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q3_pro/ansi_encoder_v1/keymaps/via/keymap.c index 3193dfa5fa..534326a3b2 100644 --- a/keyboards/keychron/q3_pro/ansi_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/q3_pro/ansi_encoder_v1/keymaps/via/keymap.c @@ -14,17 +14,16 @@ * 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, diff --git a/keyboards/keychron/q3_pro/ansi_encoder/keymaps/via/rules.mk b/keyboards/keychron/q3_pro/ansi_encoder_v1/keymaps/via/rules.mk index f1adcab005..f1adcab005 100644 --- a/keyboards/keychron/q3_pro/ansi_encoder/keymaps/via/rules.mk +++ b/keyboards/keychron/q3_pro/ansi_encoder_v1/keymaps/via/rules.mk diff --git a/keyboards/keychron/q3_pro/ansi_encoder_v1/rules.mk b/keyboards/keychron/q3_pro/ansi_encoder_v1/rules.mk new file mode 100644 index 0000000000..d609c1b199 --- /dev/null +++ b/keyboards/keychron/q3_pro/ansi_encoder_v1/rules.mk @@ -0,0 +1 @@ +SRC += matrix_v1.c diff --git a/keyboards/keychron/q3_pro/ansi_encoder_v2/ansi_encoder_v2.c b/keyboards/keychron/q3_pro/ansi_encoder_v2/ansi_encoder_v2.c new file mode 100755 index 0000000000..e5685ac4b5 --- /dev/null +++ b/keyboards/keychron/q3_pro/ansi_encoder_v2/ansi_encoder_v2.c @@ -0,0 +1,121 @@ +/* Copyright 2023 @ Keychron (https://www.keychron.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "quantum.h" + +// clang-format off +#ifdef RGB_MATRIX_ENABLE +const ckled2001_led g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { +/* Refer to CKLED2001 manual for these locations + * driver + * | R location + * | | G location + * | | | B location + * | | | | */ + {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}, + {0, I_5, G_5, H_5}, + {0, I_6, G_6, H_6}, + {0, I_7, G_7, H_7}, + {0, I_8, G_8, H_8}, + {0, I_9, G_9, H_9}, + {0, I_10, G_10, H_10}, + {0, I_11, G_11, H_11}, + {0, I_12, G_12, H_12}, + {0, I_13, G_13, H_13}, + {0, I_15, G_15, H_15}, + {0, I_16, G_16, H_16}, + {1, C_4, A_4, B_4}, // 16 + + {0, C_1, A_1, B_1}, + {0, C_2, A_2, B_2}, + {0, C_3, A_3, B_3}, + {0, C_4, A_4, B_4}, + {0, C_5, A_5, B_5}, + {0, C_6, A_6, B_6}, + {0, C_7, A_7, B_7}, + {0, C_8, A_8, B_8}, + {0, C_9, A_9, B_9}, + {0, C_10, A_10, B_10}, + {0, C_11, A_11, B_11}, + {0, C_12, A_12, B_12}, + {0, C_13, A_13, B_13}, + {0, C_14, A_14, B_14}, + {0, C_15, A_15, B_15}, + {0, C_16, A_16, B_16}, + {1, C_2, A_2, B_2}, // 17 + + {0, F_1, D_1, E_1}, + {0, F_2, D_2, E_2}, + {0, F_3, D_3, E_3}, + {0, F_4, D_4, E_4}, + {0, F_5, D_5, E_5}, + {0, F_6, D_6, E_6}, + {0, F_7, D_7, E_7}, + {0, F_8, D_8, E_8}, + {0, F_9, D_9, E_9}, + {0, F_10, D_10, E_10}, + {0, F_11, D_11, E_11}, + {0, F_12, D_12, E_12}, + {0, F_13, D_13, E_13}, + {0, F_14, D_14, E_14}, + {0, F_15, D_15, E_15}, + {0, F_16, D_16, E_16}, + {1, C_1, A_1, B_1}, // 17 + + {1, C_16, A_16, B_16}, + {1, C_15, A_15, B_15}, + {1, C_14, A_14, B_14}, + {1, C_13, A_13, B_13}, + {1, C_12, A_12, B_12}, + {1, C_11, A_11, B_11}, + {1, C_10, A_10, B_10}, + {1, C_9, A_9, B_9}, + {1, C_8, A_8, B_8}, + {1, C_7, A_7, B_7}, + {1, C_6, A_6, B_6}, + {1, C_5, A_5, B_5}, + {1, C_3, A_3, B_3}, // 13 + + {1, I_16, G_16, H_16}, + {1, I_14, G_14, H_14}, + {1, I_13, G_13, H_13}, + {1, I_12, G_12, H_12}, + {1, I_11, G_11, H_11}, + {1, I_10, G_10, H_10}, + {1, I_9, G_9, H_9}, + {1, I_8, G_8, H_8}, + {1, I_7, G_7, H_7}, + {1, I_6, G_6, H_6}, + {1, I_5, G_5, H_5}, + {1, I_3, G_3, H_3}, + {1, I_1, G_1, H_1}, // 13 + + {1, F_16, D_16, E_16}, + {1, F_15, D_15, E_15}, + {1, F_14, D_14, E_14}, + {1, F_10, D_10, E_10}, + {1, F_6, D_6, E_6}, + {1, F_5, D_5, E_5}, + {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}, + {1, I_2, G_2, H_2}, +}; +#endif diff --git a/keyboards/keychron/q3_pro/ansi_encoder_v2/config.h b/keyboards/keychron/q3_pro/ansi_encoder_v2/config.h new file mode 100755 index 0000000000..4009f6fdb3 --- /dev/null +++ b/keyboards/keychron/q3_pro/ansi_encoder_v2/config.h @@ -0,0 +1,55 @@ +/* Copyright 2023 @ Keychron (https://www.keychron.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#pragma once + +#ifdef RGB_MATRIX_ENABLE +/* 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 40 +# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_COUNT + DRIVER_2_LED_COUNT) + +/* 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 + +/* 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_FRAMEBUFFER_EFFECTS +# 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_v2/info.json b/keyboards/keychron/q3_pro/ansi_encoder_v2/info.json new file mode 100755 index 0000000000..43c8d820e1 --- /dev/null +++ b/keyboards/keychron/q3_pro/ansi_encoder_v2/info.json @@ -0,0 +1,212 @@ +{ + "usb": { + "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_tkl_f13_ansi": { + "layout": [ + {"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":[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":[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":[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":[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":[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":[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":[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":[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":[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], "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_v2/keymaps/default/keymap.c b/keyboards/keychron/q3_pro/ansi_encoder_v2/keymaps/default/keymap.c new file mode 100755 index 0000000000..61ef956bb1 --- /dev/null +++ b/keyboards/keychron/q3_pro/ansi_encoder_v2/keymaps/default/keymap.c @@ -0,0 +1,68 @@ +/* Copyright 2023 @ Keychron (https://www.keychron.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include QMK_KEYBOARD_H + +enum layers{ + MAC_BASE, + MAC_FN, + WIN_BASE, + WIN_FN, +}; + +// clang-format off +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [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_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_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_tkl_f13_ansi( + _______, 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, _______, _______, 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, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [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)}, + [WIN_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, +}; +#endif // ENCODER_MAP_ENABLE diff --git a/keyboards/keychron/q3_pro/ansi_encoder_v2/keymaps/default/rules.mk b/keyboards/keychron/q3_pro/ansi_encoder_v2/keymaps/default/rules.mk new file mode 100755 index 0000000000..ee32568148 --- /dev/null +++ b/keyboards/keychron/q3_pro/ansi_encoder_v2/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/keychron/q3_pro/ansi_encoder_v2/keymaps/via/keymap.c b/keyboards/keychron/q3_pro/ansi_encoder_v2/keymaps/via/keymap.c new file mode 100755 index 0000000000..61ef956bb1 --- /dev/null +++ b/keyboards/keychron/q3_pro/ansi_encoder_v2/keymaps/via/keymap.c @@ -0,0 +1,68 @@ +/* Copyright 2023 @ Keychron (https://www.keychron.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include QMK_KEYBOARD_H + +enum layers{ + MAC_BASE, + MAC_FN, + WIN_BASE, + WIN_FN, +}; + +// clang-format off +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [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_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_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_tkl_f13_ansi( + _______, 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, _______, _______, 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, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [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)}, + [WIN_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, +}; +#endif // ENCODER_MAP_ENABLE diff --git a/keyboards/keychron/q3_pro/ansi_encoder_v2/keymaps/via/rules.mk b/keyboards/keychron/q3_pro/ansi_encoder_v2/keymaps/via/rules.mk new file mode 100755 index 0000000000..f1adcab005 --- /dev/null +++ b/keyboards/keychron/q3_pro/ansi_encoder_v2/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/keychron/q3_pro/ansi_encoder_v2/rules.mk b/keyboards/keychron/q3_pro/ansi_encoder_v2/rules.mk new file mode 100755 index 0000000000..fb73a108fa --- /dev/null +++ b/keyboards/keychron/q3_pro/ansi_encoder_v2/rules.mk @@ -0,0 +1 @@ +SRC += matrix_v2.c diff --git a/keyboards/keychron/q3_pro/config.h b/keyboards/keychron/q3_pro/config.h index dde2580aec..b74ec45f41 100644 --- a/keyboards/keychron/q3_pro/config.h +++ b/keyboards/keychron/q3_pro/config.h @@ -18,7 +18,6 @@ /* turn off effects when suspended */ #define RGB_DISABLE_WHEN_USB_SUSPENDED -#define LED_DISABLE_WHEN_USB_SUSPENDED /* DIP switch for Mac/win OS switch */ #define DIP_SWITCH_PINS \ @@ -83,9 +82,8 @@ #define FEE_DENSITY_BYTES FEE_PAGE_SIZE #define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047 -/* Specifed (0,1) which programmed as "ESC" key on this keyboard as bootmagic key */ -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 1 +/* Old default behavior of mod-taps */ +#define HOLD_ON_OTHER_KEY_PRESS /* Factory test keys */ #define FN_KEY1 MO(1) diff --git a/keyboards/keychron/q3_pro/info.json b/keyboards/keychron/q3_pro/info.json index d8b93e799d..bb30810cb4 100644 --- a/keyboards/keychron/q3_pro/info.json +++ b/keyboards/keychron/q3_pro/info.json @@ -14,26 +14,9 @@ "extrakey": true, "nkro": true, "dip_switch": true, - "raw": true, "encoder": true, - "encoder_map": true, - "rgb_matrix": true - }, - "diode_direction": "ROW2COL", - "matrix_size": { - "rows": 6, - "cols": 18 - }, - "matrix_pins": { - "rows": ["B5", "B4", "B3", "A15", "A14", "A13"], - "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], - "custom": true, - "custom_lite": true - }, - "encoder": { - "rotary": [ - {"pin_a": "A10", "pin_b": "A0", "resolution": 4} - ] + "rgb_matrix": true, + "raw": true }, "rgb_matrix": { "driver": "CKLED2001", diff --git a/keyboards/keychron/q3_pro/iso_encoder_v1/config.h b/keyboards/keychron/q3_pro/iso_encoder_v1/config.h new file mode 100755 index 0000000000..e3a0a831ef --- /dev/null +++ b/keyboards/keychron/q3_pro/iso_encoder_v1/config.h @@ -0,0 +1,58 @@ +/* Copyright 2023 @ Keychron (https://www.keychron.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#pragma once + +#ifdef RGB_MATRIX_ENABLE +/* 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 45 +# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_COUNT + DRIVER_2_LED_COUNT) + +/* Use the first 9 channels of led driver */ +# 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 + +/* Indication led */ +# define LOW_BAT_IND_INDEX 84 + +// 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_FRAMEBUFFER_EFFECTS +# define RGB_MATRIX_KEYPRESSES +#endif // RGB_MATRIX_ENABLE + +/* Specifed (0,1) which programmed as "ESC" key on this keyboard as bootmagic key */ +#define BOOTMAGIC_LITE_ROW 0 +#define BOOTMAGIC_LITE_COLUMN 1 diff --git a/keyboards/keychron/q3_pro/iso_encoder_v1/info.json b/keyboards/keychron/q3_pro/iso_encoder_v1/info.json new file mode 100755 index 0000000000..e9ed086e7f --- /dev/null +++ b/keyboards/keychron/q3_pro/iso_encoder_v1/info.json @@ -0,0 +1,231 @@ +{ + "usb": { + "pid": "0x0631", + "device_version": "1.0.0" + }, + "matrix_size": { + "rows": 6, + "cols": 18 + }, + "matrix_pins": { + "rows": ["B5", "B4", "B3", "A15", "A14", "A13"], + "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], + "custom": true, + "custom_lite": true + }, + "diode_direction": "ROW2COL", + "encoder": { + "rotary": [ + { + "pin_a": "A10", + "pin_b": "A0", + "resolution": 4 + } + ] + }, + "layouts": { + "LAYOUT_93_iso": { + "layout": [ + {"matrix":[0,0], "x":0, "y":0.25}, + {"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":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":[1,17], "x":0, "y":1.5}, + {"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,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":[3,17], "x":0, "y":2.75}, + {"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}, + {"matrix":[2,13], "x":15, "y":2.25, "w":1.25, "h":2}, + + {"matrix":[4,17], "x":0, "y":4}, + {"matrix":[4,0], "x":1.25, "y":4.25, "w":1.25}, + {"matrix":[4,1], "x":2.5, "y":4.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":[5,17], "x":0, "y":5.25}, + {"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} + ] + } + }, + "rgb_matrix": { + "layout": [ + {"matrix":[0, 1], "flags":1, "x":21, "y":0}, + {"matrix":[0, 2], "flags":1, "x":44, "y":0}, + {"matrix":[0, 3], "flags":1, "x":56, "y":0}, + {"matrix":[0, 4], "flags":1, "x":68, "y":0}, + {"matrix":[0, 5], "flags":1, "x":79, "y":0}, + {"matrix":[0, 6], "flags":1, "x":96, "y":0}, + {"matrix":[0, 7], "flags":1, "x":108, "y":0}, + {"matrix":[0, 8], "flags":1, "x":120, "y":0}, + {"matrix":[0, 9], "flags":1, "x":131, "y":0}, + {"matrix":[0, 10], "flags":1, "x":149, "y":0}, + {"matrix":[0, 11], "flags":1, "x":160, "y":0}, + {"matrix":[0, 12], "flags":1, "x":172, "y":0}, + {"matrix":[0, 13], "flags":1, "x":183, "y":0}, + {"matrix":[0, 14], "flags":1, "x":201, "y":0}, + {"matrix":[0, 15], "flags":1, "x":212, "y":0}, + {"matrix":[0, 16], "flags":1, "x":224, "y":0}, + + {"matrix":[1, 0], "flags":1, "x":21, "y":17}, + {"matrix":[1, 1], "flags":8, "x":32, "y":17}, + {"matrix":[1, 2], "flags":8, "x":44, "y":17}, + {"matrix":[1, 3], "flags":8, "x":55, "y":17}, + {"matrix":[1, 4], "flags":4, "x":67, "y":17}, + {"matrix":[1, 5], "flags":4, "x":79, "y":17}, + {"matrix":[1, 6], "flags":4, "x":90, "y":17}, + {"matrix":[1, 7], "flags":4, "x":102, "y":17}, + {"matrix":[1, 8], "flags":4, "x":114, "y":17}, + {"matrix":[1, 9], "flags":4, "x":125, "y":17}, + {"matrix":[1, 10], "flags":4, "x":137, "y":17}, + {"matrix":[1, 11], "flags":4, "x":149, "y":17}, + {"matrix":[1, 12], "flags":4, "x":160, "y":17}, + {"matrix":[1, 13], "flags":1, "x":178, "y":17}, + {"matrix":[1, 14], "flags":1, "x":201, "y":17}, + {"matrix":[1, 15], "flags":1, "x":212, "y":17}, + {"matrix":[1, 16], "flags":1, "x":224, "y":17}, + + {"matrix":[1, 17], "flags":4, "x":0, "y":23}, + {"matrix":[2, 0], "flags":1, "x":23, "y":29}, + {"matrix":[2, 1], "flags":4, "x":38, "y":29}, + {"matrix":[2, 2], "flags":4, "x":50, "y":29}, + {"matrix":[2, 3], "flags":4, "x":61, "y":29}, + {"matrix":[2, 4], "flags":4, "x":73, "y":29}, + {"matrix":[2, 5], "flags":4, "x":85, "y":29}, + {"matrix":[2, 6], "flags":4, "x":96, "y":29}, + {"matrix":[2, 7], "flags":4, "x":108, "y":29}, + {"matrix":[2, 8], "flags":4, "x":119, "y":29}, + {"matrix":[2, 9], "flags":4, "x":131, "y":29}, + {"matrix":[2, 10], "flags":4, "x":143, "y":29}, + {"matrix":[2, 11], "flags":4, "x":154, "y":29}, + {"matrix":[2, 12], "flags":4, "x":166, "y":29}, + {"matrix":[2, 14], "flags":1, "x":201, "y":29}, + {"matrix":[2, 15], "flags":1, "x":212, "y":29}, + {"matrix":[2, 16], "flags":1, "x":224, "y":29}, + + {"matrix":[3, 17], "flags":4, "x":0, "y":37}, + {"matrix":[3, 0], "flags":8, "x":25, "y":40}, + {"matrix":[3, 1], "flags":4, "x":41, "y":40}, + {"matrix":[3, 2], "flags":4, "x":53, "y":40}, + {"matrix":[3, 3], "flags":4, "x":64, "y":40}, + {"matrix":[3, 4], "flags":4, "x":76, "y":40}, + {"matrix":[3, 5], "flags":4, "x":87, "y":40}, + {"matrix":[3, 6], "flags":4, "x":99, "y":40}, + {"matrix":[3, 7], "flags":4, "x":111, "y":40}, + {"matrix":[3, 8], "flags":4, "x":122, "y":40}, + {"matrix":[3, 9], "flags":4, "x":134, "y":40}, + {"matrix":[3, 10], "flags":4, "x":146, "y":40}, + {"matrix":[3, 11], "flags":4, "x":157, "y":40}, + {"matrix":[3, 13], "flags":1, "x":176, "y":40}, + {"matrix":[2, 13], "flags":1, "x":185, "y":36}, + + {"matrix":[4, 17], "flags":4, "x":0, "y":50}, + {"matrix":[4, 0], "flags":1, "x":22, "y":52}, + {"matrix":[4, 1], "flags":1, "x":35, "y":52}, + {"matrix":[4, 2], "flags":4, "x":47, "y":52}, + {"matrix":[4, 3], "flags":4, "x":58, "y":52}, + {"matrix":[4, 4], "flags":4, "x":70, "y":52}, + {"matrix":[4, 5], "flags":4, "x":82, "y":52}, + {"matrix":[4, 6], "flags":4, "x":93, "y":52}, + {"matrix":[4, 7], "flags":4, "x":105, "y":52}, + {"matrix":[4, 8], "flags":4, "x":116, "y":52}, + {"matrix":[4, 9], "flags":4, "x":128, "y":52}, + {"matrix":[4, 10], "flags":4, "x":140, "y":52}, + {"matrix":[4, 11], "flags":4, "x":151, "y":52}, + {"matrix":[4, 13], "flags":1, "x":173, "y":52}, + {"matrix":[4, 15], "flags":1, "x":212, "y":52}, + + {"matrix":[5, 17], "flags":4, "x":0, "y":64}, + {"matrix":[5, 0], "flags":1, "x":22, "y":64}, + {"matrix":[5, 1], "flags":1, "x":37, "y":64}, + {"matrix":[5, 2], "flags":1, "x":51, "y":64}, + {"matrix":[5, 6], "flags":4, "x":95, "y":64}, + {"matrix":[5, 10], "flags":1, "x":138, "y":64}, + {"matrix":[5, 11], "flags":1, "x":153, "y":64}, + {"matrix":[5, 12], "flags":1, "x":167, "y":64}, + {"matrix":[5, 13], "flags":1, "x":182, "y":64}, + {"matrix":[5, 14], "flags":1, "x":201, "y":64}, + {"matrix":[5, 15], "flags":1, "x":212, "y":64}, + {"matrix":[5, 16], "flags":1, "x":224, "y":64} + ] + } +} diff --git a/keyboards/keychron/q3_pro/iso_encoder_v1/iso_encoder_v1.c b/keyboards/keychron/q3_pro/iso_encoder_v1/iso_encoder_v1.c new file mode 100755 index 0000000000..b3565b6685 --- /dev/null +++ b/keyboards/keychron/q3_pro/iso_encoder_v1/iso_encoder_v1.c @@ -0,0 +1,126 @@ +/* Copyright 2023 @ Keychron (https://www.keychron.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "quantum.h" + +// clang-format off +#ifdef RGB_MATRIX_ENABLE +const ckled2001_led g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { +/* Refer to CKLED2001 manual for these locations + * driver + * | R location + * | | G location + * | | | B location + * | | | | */ + {0, I_2, G_2, H_2}, + {0, I_3, G_3, H_3}, + {0, I_4, G_4, H_4}, + {0, I_5, G_5, H_5}, + {0, I_6, G_6, H_6}, + {0, I_7, G_7, H_7}, + {0, I_8, G_8, H_8}, + {0, I_9, G_9, H_9}, + {0, I_10, G_10, H_10}, + {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}, + + {0, C_1, A_1, B_1}, + {0, C_2, A_2, B_2}, + {0, C_3, A_3, B_3}, + {0, C_4, A_4, B_4}, + {0, C_5, A_5, B_5}, + {0, C_6, A_6, B_6}, + {0, C_7, A_7, B_7}, + {0, C_8, A_8, B_8}, + {0, C_9, A_9, B_9}, + {0, C_10, A_10, B_10}, + {0, C_11, A_11, B_11}, + {0, C_12, A_12, B_12}, + {0, C_13, A_13, B_13}, + {0, C_14, A_14, B_14}, + {0, C_15, A_15, B_15}, + {0, C_16, A_16, B_16}, + {1, C_2, A_2, B_2}, + + {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}, + {0, F_4, D_4, E_4}, + {0, F_5, D_5, E_5}, + {0, F_6, D_6, E_6}, + {0, F_7, D_7, E_7}, + {0, F_8, D_8, E_8}, + {0, F_9, D_9, E_9}, + {0, F_10, D_10, E_10}, + {0, F_11, D_11, E_11}, + {0, F_12, D_12, E_12}, + {0, F_13, D_13, E_13}, + {0, F_15, D_15, E_15}, + {0, F_16, D_16, E_16}, + {1, C_1, A_1, B_1}, + + {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}, + {1, C_13, A_13, B_13}, + {1, C_12, A_12, B_12}, + {1, C_11, A_11, B_11}, + {1, C_10, A_10, B_10}, + {1, C_9, A_9, B_9}, + {1, C_8, A_8, B_8}, + {1, C_7, A_7, B_7}, + {1, C_6, A_6, B_6}, + {1, C_5, A_5, B_5}, + {1, C_3, A_3, B_3}, + {0, F_14, D_14, E_14}, // Enter + + {1, F_8, D_8, E_8}, + {1, I_16, G_16, H_16}, + {1, I_15, G_15, H_15}, + {1, I_14, G_14, H_14}, + {1, I_13, G_13, H_13}, + {1, I_12, G_12, H_12}, + {1, I_11, G_11, H_11}, + {1, I_10, G_10, H_10}, + {1, I_9, G_9, H_9}, + {1, I_8, G_8, H_8}, + {1, I_7, G_7, H_7}, + {1, I_6, G_6, H_6}, + {1, I_5, G_5, H_5}, + {1, I_3, G_3, H_3}, + {1, I_1, G_1, H_1}, + + {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}, + {1, F_10, D_10, E_10}, + {1, F_6, D_6, E_6}, + {1, F_5, D_5, E_5}, + {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}, + {1, I_2, G_2, H_2}, +}; +#endif diff --git a/keyboards/keychron/q3_pro/iso_encoder_v1/keymaps/default/keymap.c b/keyboards/keychron/q3_pro/iso_encoder_v1/keymaps/default/keymap.c new file mode 100755 index 0000000000..b1e903563a --- /dev/null +++ b/keyboards/keychron/q3_pro/iso_encoder_v1/keymaps/default/keymap.c @@ -0,0 +1,68 @@ +/* Copyright 2023 @ Keychron (https://www.keychron.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include QMK_KEYBOARD_H + +// clang-format off +enum layers{ + MAC_BASE, + MAC_FN, + WIN_BASE, + WIN_FN, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [MAC_BASE] = LAYOUT_93_iso( + KC_MUTE, KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LNPD, 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_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_NUHS, KC_ENT, + _______, KC_LSFT, KC_NUBS, 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_FN] = LAYOUT_93_iso( + 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, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + + [WIN_BASE] = LAYOUT_93_iso( + 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_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_NUHS, KC_ENT, + _______, KC_LSFT, KC_NUBS, 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_FN] = LAYOUT_93_iso( + 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, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, 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, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [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)}, + [WIN_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, +}; +#endif // ENCODER_MAP_ENABLE diff --git a/keyboards/keychron/q3_pro/iso_encoder_v1/keymaps/default/rules.mk b/keyboards/keychron/q3_pro/iso_encoder_v1/keymaps/default/rules.mk new file mode 100755 index 0000000000..ee32568148 --- /dev/null +++ b/keyboards/keychron/q3_pro/iso_encoder_v1/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/keychron/q3_pro/iso_encoder_v1/keymaps/via/keymap.c b/keyboards/keychron/q3_pro/iso_encoder_v1/keymaps/via/keymap.c new file mode 100755 index 0000000000..5d8e767fcb --- /dev/null +++ b/keyboards/keychron/q3_pro/iso_encoder_v1/keymaps/via/keymap.c @@ -0,0 +1,68 @@ +/* Copyright 2023 @ Keychron (https://www.keychron.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include QMK_KEYBOARD_H + +// clang-format off +enum layers{ + MAC_BASE, + MAC_FN, + WIN_BASE, + WIN_FN, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [MAC_BASE] = LAYOUT_93_iso( + 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, + MC_1, 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_DEL, KC_END, KC_PGDN, + MC_2, 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_NUHS, KC_ENT, + MC_3, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + MC_4, 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_93_iso( + 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, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + + [WIN_BASE] = LAYOUT_93_iso( + 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, + MC_1, 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_DEL, KC_END, KC_PGDN, + MC_2, 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_NUHS, KC_ENT, + MC_3, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + MC_4, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [WIN_FN] = LAYOUT_93_iso( + 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, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, 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, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [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)}, + [WIN_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, +}; +#endif // ENCODER_MAP_ENABLE diff --git a/keyboards/keychron/q3_pro/iso_encoder_v1/keymaps/via/rules.mk b/keyboards/keychron/q3_pro/iso_encoder_v1/keymaps/via/rules.mk new file mode 100755 index 0000000000..f1adcab005 --- /dev/null +++ b/keyboards/keychron/q3_pro/iso_encoder_v1/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/keychron/q3_pro/iso_encoder_v1/rules.mk b/keyboards/keychron/q3_pro/iso_encoder_v1/rules.mk new file mode 100755 index 0000000000..d609c1b199 --- /dev/null +++ b/keyboards/keychron/q3_pro/iso_encoder_v1/rules.mk @@ -0,0 +1 @@ +SRC += matrix_v1.c diff --git a/keyboards/keychron/q3_pro/matrix.c b/keyboards/keychron/q3_pro/matrix_v1.c index f9d71e31a0..cdaa1ec0a6 100644 --- a/keyboards/keychron/q3_pro/matrix.c +++ b/keyboards/keychron/q3_pro/matrix_v1.c @@ -243,8 +243,7 @@ void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) if (!select_col(current_col)) { // select col return; // skip NO_PIN col } - - HC595_delay(100); + HC595_delay(200); // For each row... for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) { @@ -260,7 +259,7 @@ void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) } unselect_col(current_col); - HC595_delay(100); + HC595_delay(200); } void matrix_init_custom(void) { diff --git a/keyboards/keychron/q3_pro/matrix_v2.c b/keyboards/keychron/q3_pro/matrix_v2.c new file mode 100755 index 0000000000..06c9baec3f --- /dev/null +++ b/keyboards/keychron/q3_pro/matrix_v2.c @@ -0,0 +1,190 @@ +/* Copyright 2023 @ Keychron (https://www.keychron.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "quantum.h" + +#define HC595_STCP B0 +#define HC595_SHCP A1 +#define HC595_DS A7 + +#define DIRECT_COL_NUM 0 + +pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; +pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; + +static inline uint8_t readMatrixPin(pin_t pin) { + if (pin != NO_PIN) { + return readPin(pin); + } else { + return 1; + } +} + +static inline void setPinOutput_writeLow(pin_t pin) { + setPinOutput(pin); + writePinLow(pin); +} + +static inline void setPinOutput_writeHigh(pin_t pin) { + setPinOutput(pin); + writePinHigh(pin); +} + +static inline void HC595_delay(uint16_t n) { + while (n-- > 0) { + asm volatile("nop" ::: "memory"); + } +} + +static void HC595_output(uint16_t data) { + uint8_t n = 1; + uint8_t i; + + for (i = 1; i < (MATRIX_COLS - DIRECT_COL_NUM); i++) { + writePinLow(HC595_SHCP); + if (data & 0x1) { + writePinHigh(HC595_DS); + } else { + writePinLow(HC595_DS); + } + HC595_delay(n); + writePinHigh(HC595_SHCP); + HC595_delay(n); + + data = data >> 1; + } + writePinLow(HC595_STCP); + HC595_delay(n); + writePinHigh(HC595_STCP); +} + +static void HC595_output_bit(uint16_t data) { + uint8_t n = 1; + + writePinLow(HC595_SHCP); + if (data & 0x1) { + writePinHigh(HC595_DS); + } else { + writePinLow(HC595_DS); + } + HC595_delay(n); + + writePinHigh(HC595_SHCP); + HC595_delay(n); + + writePinLow(HC595_STCP); + HC595_delay(n); + writePinHigh(HC595_STCP); +} + +static void select_col(uint8_t col) { + if (col < DIRECT_COL_NUM) { + setPinOutput_writeLow(col_pins[col]); + } else { + if (col == DIRECT_COL_NUM) { + HC595_output_bit(0x00); + } + } +} + +static void unselect_col(uint8_t col) { + if (col < DIRECT_COL_NUM) { +#ifdef MATRIX_UNSELECT_DRIVE_HIGH + setPinOutput_writeHigh(col_pins[col]); +#else + setPinInputHigh(col_pins[col]); +#endif + } else { + HC595_output_bit(0x01); + } +} + +static void unselect_cols(void) { + for (uint8_t x = 0; x < MATRIX_COLS; x++) { + if (x < DIRECT_COL_NUM) { +#ifdef MATRIX_UNSELECT_DRIVE_HIGH + setPinOutput_writeHigh(col_pins[x]); +#else + setPinInputHigh(col_pins[x]); +#endif + } else { + if (x == DIRECT_COL_NUM) HC595_output(0xFFFF); + break; + } + } +} + +void select_all_cols(void) { + for (uint8_t x = 0; x < MATRIX_COLS; x++) { + if (x < DIRECT_COL_NUM) { + setPinOutput_writeLow(col_pins[x]); + } else { + if (x == DIRECT_COL_NUM) HC595_output(0x0000); + break; + } + } +} + +static void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col, matrix_row_t row_shifter) { + // Select col + select_col(current_col); + HC595_delay(200); + + // For each row... + for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) { + // Check row pin state + if (readMatrixPin(row_pins[row_index]) == 0) { + // Pin LO, set col bit + current_matrix[row_index] |= row_shifter; + } else { + // Pin HI, clear col bit + current_matrix[row_index] &= ~row_shifter; + } + } + + // Unselect col + unselect_col(current_col); + HC595_delay(200); // wait for all Row signals to go HIGH +} + +void matrix_init_custom(void) { + setPinOutput(HC595_DS); + setPinOutput(HC595_STCP); + setPinOutput(HC595_SHCP); + + for (uint8_t x = 0; x < MATRIX_ROWS; x++) { + if (row_pins[x] != NO_PIN) { + setPinInputHigh(row_pins[x]); + } + } + + unselect_cols(); +} + +bool matrix_scan_custom(matrix_row_t current_matrix[]) { + matrix_row_t curr_matrix[MATRIX_ROWS] = {0}; + + // Set col, read rows + matrix_row_t row_shifter = MATRIX_ROW_SHIFTER; + for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++, row_shifter <<= 1) { + matrix_read_rows_on_col(curr_matrix, current_col, row_shifter); + } + + bool changed = memcmp(current_matrix, curr_matrix, sizeof(curr_matrix)) != 0; + if (changed) memcpy(current_matrix, curr_matrix, sizeof(curr_matrix)); + + return changed; +} diff --git a/keyboards/keychron/q3_pro/q3_pro.c b/keyboards/keychron/q3_pro/q3_pro.c index 750f539790..6c47334e72 100644 --- a/keyboards/keychron/q3_pro/q3_pro.c +++ b/keyboards/keychron/q3_pro/q3_pro.c @@ -30,13 +30,19 @@ # include "factory_test.h" #endif +#ifdef BAT_LOW_LED_PIN +static uint32_t power_on_indicator_timer_buffer; +# define POWER_ON_LED_DURATION 3000 +#endif + typedef struct PACKED { uint8_t len; uint8_t keycode[3]; } key_combination_t; -static uint32_t siri_timer_buffer = 0; -static uint8_t mac_keycode[4] = {KC_LOPT, KC_ROPT, KC_LCMD, KC_RCMD}; +static uint32_t factory_timer_buffer = 0; +static uint32_t siri_timer_buffer = 0; +static uint8_t mac_keycode[4] = {KC_LOPT, KC_ROPT, KC_LCMD, KC_RCMD}; key_combination_t key_comb_list[4] = { {2, {KC_LWIN, KC_TAB}}, // Task (win) @@ -132,10 +138,9 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { return true; } -#ifdef KC_BLUETOOTH_ENABLE -static void encoder0_pad_cb(void *param) { - (void)param; - encoder_inerrupt_read(0); +#if defined(KC_BLUETOOTH_ENABLE) && defined(ENCODER_ENABLE) +static void encoder_pad_cb(void *param) { + encoder_inerrupt_read((uint32_t)param & 0XFF); } #endif @@ -144,7 +149,8 @@ void keyboard_post_init_kb(void) { #ifdef KC_BLUETOOTH_ENABLE /* Currently we don't use this reset pin */ - palSetLineMode(CKBT51_RESET_PIN, PAL_MODE_UNCONNECTED); + palSetLineMode(CKBT51_RESET_PIN, PAL_MODE_OUTPUT_PUSHPULL); + palWriteLine(CKBT51_RESET_PIN, PAL_HIGH); /* IMPORTANT: DO NOT enable internal pull-up resistor * as there is an external pull-down resistor. @@ -154,20 +160,37 @@ void keyboard_post_init_kb(void) { ckbt51_init(false); bluetooth_init(); +# ifdef ENCODER_ENABLE pin_t encoders_pad_a[NUM_ENCODERS] = ENCODERS_PAD_A; pin_t encoders_pad_b[NUM_ENCODERS] = ENCODERS_PAD_B; - for (uint8_t i = 0; i < NUM_ENCODERS; i++) { + for (uint32_t i = 0; i < NUM_ENCODERS; i++) { palEnableLineEvent(encoders_pad_a[i], PAL_EVENT_MODE_BOTH_EDGES); palEnableLineEvent(encoders_pad_b[i], PAL_EVENT_MODE_BOTH_EDGES); - palSetLineCallback(encoders_pad_a[i], encoder0_pad_cb, NULL); - palSetLineCallback(encoders_pad_b[i], encoder0_pad_cb, NULL); + palSetLineCallback(encoders_pad_a[i], encoder_pad_cb, (void *)i); + palSetLineCallback(encoders_pad_b[i], encoder_pad_cb, (void *)i); } +# endif +#endif + +#ifdef BAT_LOW_LED_PIN + power_on_indicator_timer_buffer = sync_timer_read32() | 1; + writePin(BAT_LOW_LED_PIN, BAT_LOW_LED_PIN_ON_STATE); #endif keyboard_post_init_user(); } void matrix_scan_kb(void) { + if (factory_timer_buffer && timer_elapsed32(factory_timer_buffer) > 2000) { + factory_timer_buffer = 0; + if (bt_factory_reset) { + bt_factory_reset = false; + palWriteLine(CKBT51_RESET_PIN, PAL_LOW); + wait_ms(5); + palWriteLine(CKBT51_RESET_PIN, PAL_HIGH); + } + } + if (siri_timer_buffer && sync_timer_elapsed32(siri_timer_buffer) > 500) { siri_timer_buffer = 0; unregister_code(KC_LGUI); @@ -184,7 +207,6 @@ void matrix_scan_kb(void) { #ifdef KC_BLUETOOTH_ENABLE static void ckbt51_param_init(void) { /* Set bluetooth device name */ - // ckbt51_set_local_name(STR(PRODUCT)); ckbt51_set_local_name(PRODUCT); /* Set bluetooth parameters */ module_param_t param = {.event_mode = 0x02, @@ -201,8 +223,8 @@ static void ckbt51_param_init(void) { void bluetooth_enter_disconnected_kb(uint8_t host_idx) { if (bt_factory_reset) { - bt_factory_reset = false; ckbt51_param_init(); + factory_timer_buffer = timer_read32(); } /* CKBT51 bluetooth module boot time is slower, it enters disconnected after boot, so we place initialization here. */ @@ -298,7 +320,3 @@ void raw_hid_receive(uint8_t *data, uint8_t length) { } } #endif - -void restart_usb_driver(USBDriver *usbp) { - (void)usbp; -} diff --git a/keyboards/keychron/q3_pro/readme.md b/keyboards/keychron/q3_pro/readme.md index d3008e7690..6dbe4aff65 100644 --- a/keyboards/keychron/q3_pro/readme.md +++ b/keyboards/keychron/q3_pro/readme.md @@ -1,20 +1,26 @@ # Keychron Q3 Pro -![Keychron Q3 Pro]() + A customizable 80% TKL keyboard. * Keyboard Maintainer: [Keychron](https://github.com/keychron) * Hardware Supported: Keychron Q3 Pro -* Hardware Availability: [Keychron Q3 Pro]() +* Hardware Availability: [Keychron Q3 Pro QMK/VIA Wireless Custom Mechanical Keyboard](https://www.keychron.com/products/keychron-q3-pro-qmk-via-wireless-custom-mechanical-keyboard) + +Q3 Pro SE marked with v1 and Q3 Pro marked with v2. Make example for this keyboard (after setting up your build environment): - make keychron/q3_pro/ansi_encoder:default + make keychron/q3_pro/ansi_encoder_v1:default + make keychron/q3_pro/iso_encoder_v1:default + make keychron/q3_pro/ansi_encoder_v2:default Flashing example for this keyboard: - make keychron/q3_pro/ansi_encoder:default:flash + make keychron/q3_pro/ansi_encoder_v1:default:flash + make keychron/q3_pro/iso_encoder_v1:default:flash + make keychron/q3_pro/ansi_encoder_v2:default:flash **Reset Key**: Connect the USB cable, toggle mode switch to "Off", hold down the *Esc* key or reset button underneath space bar, then toggle then switch to "Cable". diff --git a/keyboards/keychron/q3_pro/rules.mk b/keyboards/keychron/q3_pro/rules.mk index 1f9fc1ab58..d2699c9cda 100644 --- a/keyboards/keychron/q3_pro/rules.mk +++ b/keyboards/keychron/q3_pro/rules.mk @@ -1,7 +1,3 @@ -# Enter lower-power sleep mode when on the ChibiOS idle thread -OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST -SRC += matrix.c - include keyboards/keychron/bluetooth/bluetooth.mk diff --git a/keyboards/keychron/q3_pro/via_json/q3_pro_ansi_encoder_v1.json b/keyboards/keychron/q3_pro/via_json/q3_pro_ansi_encoder_v1.json new file mode 100755 index 0000000000..a5d132506f --- /dev/null +++ b/keyboards/keychron/q3_pro/via_json/q3_pro_ansi_encoder_v1.json @@ -0,0 +1,332 @@ +{ + "name": "Keychron Q3 Pro", + "vendorId": "0x3434", + "productId": "0x0630", + "keycodes": ["qmk_lighting"], + "menus": [ + { + "label": "Lighting", + "content": [ + { + "label": "Backlight", + "content": [ + { + "label": "Brightness", + "type": "range", + "options": [0, 255], + "content": ["id_qmk_rgb_matrix_brightness", 3, 1] + }, + { + "label": "Effect", + "type": "dropdown", + "content": ["id_qmk_rgb_matrix_effect", 3, 2], + "options": [ + ["None", 0], + ["Solid Color", 1], + ["Breathing", 2], + ["Band Spiral Val", 3], + ["Cycle All", 4], + ["Cycle Left Right", 5], + ["Cycle Up Down", 6], + ["Rainbow Moving Chevron", 7], + ["Cycle Out In", 8], + ["Cycle Out In Dual", 9], + ["Cycle Pinwheel", 10], + ["Cycle Spiral", 11], + ["Dual Beacon", 12], + ["Rainbow Beacon", 13], + ["Jellybean Raindrops", 14], + ["Pixel Rain", 15], + ["Typing Heatmap", 16], + ["Digital Rain", 17], + ["Reactive Simple", 18], + ["Reactive Multiwide", 19], + ["Reactive Multinexus", 20], + ["Splash", 21], + ["Solid Splash", 22] + ] + }, + { + "showIf": "{id_qmk_rgb_matrix_effect} > 1", + "label": "Effect Speed", + "type": "range", + "options": [0, 255], + "content": ["id_qmk_rgb_matrix_effect_speed", 3, 3] + }, + { + "showIf": "{id_qmk_rgb_matrix_effect} != 0 && ( {id_qmk_rgb_matrix_effect} < 4 || {id_qmk_rgb_matrix_effect} == 18 || ({id_qmk_rgb_matrix_effect} > 17 && {id_qmk_rgb_matrix_effect} != 21) ) ", + "label": "Color", + "type": "color", + "content": ["id_qmk_rgb_matrix_color", 3, 4] + } + ] + } + ] + } + ], + "customKeycodes": [ + {"name": "Left Option", "title": "Left Option", "shortName": "LOpt"}, + {"name": "Right Option", "title": "Right Option", "shortName": "ROpt"}, + {"name": "Left Cmd", "title": "Left Command", "shortName": "LCmd"}, + {"name": "Right Cmd", "title": "Right Command", "shortName": "RCmd"}, + {"name": "Misson Control", "title": "Misson Control, availabe in macOS", "shortName": "MCtrl"}, + {"name": "Launch pad", "title": "Launch pad, availabe in macOS", "shortName": "LPad"}, + {"name": "Task View", "title": "Task View in Windows", "shortName": "Task"}, + {"name": "File Explorer", "title": "File Explorer in Windows", "shortName": "File"}, + {"name": "Screen shot", "title": "Screenshot in macOS", "shortName": "SShot"}, + {"name": "Cortana", "title": "Cortana in Windows", "shortName": "Cortana"}, + {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"}, + {"name": "Bluetooth Host 1", "title": "Bluetooth Host 1", "shortName": "BTH1"}, + {"name": "Bluetooth Host 2", "title": "Bluetooth Host 2", "shortName": "BTH2"}, + {"name": "Bluetooth Host 3", "title": "Bluetooth Host 3", "shortName": "BTH3"}, + {"name": "Battery Level", "title": "Show battery level", "shortName": "Batt"} + ], + "matrix": {"rows": 6, "cols": 18}, + "layouts": { + "keymap": [ + [ + { + "x": 1.25, + "c": "#777777" + }, + "0,1\nESC", + { + "x": 1, + "c": "#cccccc" + }, + "0,2", + "0,3", + "0,4", + "0,5", + { + "x": 0.5, + "c": "#aaaaaa" + }, + "0,6", + "0,7", + "0,8", + "0,9", + { + "x": 0.5, + "c": "#cccccc" + }, + "0,10", + "0,11", + "0,12", + "0,13", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "0,14", + "0,15", + "0,16" + ], + [ + { + "y": -0.75, + "c": "#cccccc" + }, + "0,0\n\n\n\n\n\n\n\n\ne0" + ], + [ + { + "x": 1.25, + "c": "#aaaaaa" + }, + "1,0", + { + "c": "#cccccc" + }, + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + { + "c": "#aaaaaa", + "w": 2 + }, + "1,13", + { + "x": 0.25 + }, + "1,14", + "1,15", + "1,16" + ], + [ + { + "y": -0.75, + "c": "#cccccc" + }, + "1,17" + ], + [ + { + "y": -0.25, + "x": 1.25, + "c": "#aaaaaa", + "w": 1.5 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + "2,12", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "2,13", + { + "x": 0.25 + }, + "2,14", + "2,15", + "2,16" + ], + [ + { + "y": -0.5, + "c": "#cccccc" + }, + "3,17" + ], + [ + { + "y": -0.5, + "x": 1.25, + "c": "#aaaaaa", + "w": 1.75 + }, + "3,0", + { + "c": "#cccccc" + }, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + { + "c": "#777777", + "w": 2.25 + }, + "3,13" + ], + [ + { + "y": -0.25, + "c": "#cccccc" + }, + "4,17" + ], + [ + { + "y": -0.75, + "x": 1.25, + "c": "#aaaaaa", + "w": 2.25 + }, + "4,0", + { + "c": "#cccccc" + }, + "4,2", + "4,3", + "4,4", + "4,5", + "4,6", + "4,7", + "4,8", + "4,9", + "4,10", + "4,11", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "4,13", + { + "x": 1.25, + "c": "#777777" + }, + "4,15" + ], + [ + { + "c": "#cccccc" + }, + "5,17", + { + "x": 0.25, + "c": "#aaaaaa", + "w": 1.25 + }, + "5,0", + { + "w": 1.25 + }, + "5,1", + { + "w": 1.25 + }, + "5,2", + { + "c": "#cccccc", + "w": 6.25 + }, + "5,6", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "5,10", + { + "w": 1.25 + }, + "5,11", + { + "w": 1.25 + }, + "5,12", + { + "w": 1.25 + }, + "5,13", + { + "x": 0.25, + "c": "#777777" + }, + "5,14", + "5,15", + "5,16" + ] + ] + } +} diff --git a/keyboards/keychron/q3_pro/via_json/q3_pro_ansi_encoder_v2.json b/keyboards/keychron/q3_pro/via_json/q3_pro_ansi_encoder_v2.json new file mode 100755 index 0000000000..8c735bbabe --- /dev/null +++ b/keyboards/keychron/q3_pro/via_json/q3_pro_ansi_encoder_v2.json @@ -0,0 +1,291 @@ +{ + "name": "Keychron Q3 Pro ANSI Knob", + "vendorId": "0x3434", + "productId": "0x0633", + "keycodes": ["qmk_lighting"], + "menus": [ + { + "label": "Lighting", + "content": [ + { + "label": "Backlight", + "content": [ + { + "label": "Brightness", + "type": "range", + "options": [0, 255], + "content": ["id_qmk_rgb_matrix_brightness", 3, 1] + }, + { + "label": "Effect", + "type": "dropdown", + "content": ["id_qmk_rgb_matrix_effect", 3, 2], + "options": [ + ["None", 0], + ["Solid Color", 1], + ["Breathing", 2], + ["Band Spiral Val", 3], + ["Cycle All", 4], + ["Cycle Left Right", 5], + ["Cycle Up Down", 6], + ["Rainbow Moving Chevron", 7], + ["Cycle Out In", 8], + ["Cycle Out In Dual", 9], + ["Cycle Pinwheel", 10], + ["Cycle Spiral", 11], + ["Dual Beacon", 12], + ["Rainbow Beacon", 13], + ["Jellybean Raindrops", 14], + ["Pixel Rain", 15], + ["Typing Heatmap", 16], + ["Digital Rain", 17], + ["Reactive Simple", 18], + ["Reactive Multiwide", 19], + ["Reactive Multinexus", 20], + ["Splash", 21], + ["Solid Splash", 22] + ] + }, + { + "showIf": "{id_qmk_rgb_matrix_effect} > 1", + "label": "Effect Speed", + "type": "range", + "options": [0, 255], + "content": ["id_qmk_rgb_matrix_effect_speed", 3, 3] + }, + { + "showIf": "{id_qmk_rgb_matrix_effect} != 0 && ( {id_qmk_rgb_matrix_effect} < 4 || {id_qmk_rgb_matrix_effect} == 18 || ({id_qmk_rgb_matrix_effect} > 17 && {id_qmk_rgb_matrix_effect} != 21) ) ", + "label": "Color", + "type": "color", + "content": ["id_qmk_rgb_matrix_color", 3, 4] + } + ] + } + ] + } + ], + "customKeycodes": [ + {"name": "Left Option", "title": "Left Option", "shortName": "LOpt"}, + {"name": "Right Option", "title": "Right Option", "shortName": "ROpt"}, + {"name": "Left Cmd", "title": "Left Command", "shortName": "LCmd"}, + {"name": "Right Cmd", "title": "Right Command", "shortName": "RCmd"}, + {"name": "Task View", "title": "Task View in Windows", "shortName": "Task"}, + {"name": "File Explorer", "title": "File Explorer in Windows", "shortName": "File"}, + {"name": "Screen shot", "title": "Screenshot in macOS", "shortName": "SShot"}, + {"name": "Cortana", "title": "Cortana in Windows", "shortName": "Cortana"}, + {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"}, + {"name": "Bluetooth Host 1", "title": "Bluetooth Host 1", "shortName": "BTH1"}, + {"name": "Bluetooth Host 2", "title": "Bluetooth Host 2", "shortName": "BTH2"}, + {"name": "Bluetooth Host 3", "title": "Bluetooth Host 3", "shortName": "BTH3"}, + {"name": "Battery Level", "title": "Show battery level", "shortName": "Batt"} + ], + "matrix": {"rows": 6, "cols": 16}, + "layouts": { + "keymap": [ + [ + { + "c": "#777777" + }, + "0,0\nESC", + { + "x": 0.25, + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "0,5", + "0,6", + "0,7", + "0,8", + { + "x": 0.25, + "c": "#cccccc" + }, + "0,9", + "0,10", + "0,11", + "0,12", + { + "x": 0.25 + }, + "0,13\n\n\n\n\n\n\n\n\ne0", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "0,14", + "0,15", + "3,12" + ], + [ + { + "y": 0.25 + }, + "1,0", + { + "c": "#cccccc" + }, + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + { + "c": "#aaaaaa", + "w": 2 + }, + "1,13", + { + "x": 0.25 + }, + "1,14", + "1,15", + "3,14" + ], + [ + { + "w": 1.5 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + "2,12", + { + "c": "#aaaaaa", + "w": 1.5 + }, + "2,13", + { + "x": 0.25 + }, + "2,14", + "2,15", + "3,15" + ], + [ + { + "w": 1.75 + }, + "3,0", + { + "c": "#cccccc" + }, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + { + "c": "#777777", + "w": 2.25 + }, + "3,13" + ], + [ + { + "c": "#aaaaaa", + "w": 2.25 + }, + "4,0", + { + "c": "#cccccc" + }, + "4,2", + "4,3", + "4,4", + "4,5", + "4,6", + "4,7", + "4,8", + "4,9", + "4,10", + "4,11", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "4,13", + { + "x": 1.25, + "c": "#777777" + }, + "4,15" + ], + [ + { + "c": "#aaaaaa", + "w": 1.25 + }, + "5,0", + { + "w": 1.25 + }, + "5,1", + { + "w": 1.25 + }, + "5,2", + { + "c": "#cccccc", + "w": 6.25 + }, + "5,6", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "5,10", + { + "w": 1.25 + }, + "5,11", + { + "w": 1.25 + }, + "5,12", + { + "w": 1.25 + }, + "5,13", + { + "x": 0.25, + "c": "#777777" + }, + "5,14", + "5,15", + "4,14" + ] + ] + } +} diff --git a/keyboards/keychron/q3_pro/via_json/q3_pro_iso_encoder_v1.json b/keyboards/keychron/q3_pro/via_json/q3_pro_iso_encoder_v1.json new file mode 100755 index 0000000000..93dc333e0a --- /dev/null +++ b/keyboards/keychron/q3_pro/via_json/q3_pro_iso_encoder_v1.json @@ -0,0 +1,337 @@ +{ + "name": "Keychron Q3 Pro ISO Knob", + "vendorId": "0x3434", + "productId": "0x0631", + "keycodes": ["qmk_lighting"], + "menus": [ + { + "label": "Lighting", + "content": [ + { + "label": "Backlight", + "content": [ + { + "label": "Brightness", + "type": "range", + "options": [0, 255], + "content": ["id_qmk_rgb_matrix_brightness", 3, 1] + }, + { + "label": "Effect", + "type": "dropdown", + "content": ["id_qmk_rgb_matrix_effect", 3, 2], + "options": [ + ["None", 0], + ["Solid Color", 1], + ["Breathing", 2], + ["Band Spiral Val", 3], + ["Cycle All", 4], + ["Cycle Left Right", 5], + ["Cycle Up Down", 6], + ["Rainbow Moving Chevron", 7], + ["Cycle Out In", 8], + ["Cycle Out In Dual", 9], + ["Cycle Pinwheel", 10], + ["Cycle Spiral", 11], + ["Dual Beacon", 12], + ["Rainbow Beacon", 13], + ["Jellybean Raindrops", 14], + ["Pixel Rain", 15], + ["Typing Heatmap", 16], + ["Digital Rain", 17], + ["Reactive Simple", 18], + ["Reactive Multiwide", 19], + ["Reactive Multinexus", 20], + ["Splash", 21], + ["Solid Splash", 22] + ] + }, + { + "showIf": "{id_qmk_rgb_matrix_effect} > 1", + "label": "Effect Speed", + "type": "range", + "options": [0, 255], + "content": ["id_qmk_rgb_matrix_effect_speed", 3, 3] + }, + { + "showIf": "{id_qmk_rgb_matrix_effect} != 0 && ( {id_qmk_rgb_matrix_effect} < 4 || {id_qmk_rgb_matrix_effect} == 18 || ({id_qmk_rgb_matrix_effect} > 17 && {id_qmk_rgb_matrix_effect} != 21) ) ", + "label": "Color", + "type": "color", + "content": ["id_qmk_rgb_matrix_color", 3, 4] + } + ] + } + ] + } + ], + "customKeycodes": [ + {"name": "Left Option", "title": "Left Option", "shortName": "LOpt"}, + {"name": "Right Option", "title": "Right Option", "shortName": "ROpt"}, + {"name": "Left Cmd", "title": "Left Command", "shortName": "LCmd"}, + {"name": "Right Cmd", "title": "Right Command", "shortName": "RCmd"}, + {"name": "Misson Control", "title": "Misson Control, availabe in macOS", "shortName": "MCtrl"}, + {"name": "Launch pad", "title": "Launch pad, availabe in macOS", "shortName": "LPad"}, + {"name": "Task View", "title": "Task View in Windows", "shortName": "Task"}, + {"name": "File Explorer", "title": "File Explorer in Windows", "shortName": "File"}, + {"name": "Screen shot", "title": "Screenshot in macOS", "shortName": "SShot"}, + {"name": "Cortana", "title": "Cortana in Windows", "shortName": "Cortana"}, + {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"}, + {"name": "Bluetooth Host 1", "title": "Bluetooth Host 1", "shortName": "BTH1"}, + {"name": "Bluetooth Host 2", "title": "Bluetooth Host 2", "shortName": "BTH2"}, + {"name": "Bluetooth Host 3", "title": "Bluetooth Host 3", "shortName": "BTH3"}, + {"name": "Battery Level", "title": "Show battery level", "shortName": "Batt"} + ], + "matrix": {"rows": 6, "cols": 18}, + "layouts": { + "keymap": [ + [ + { + "x": 1.25, + "c": "#777777" + }, + "0,1\nESC", + { + "x": 1, + "c": "#cccccc" + }, + "0,2", + "0,3", + "0,4", + "0,5", + { + "x": 0.5, + "c": "#aaaaaa" + }, + "0,6", + "0,7", + "0,8", + "0,9", + { + "x": 0.5, + "c": "#cccccc" + }, + "0,10", + "0,11", + "0,12", + "0,13", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "0,14", + "0,15", + "0,16" + ], + [ + { + "y": -0.75, + "c": "#cccccc" + }, + "0,0\n\n\n\n\n\n\n\n\ne0" + ], + [ + { + "x": 1.25, + "c": "#aaaaaa" + }, + "1,0", + { + "c": "#cccccc" + }, + "1,1", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "1,9", + "1,10", + "1,11", + "1,12", + { + "c": "#aaaaaa", + "w": 2 + }, + "1,13", + { + "x": 0.25 + }, + "1,14", + "1,15", + "1,16" + ], + [ + { + "y": -0.75, + "c": "#cccccc" + }, + "1,17" + ], + [ + { + "y": -0.25, + "x": 1.25, + "c": "#aaaaaa", + "w": 1.5 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "2,9", + "2,10", + "2,11", + "2,12", + { + "x": 0.25, + "c": "#aaaaaa", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "2,13", + { + "x": 0.25 + }, + "2,14", + "2,15", + "2,16" + ], + [ + { + "y": -0.5, + "c": "#cccccc" + }, + "3,17" + ], + [ + { + "y": -0.5, + "x": 1.25, + "c": "#aaaaaa", + "w": 1.75 + }, + "3,0", + { + "c": "#cccccc" + }, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + { + "c": "#aaaaaa" + }, + "3,13" + ], + [ + { + "y": -0.25, + "c": "#cccccc" + }, + "4,17" + ], + [ + { + "y": -0.75, + "x": 1.25, + "c": "#aaaaaa", + "w": 1.25 + }, + "4,0", + "4,1", + { + "c": "#cccccc" + }, + "4,2", + "4,3", + "4,4", + "4,5", + "4,6", + "4,7", + "4,8", + "4,9", + "4,10", + "4,11", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "4,13", + { + "x": 1.25, + "c": "#777777" + }, + "4,15" + ], + [ + { + "c": "#cccccc" + }, + "5,17", + { + "x": 0.25, + "c": "#aaaaaa", + "w": 1.25 + }, + "5,0", + { + "w": 1.25 + }, + "5,1", + { + "w": 1.25 + }, + "5,2", + { + "c": "#cccccc", + "w": 6.25 + }, + "5,6", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "5,10", + { + "w": 1.25 + }, + "5,11", + { + "w": 1.25 + }, + "5,12", + { + "w": 1.25 + }, + "5,13", + { + "x": 0.25, + "c": "#777777" + }, + "5,14", + "5,15", + "5,16" + ] + ] + } +} |