From bf41f65a5e563c180cb2c902a814d51a7580f59e Mon Sep 17 00:00:00 2001 From: lalalademaxiya1 <66767061+lalalademaxiya1@users.noreply.github.com> Date: Mon, 22 May 2023 09:35:18 +0800 Subject: [PATCH 01/17] Add keychron q6 pro --- .../q6_pro/ansi_encoder/ansi_encoder.c | 142 +++++++ .../keychron/q6_pro/ansi_encoder/config.h | 51 +++ .../keychron/q6_pro/ansi_encoder/info.json | 243 ++++++++++++ .../ansi_encoder/keymaps/default/keymap.c | 65 ++++ .../q6_pro/ansi_encoder/keymaps/via/keymap.c | 65 ++++ .../q6_pro/ansi_encoder/keymaps/via/rules.mk | 1 + .../keychron/q6_pro/ansi_encoder/rules.mk | 1 + keyboards/keychron/q6_pro/config.h | 91 +++++ keyboards/keychron/q6_pro/halconf.h | 30 ++ keyboards/keychron/q6_pro/info.json | 64 ++++ keyboards/keychron/q6_pro/matrix.c | 141 +++++++ keyboards/keychron/q6_pro/mcuconf.h | 39 ++ keyboards/keychron/q6_pro/q6_pro.c | 311 ++++++++++++++++ keyboards/keychron/q6_pro/q6_pro.h | 55 +++ keyboards/keychron/q6_pro/readme.md | 21 ++ keyboards/keychron/q6_pro/rules.mk | 13 + .../q6_pro/via_json/q6_pro_ansi_encoder.json | 346 ++++++++++++++++++ 17 files changed, 1679 insertions(+) create mode 100755 keyboards/keychron/q6_pro/ansi_encoder/ansi_encoder.c create mode 100755 keyboards/keychron/q6_pro/ansi_encoder/config.h create mode 100755 keyboards/keychron/q6_pro/ansi_encoder/info.json create mode 100755 keyboards/keychron/q6_pro/ansi_encoder/keymaps/default/keymap.c create mode 100755 keyboards/keychron/q6_pro/ansi_encoder/keymaps/via/keymap.c create mode 100644 keyboards/keychron/q6_pro/ansi_encoder/keymaps/via/rules.mk create mode 100755 keyboards/keychron/q6_pro/ansi_encoder/rules.mk create mode 100755 keyboards/keychron/q6_pro/config.h create mode 100755 keyboards/keychron/q6_pro/halconf.h create mode 100755 keyboards/keychron/q6_pro/info.json create mode 100644 keyboards/keychron/q6_pro/matrix.c create mode 100755 keyboards/keychron/q6_pro/mcuconf.h create mode 100755 keyboards/keychron/q6_pro/q6_pro.c create mode 100755 keyboards/keychron/q6_pro/q6_pro.h create mode 100755 keyboards/keychron/q6_pro/readme.md create mode 100755 keyboards/keychron/q6_pro/rules.mk create mode 100644 keyboards/keychron/q6_pro/via_json/q6_pro_ansi_encoder.json diff --git a/keyboards/keychron/q6_pro/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q6_pro/ansi_encoder/ansi_encoder.c new file mode 100755 index 0000000000..464143dcd8 --- /dev/null +++ b/keyboards/keychron/q6_pro/ansi_encoder/ansi_encoder.c @@ -0,0 +1,142 @@ +/* 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 . + */ + +#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}, + {0, L_5, J_5, K_5}, + {0, L_6, J_6, K_6}, + {0, L_7, J_7, K_7}, + {0, L_8, J_8, K_8}, + + {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}, + {0, L_9, J_9, K_9}, + {0, L_10, J_10, K_10}, + {0, L_11, J_11, K_11}, + {0, L_12, J_12, K_12}, + + {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}, + {0, L_13, J_13, K_13}, + {0, L_14, J_14, K_14}, + {0, L_15, J_15, K_15}, + {0, L_16, J_16, K_16}, + + {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}, + {1, L_9, J_9, K_9}, + {1, L_8, J_8, K_8}, + {1, L_7, J_7, K_7}, + + {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}, + {1, L_6, J_6, K_6}, + {1, L_5, J_5, K_5}, + {1, L_4, J_4, K_4}, + {1, L_3, J_3, K_3}, + + {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}, + {1, L_2, J_2, K_2}, + {1, L_1, J_1, K_1} +}; +#endif diff --git a/keyboards/keychron/q6_pro/ansi_encoder/config.h b/keyboards/keychron/q6_pro/ansi_encoder/config.h new file mode 100755 index 0000000000..c31a7acb10 --- /dev/null +++ b/keyboards/keychron/q6_pro/ansi_encoder/config.h @@ -0,0 +1,51 @@ +/* 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 . + */ + +#pragma once + +#ifdef RGB_MATRIX_ENABLE +/* RGB Matrix Driver Configuration */ +# define DRIVER_COUNT 2 +# define DRIVER_ADDR_1 0b1110111 +# define DRIVER_ADDR_2 0b1110100 +# define DRIVER_1_LED_TOTAL 59 +# define DRIVER_2_LED_TOTAL 49 +# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) + +/* Set to infinit, which is use in USB mode by default */ +# define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE + +/* Allow to shutdown driver to save power */ +# define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE + +/* Turn off backllit if brightness value is low */ +# define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48 + +# define NUM_LOCK_INDEX 37 +# define CAPS_LOCK_INDEX 62 +# define LOW_BAT_IND_INDEX 98 + +// 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 + +/* 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/q6_pro/ansi_encoder/info.json b/keyboards/keychron/q6_pro/ansi_encoder/info.json new file mode 100755 index 0000000000..668610b5cf --- /dev/null +++ b/keyboards/keychron/q6_pro/ansi_encoder/info.json @@ -0,0 +1,243 @@ +{ + "usb": { + "pid": "0x0660", + "device_version": "1.0.0" + }, + "layouts": { + "LAYOUT": { + "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.25, "y":0}, + {"matrix":[0,15], "x":16.25, "y":0}, + {"matrix":[0,16], "x":17.25, "y":0}, + {"matrix":[0,17], "x":18.5, "y":0}, + {"matrix":[0,18], "x":19.5, "y":0}, + {"matrix":[0,19], "x":20.5, "y":0}, + {"matrix":[0,20], "x":21.5, "y":0}, + + {"matrix":[1, 0], "x":0, "y":1.25}, + {"matrix":[1, 1], "x":1, "y":1.25}, + {"matrix":[1, 2], "x":2, "y":1.25}, + {"matrix":[1, 3], "x":3, "y":1.25}, + {"matrix":[1, 4], "x":4, "y":1.25}, + {"matrix":[1, 5], "x":5, "y":1.25}, + {"matrix":[1, 6], "x":6, "y":1.25}, + {"matrix":[1, 7], "x":7, "y":1.25}, + {"matrix":[1, 8], "x":8, "y":1.25}, + {"matrix":[1, 9], "x":9, "y":1.25}, + {"matrix":[1,10], "x":10, "y":1.25}, + {"matrix":[1,11], "x":11, "y":1.25}, + {"matrix":[1,12], "x":12, "y":1.25}, + {"matrix":[1,13], "x":13, "y":1.25, "w":2}, + {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1,15], "x":16.25, "y":1.25}, + {"matrix":[1,16], "x":17.25, "y":1.25}, + {"matrix":[1,17], "x":18.5, "y":1.25}, + {"matrix":[1,18], "x":19.5, "y":1.25}, + {"matrix":[1,19], "x":20.5, "y":1.25}, + {"matrix":[1,20], "x":21.5, "y":1.25}, + + {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, + {"matrix":[2, 1], "x":1.5, "y":2.25}, + {"matrix":[2, 2], "x":2.5, "y":2.25}, + {"matrix":[2, 3], "x":3.5, "y":2.25}, + {"matrix":[2, 4], "x":4.5, "y":2.25}, + {"matrix":[2, 5], "x":5.5, "y":2.25}, + {"matrix":[2, 6], "x":6.5, "y":2.25}, + {"matrix":[2, 7], "x":7.5, "y":2.25}, + {"matrix":[2, 8], "x":8.5, "y":2.25}, + {"matrix":[2, 9], "x":9.5, "y":2.25}, + {"matrix":[2,10], "x":10.5, "y":2.25}, + {"matrix":[2,11], "x":11.5, "y":2.25}, + {"matrix":[2,12], "x":12.5, "y":2.25}, + {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5}, + {"matrix":[2,14], "x":15.25, "y":2.25}, + {"matrix":[2,15], "x":16.25, "y":2.25}, + {"matrix":[2,16], "x":17.25, "y":2.25}, + {"matrix":[2,17], "x":18.5, "y":2.25}, + {"matrix":[2,18], "x":19.5, "y":2.25}, + {"matrix":[2,19], "x":20.5, "y":2.25}, + {"matrix":[2,20], "x":21.5, "y":2.25, "h":2}, + + {"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":[3,17], "x":18.5, "y":3.25}, + {"matrix":[3,18], "x":19.5, "y":3.25}, + {"matrix":[3,19], "x":20.5, "y":3.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.25, "y":4.25}, + {"matrix":[4,17], "x":18.5, "y":4.25}, + {"matrix":[4,18], "x":19.5, "y":4.25}, + {"matrix":[4,19], "x":20.5, "y":4.25}, + {"matrix":[4,20], "x":21.5, "y":4.25, "h":2}, + + {"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.25, "y":5.25}, + {"matrix":[5,15], "x":16.25, "y":5.25}, + {"matrix":[5,16], "x":17.25, "y":5.25}, + {"matrix":[5,18], "x":18.5, "y":5.25, "w":2}, + {"matrix":[5,19], "x":20.5, "y":5.25} + ] + } + }, + "rgb_matrix": { + "layout": [ + {"matrix":[0, 0], "flags":1, "x":0, "y":0}, + {"matrix":[0, 1], "flags":1, "x":13, "y":0}, + {"matrix":[0, 2], "flags":1, "x":24, "y":0}, + {"matrix":[0, 3], "flags":1, "x":34, "y":0}, + {"matrix":[0, 4], "flags":1, "x":45, "y":0}, + {"matrix":[0, 5], "flags":1, "x":57, "y":0}, + {"matrix":[0, 6], "flags":1, "x":68, "y":0}, + {"matrix":[0, 7], "flags":1, "x":78, "y":0}, + {"matrix":[0, 8], "flags":1, "x":89, "y":0}, + {"matrix":[0, 9], "flags":1, "x":102, "y":0}, + {"matrix":[0, 10], "flags":1, "x":112, "y":0}, + {"matrix":[0, 11], "flags":1, "x":123, "y":0}, + {"matrix":[0, 12], "flags":1, "x":133, "y":0}, + {"matrix":[0, 14], "flags":1, "x":159, "y":0}, + {"matrix":[0, 15], "flags":1, "x":169, "y":0}, + {"matrix":[0, 16], "flags":1, "x":180, "y":0}, + {"matrix":[0, 17], "flags":4, "x":193, "y":0}, + {"matrix":[0, 18], "flags":4, "x":203, "y":0}, + {"matrix":[0, 19], "flags":4, "x":214, "y":0}, + {"matrix":[0, 20], "flags":4, "x":224, "y":0}, + + {"matrix":[1, 0], "flags":4, "x":0, "y":15}, + {"matrix":[1, 1], "flags":8, "x":10, "y":15}, + {"matrix":[1, 2], "flags":8, "x":21, "y":15}, + {"matrix":[1, 3], "flags":8, "x":32, "y":15}, + {"matrix":[1, 4], "flags":4, "x":42, "y":15}, + {"matrix":[1, 5], "flags":4, "x":52, "y":15}, + {"matrix":[1, 6], "flags":4, "x":63, "y":15}, + {"matrix":[1, 7], "flags":4, "x":73, "y":15}, + {"matrix":[1, 8], "flags":4, "x":83, "y":15}, + {"matrix":[1, 9], "flags":4, "x":94, "y":15}, + {"matrix":[1, 10], "flags":4, "x":104, "y":15}, + {"matrix":[1, 11], "flags":4, "x":115, "y":15}, + {"matrix":[1, 12], "flags":4, "x":125, "y":15}, + {"matrix":[1, 13], "flags":4, "x":141, "y":15}, + {"matrix":[1, 14], "flags":1, "x":159, "y":15}, + {"matrix":[1, 15], "flags":1, "x":169, "y":15}, + {"matrix":[1, 16], "flags":1, "x":180, "y":15}, + {"matrix":[1, 17], "flags":8, "x":193, "y":15}, + {"matrix":[1, 18], "flags":4, "x":203, "y":15}, + {"matrix":[1, 19], "flags":4, "x":214, "y":15}, + {"matrix":[1, 20], "flags":4, "x":224, "y":15}, + + {"matrix":[2, 0], "flags":1, "x":3, "y":27}, + {"matrix":[2, 1], "flags":4, "x":16, "y":27}, + {"matrix":[2, 2], "flags":4, "x":26, "y":27}, + {"matrix":[2, 3], "flags":4, "x":36, "y":27}, + {"matrix":[2, 4], "flags":1, "x":47, "y":27}, + {"matrix":[2, 5], "flags":4, "x":57, "y":27}, + {"matrix":[2, 6], "flags":4, "x":68, "y":27}, + {"matrix":[2, 7], "flags":4, "x":78, "y":27}, + {"matrix":[2, 8], "flags":4, "x":89, "y":27}, + {"matrix":[2, 9], "flags":4, "x":99, "y":27}, + {"matrix":[2, 10], "flags":4, "x":109, "y":27}, + {"matrix":[2, 11], "flags":4, "x":120, "y":27}, + {"matrix":[2, 12], "flags":4, "x":130, "y":27}, + {"matrix":[2, 13], "flags":4, "x":143, "y":27}, + {"matrix":[2, 14], "flags":1, "x":159, "y":27}, + {"matrix":[2, 15], "flags":1, "x":169, "y":27}, + {"matrix":[2, 16], "flags":1, "x":180, "y":27}, + {"matrix":[2, 17], "flags":4, "x":193, "y":27}, + {"matrix":[2, 18], "flags":4, "x":203, "y":27}, + {"matrix":[2, 19], "flags":4, "x":214, "y":27}, + {"matrix":[2, 20], "flags":4, "x":224, "y":27}, + + {"matrix":[3, 0], "flags":8, "x":4, "y":40}, + {"matrix":[3, 1], "flags":4, "x":18, "y":40}, + {"matrix":[3, 2], "flags":4, "x":29, "y":40}, + {"matrix":[3, 3], "flags":4, "x":39, "y":40}, + {"matrix":[3, 4], "flags":4, "x":50, "y":40}, + {"matrix":[3, 5], "flags":4, "x":60, "y":40}, + {"matrix":[3, 6], "flags":4, "x":70, "y":40}, + {"matrix":[3, 7], "flags":4, "x":81, "y":40}, + {"matrix":[3, 8], "flags":4, "x":91, "y":40}, + {"matrix":[3, 9], "flags":4, "x":102, "y":40}, + {"matrix":[3, 10], "flags":4, "x":112, "y":40}, + {"matrix":[3, 11], "flags":4, "x":123, "y":40}, + {"matrix":[3, 13], "flags":1, "x":139, "y":40}, + {"matrix":[3, 17], "flags":4, "x":193, "y":40}, + {"matrix":[3, 18], "flags":4, "x":203, "y":40}, + {"matrix":[3, 19], "flags":4, "x":214, "y":40}, + + {"matrix":[4, 0], "flags":1, "x":7, "y":52}, + {"matrix":[4, 2], "flags":4, "x":23, "y":52}, + {"matrix":[4, 3], "flags":4, "x":34, "y":52}, + {"matrix":[4, 4], "flags":4, "x":44, "y":52}, + {"matrix":[4, 5], "flags":4, "x":55, "y":52}, + {"matrix":[4, 6], "flags":4, "x":65, "y":52}, + {"matrix":[4, 7], "flags":4, "x":76, "y":52}, + {"matrix":[4, 8], "flags":4, "x":86, "y":52}, + {"matrix":[4, 9], "flags":4, "x":96, "y":52}, + {"matrix":[4, 10], "flags":4, "x":107, "y":52}, + {"matrix":[4, 11], "flags":4, "x":117, "y":52}, + {"matrix":[4, 13], "flags":1, "x":137, "y":52}, + {"matrix":[4, 15], "flags":1, "x":169, "y":52}, + {"matrix":[4, 17], "flags":4, "x":193, "y":52}, + {"matrix":[4, 18], "flags":4, "x":203, "y":52}, + {"matrix":[4, 19], "flags":4, "x":214, "y":52}, + {"matrix":[4, 20], "flags":4, "x":224, "y":52}, + + {"matrix":[5, 0], "flags":1, "x":1, "y":64}, + {"matrix":[5, 1], "flags":1, "x":14, "y":64}, + {"matrix":[5, 2], "flags":1, "x":27, "y":64}, + {"matrix":[5, 6], "flags":4, "x":66, "y":64}, + {"matrix":[5, 10], "flags":1, "x":105, "y":64}, + {"matrix":[5, 11], "flags":1, "x":118, "y":64}, + {"matrix":[5, 12], "flags":4, "x":131, "y":64}, + {"matrix":[5, 13], "flags":1, "x":145, "y":64}, + {"matrix":[5, 14], "flags":1, "x":159, "y":64}, + {"matrix":[5, 15], "flags":1, "x":169, "y":64}, + {"matrix":[5, 16], "flags":1, "x":180, "y":64}, + {"matrix":[5, 18], "flags":4, "x":198, "y":64}, + {"matrix":[5, 19], "flags":4, "x":214, "y":64} + ] + } +} diff --git a/keyboards/keychron/q6_pro/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q6_pro/ansi_encoder/keymaps/default/keymap.c new file mode 100755 index 0000000000..c5277f5593 --- /dev/null +++ b/keyboards/keychron/q6_pro/ansi_encoder/keymaps/default/keymap.c @@ -0,0 +1,65 @@ +/* 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 . + */ + +#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( + 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_F13, KC_F14, KC_F15, KC_F16, + 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_NUM, KC_PSLS, KC_PAST, KC_PMNS, + 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_P7, KC_P8, KC_P9, KC_PPLS, + 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_P4, KC_P5, KC_P6, + 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_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), + [MAC_FN] = LAYOUT( + _______, 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( + 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_NUM, KC_PSLS, KC_PAST, KC_PMNS, + 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_P7, KC_P8, KC_P9, KC_PPLS, + 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_P4, KC_P5, KC_P6, + 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_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), + [WIN_FN] = LAYOUT( + _______, 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[][1][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/q6_pro/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q6_pro/ansi_encoder/keymaps/via/keymap.c new file mode 100755 index 0000000000..c5277f5593 --- /dev/null +++ b/keyboards/keychron/q6_pro/ansi_encoder/keymaps/via/keymap.c @@ -0,0 +1,65 @@ +/* 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 . + */ + +#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( + 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_F13, KC_F14, KC_F15, KC_F16, + 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_NUM, KC_PSLS, KC_PAST, KC_PMNS, + 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_P7, KC_P8, KC_P9, KC_PPLS, + 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_P4, KC_P5, KC_P6, + 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_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), + [MAC_FN] = LAYOUT( + _______, 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( + 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_NUM, KC_PSLS, KC_PAST, KC_PMNS, + 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_P7, KC_P8, KC_P9, KC_PPLS, + 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_P4, KC_P5, KC_P6, + 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_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), + [WIN_FN] = LAYOUT( + _______, 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[][1][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/q6_pro/ansi_encoder/keymaps/via/rules.mk b/keyboards/keychron/q6_pro/ansi_encoder/keymaps/via/rules.mk new file mode 100644 index 0000000000..1e5b99807c --- /dev/null +++ b/keyboards/keychron/q6_pro/ansi_encoder/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/keychron/q6_pro/ansi_encoder/rules.mk b/keyboards/keychron/q6_pro/ansi_encoder/rules.mk new file mode 100755 index 0000000000..6e7633bfe0 --- /dev/null +++ b/keyboards/keychron/q6_pro/ansi_encoder/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank diff --git a/keyboards/keychron/q6_pro/config.h b/keyboards/keychron/q6_pro/config.h new file mode 100755 index 0000000000..f7b7305458 --- /dev/null +++ b/keyboards/keychron/q6_pro/config.h @@ -0,0 +1,91 @@ +/* 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 . + */ + +#pragma once + +/* turn off effects when suspended */ +#define RGB_DISABLE_WHEN_USB_SUSPENDED +#define LED_DISABLE_WHEN_USB_SUSPENDED + +/* DIP switch */ +#define DIP_SWITCH_PINS { A8 } + +/* Increase I2C speed to 1000 KHz */ +#define I2C1_TIMINGR_PRESC 0U +#define I2C1_TIMINGR_SCLDEL 3U +#define I2C1_TIMINGR_SDADEL 0U +#define I2C1_TIMINGR_SCLH 15U +#define I2C1_TIMINGR_SCLL 51U + +#ifdef KC_BLUETOOTH_ENABLE +/* Hardware configuration */ +# define USB_BT_MODE_SELECT_PIN C15 + +# define CKBT51_RESET_PIN A9 +# define CKBT51_INT_INPUT_PIN A5 +# define BLUETOOTH_INT_INPUT_PIN A6 + +# define USB_POWER_SENSE_PIN B1 +# define USB_POWER_CONNECTED_LEVEL 0 + +# define BAT_LOW_LED_PIN A4 +# define BAT_LOW_LED_PIN_ON_STATE 1 + +# define HOST_DEVICES_COUNT 3 + +# if defined(RGB_MATRIX_ENABLE) + +# define LED_DRIVER_SHUTDOWN_PIN C14 + +# define HOST_LED_MATRIX_LIST \ + { 21, 22, 23 } + +# define BAT_LEVEL_LED_LIST \ + { 21, 22, 23, 24, 25, 26, 27, 28, 29, 30 } + +/* Backlit disable timeout when keyboard is disconnected(unit: second) */ +# define DISCONNECTED_BACKLIGHT_DISABLE_TIMEOUT 40 + +/* Backlit disable timeout when keyboard is connected(unit: second) */ +# define CONNECTED_BACKLIGHT_DISABLE_TIMEOUT 600 +# endif + +/* Keep USB connection in blueooth mode */ +# define KEEP_USB_CONNECTION_IN_BLUETOOTH_MODE + +/* Enable bluetooth NKRO */ +# define BLUETOOTH_NKRO_ENABLE + +/* Raw hid command for factory test and bluetooth DFU */ +# define RAW_HID_CMD 0xAA ... 0xAB +#else +/* Raw hid command for factory test */ +# define RAW_HID_CMD 0xAB +#endif + +/* Encoder Configuration */ +#define ENCODER_DEFAULT_POS 0x3 + +/* Emulated EEPROM configuration */ +#define FEE_DENSITY_BYTES FEE_PAGE_SIZE +#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047 + +/* Old default behavior of mod-taps */ +#define HOLD_ON_OTHER_KEY_PRESS + +/* Factory test keys */ +#define FN_KEY1 MO(1) +#define FN_KEY2 MO(3) diff --git a/keyboards/keychron/q6_pro/halconf.h b/keyboards/keychron/q6_pro/halconf.h new file mode 100755 index 0000000000..b0ca1150f6 --- /dev/null +++ b/keyboards/keychron/q6_pro/halconf.h @@ -0,0 +1,30 @@ +/* Copyright 2023 QMK + * + * 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 . + */ + +#pragma once + +#define _CHIBIOS_HAL_CONF_VER_8_0_ + +#define HAL_USE_I2C TRUE +#define HAL_USE_SPI TRUE + +#ifdef KC_BLUETOOTH_ENABLE +# define PAL_USE_CALLBACKS TRUE +# define HAL_USE_SERIAL TRUE +# define HAL_USE_RTC TRUE +#endif + +#include_next diff --git a/keyboards/keychron/q6_pro/info.json b/keyboards/keychron/q6_pro/info.json new file mode 100755 index 0000000000..186a4e2edd --- /dev/null +++ b/keyboards/keychron/q6_pro/info.json @@ -0,0 +1,64 @@ +{ + "manufacturer": "Keychron", + "keyboard_name": "Keychron Q6 Pro", + "url": "https://github.com/Keychron", + "maintainer": "lalalademaxiya1", + "processor": "STM32L432", + "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true, + "dip_switch": true, + "bluetooth": false, + "encoder": true, + "encoder_map": true, + "raw": true + }, + "rgb_matrix": { + "driver": "CKLED2001", + "animations": { + "breathing": true, + "band_spiral_val": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "jellybean_raindrops": true, + "pixel_rain": true, + "typing_heatmap": true, + "digital_rain": true, + "solid_reactive_simple": true, + "solid_reactive_multiwide": true, + "solid_reactive_multinexus": true, + "splash": true, + "solid_splash": true + } + }, + "bluetooth": { + "driver": "custom" + }, + "usb": { + "vid": "0x3434" + }, + "matrix_pins": { + "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], + "rows": ["B5", "B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", + "encoder": { + "rotary": [ + {"pin_a": "A0", "pin_b": "A10"} + ] + } +} diff --git a/keyboards/keychron/q6_pro/matrix.c b/keyboards/keychron/q6_pro/matrix.c new file mode 100644 index 0000000000..1c0dbdc537 --- /dev/null +++ b/keyboards/keychron/q6_pro/matrix.c @@ -0,0 +1,141 @@ +/* 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 . + */ + +#include "quantum.h" + +#define HC595_STCP B0 +#define HC595_SHCP A1 +#define HC595_DS A7 + +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 HC595_delay(uint8_t n) { + while (n-- > 0) { + asm volatile("nop" ::: "memory"); + } +} + +static void HC595_output(uint32_t data, bool bit) { + uint8_t n = 1; + uint8_t i = 1; + + for (i = 0; i < MATRIX_COLS; i++) { + if (data & 0x1) { + writePinHigh(HC595_DS); + } else { + writePinLow(HC595_DS); + } + writePinHigh(HC595_SHCP); + HC595_delay(n); + writePinLow(HC595_SHCP); + HC595_delay(n); + if (bit) { + break; + } else { + data = data >> 1; + } + } + writePinHigh(HC595_STCP); + HC595_delay(n); + writePinLow(HC595_STCP); + HC595_delay(n); +} + +static void select_col(uint8_t col) { + if (col == 0) { + HC595_output(0x00, 1); + } +} + +static void unselect_col(uint8_t col) { + (void)col; + HC595_output(0X01, 1); +} + +static void unselect_cols(void) { + HC595_output(0xFFFFFFFF, 0); +} + +void select_all_cols(void) { + HC595_output(0x0, 0); +} + +static void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col, matrix_row_t row_shifter) { + bool key_pressed = false; + + // Select col + select_col(current_col); // select col + // if (!select_col(current_col)) { // select col + // return; // skip NO_PIN col + // } + + matrix_output_select_delay(); + + // 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; + key_pressed = true; + } else { + // Pin HI, clear col bit + current_matrix[row_index] &= ~row_shifter; + } + } + + // Unselect col + unselect_col(current_col); + matrix_output_unselect_delay(current_col, key_pressed); // 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/q6_pro/mcuconf.h b/keyboards/keychron/q6_pro/mcuconf.h new file mode 100755 index 0000000000..87dd1ba2b9 --- /dev/null +++ b/keyboards/keychron/q6_pro/mcuconf.h @@ -0,0 +1,39 @@ +/* Copyright 2023 QMK + * + * 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 . + */ + +#pragma once + +#include_next + +/* Set HCLK to 48 MHz as tradeoff of USB lowest clockand and + * lower power comsumption for bluetooth. Will use dynamic + * clock when STM32L4 is supported in ChibiOS */ +#undef STM32_PLLM_VALUE +#define STM32_PLLM_VALUE 2 + +#undef STM32_PLLN_VALUE +#define STM32_PLLN_VALUE 12 + +#undef STM32_I2C_USE_I2C1 +#define STM32_I2C_USE_I2C1 TRUE + +#undef STM32_SPI_USE_SPI1 +#define STM32_SPI_USE_SPI1 TRUE + +#ifdef KC_BLUETOOTH_ENABLE +# undef STM32_SERIAL_USE_USART2 +# define STM32_SERIAL_USE_USART2 TRUE +#endif diff --git a/keyboards/keychron/q6_pro/q6_pro.c b/keyboards/keychron/q6_pro/q6_pro.c new file mode 100755 index 0000000000..e50f245b5d --- /dev/null +++ b/keyboards/keychron/q6_pro/q6_pro.c @@ -0,0 +1,311 @@ +/* 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 . + */ + +#include "q6_pro.h" +#ifdef KC_BLUETOOTH_ENABLE +# include "ckbt51.h" +# include "bluetooth.h" +# include "indicator.h" +# include "transport.h" +# include "battery.h" +# include "bat_level_animation.h" +# include "lpm.h" +#endif + +#ifdef ENABLE_FACTORY_TEST +# include "factory_test.h" +#endif + +#define POWER_ON_LED_DURATION 3000 + +typedef struct PACKED { + uint8_t len; + uint8_t keycode[3]; +} key_combination_t; + +static uint32_t power_on_indicator_timer_buffer; +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) + {2, {KC_LWIN, KC_E}}, // Files (win) + {3, {KC_LSFT, KC_LGUI, KC_4}}, // Snapshot (mac) + {2, {KC_LWIN, KC_C}} // Cortana (win) +}; + +#ifdef KC_BLUETOOTH_ENABLE +bool firstDisconnect = true; +bool bt_factory_reset = false; +static virtual_timer_t pairing_key_timer; +extern uint8_t g_pwm_buffer[DRIVER_COUNT][192]; + +static void pairing_key_timer_cb(void *arg) { + bluetooth_pairing_ex(*(uint8_t *)arg, NULL); +} +#endif + +bool dip_switch_update_kb(uint8_t index, bool active) { + if (index == 0) { + default_layer_set(1UL << (active ? 2 : 0)); + } + dip_switch_update_user(index, active); + + return true; +} + +#ifdef KC_BLUETOOTH_ENABLE +bool process_record_kb_bt(uint16_t keycode, keyrecord_t *record) { +#else +bool process_record_kb(uint16_t keycode, keyrecord_t *record) { +#endif + static uint8_t host_idx = 0; + + switch (keycode) { + case KC_LOPTN: + case KC_ROPTN: + case KC_LCMMD: + case KC_RCMMD: + if (record->event.pressed) { + register_code(mac_keycode[keycode - KC_LOPTN]); + } else { + unregister_code(mac_keycode[keycode - KC_LOPTN]); + } + return false; // Skip all further processing of this key) + case KC_TASK: + case KC_FILE: + case KC_SNAP: + case KC_CTANA: + if (record->event.pressed) { + for (uint8_t i = 0; i < key_comb_list[keycode - KC_TASK].len; i++) + register_code(key_comb_list[keycode - KC_TASK].keycode[i]); + } else { + for (uint8_t i = 0; i < key_comb_list[keycode - KC_TASK].len; i++) + unregister_code(key_comb_list[keycode - KC_TASK].keycode[i]); + } + return false; // Skip all further processing of this key + case KC_SIRI: + if (record->event.pressed && siri_timer_buffer == 0) { + register_code(KC_LGUI); + register_code(KC_SPACE); + siri_timer_buffer = sync_timer_read32() == 0 ? 1 : sync_timer_read32(); + } + return false; // Skip all further processing of this key +#ifdef KC_BLUETOOTH_ENABLE + case BT_HST1 ... BT_HST3: + if (get_transport() == TRANSPORT_BLUETOOTH) { + if (record->event.pressed) { + host_idx = keycode - BT_HST1 + 1; + chVTSet(&pairing_key_timer, TIME_MS2I(2000), (vtfunc_t)pairing_key_timer_cb, &host_idx); + bluetooth_connect_ex(host_idx, 0); + } else { + host_idx = 0; + chVTReset(&pairing_key_timer); + } + } + break; + case BAT_LVL: + if (get_transport() == TRANSPORT_BLUETOOTH && !usb_power_connected()) { + bat_level_animation_start(battery_get_percentage()); + } + break; +#endif + default: +#ifdef FACTORY_RESET_CHECK + FACTORY_RESET_CHECK(keycode, record); +#endif + break; + } + return true; +} + +#if defined(ENCODER_ENABLE) && defined(PAL_USE_CALLBACKS) +static void encoder_pad_cb(void *param) { + encoder_interrupt_read((uint32_t)param & 0XFF); +} +#endif + +void keyboard_post_init_kb(void) { + dip_switch_read(true); + +#ifdef KC_BLUETOOTH_ENABLE + /* Currently we don't use this reset pin */ + palSetLineMode(CKBT51_RESET_PIN, PAL_MODE_UNCONNECTED); + + /* IMPORTANT: DO NOT enable internal pull-up resistor + * as there is an external pull-down resistor. + */ + palSetLineMode(USB_BT_MODE_SELECT_PIN, PAL_MODE_INPUT); + + ckbt51_init(false); + bluetooth_init(); +#endif + + power_on_indicator_timer_buffer = sync_timer_read32() | 1; + writePin(BAT_LOW_LED_PIN, BAT_LOW_LED_PIN_ON_STATE); + +#if defined(ENCODER_ENABLE) && defined(PAL_USE_CALLBACKS) + pin_t encoders_pad_a[NUM_ENCODERS] = ENCODERS_PAD_A; + pin_t encoders_pad_b[NUM_ENCODERS] = ENCODERS_PAD_B; + 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], encoder_pad_cb, (void *)i); + palSetLineCallback(encoders_pad_b[i], encoder_pad_cb, (void *)i); + } +#endif + + keyboard_post_init_user(); +} + +void matrix_scan_kb(void) { + if (power_on_indicator_timer_buffer) { + if (sync_timer_elapsed32(power_on_indicator_timer_buffer) > POWER_ON_LED_DURATION) { + power_on_indicator_timer_buffer = 0; + writePin(BAT_LOW_LED_PIN, !BAT_LOW_LED_PIN_ON_STATE); + } else { + writePin(BAT_LOW_LED_PIN, BAT_LOW_LED_PIN_ON_STATE); + } + } + + if (siri_timer_buffer && sync_timer_elapsed32(siri_timer_buffer) > 500) { + siri_timer_buffer = 0; + unregister_code(KC_LGUI); + unregister_code(KC_SPACE); + } + +#ifdef FACTORY_RESET_TASK + FACTORY_RESET_TASK(); +#endif + matrix_scan_user(); +} + +#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, + .connected_idle_timeout = 7200, + .pairing_timeout = 180, + .pairing_mode = 0, + .reconnect_timeout = 5, + .report_rate = 90, + .vendor_id_source = 1, + .verndor_id = 0, // Must be 0x3434 + .product_id = PRODUCT_ID}; + ckbt51_set_param(¶m); +} + +void bluetooth_enter_disconnected_kb(uint8_t host_idx) { + if (bt_factory_reset) { + bt_factory_reset = false; + ckbt51_param_init(); + } + /* CKBT51 bluetooth module boot time is slower, it enters disconnected after boot, + so we place initialization here. */ + if (firstDisconnect && sync_timer_read32() < 1000 && get_transport() == TRANSPORT_BLUETOOTH) { + ckbt51_param_init(); + bluetooth_connect(); + firstDisconnect = false; + } +} + +void ckbt51_default_ack_handler(uint8_t *data, uint8_t len) { + if (data[1] == 0x45) { + module_param_t param = {.event_mode = 0x02, + .connected_idle_timeout = 7200, + .pairing_timeout = 180, + .pairing_mode = 0, + .reconnect_timeout = 5, + .report_rate = 90, + .vendor_id_source = 1, + .verndor_id = 0, // Must be 0x3434 + .product_id = PRODUCT_ID}; + ckbt51_set_param(¶m); + } +} + +void bluetooth_pre_task(void) { + static uint8_t mode = 1; + + if (readPin(USB_BT_MODE_SELECT_PIN) != mode) { + if (readPin(USB_BT_MODE_SELECT_PIN) != mode) { + mode = readPin(USB_BT_MODE_SELECT_PIN); + set_transport(mode == 0 ? TRANSPORT_BLUETOOTH : TRANSPORT_USB); + } + } +} +#endif + +void battery_calculte_voltage(uint16_t value) { + uint16_t voltage = ((uint32_t)value) * 2246 / 1000; + +#ifdef LED_MATRIX_ENABLE + if (led_matrix_is_enabled()) { + uint32_t totalBuf = 0; + + for (uint8_t i = 0; i < DRIVER_COUNT; i++) + for (uint8_t j = 0; j < 192; j++) + totalBuf += g_pwm_buffer[i][j]; + /* We assumpt it is linear relationship*/ + voltage += (30 * totalBuf / LED_MATRIX_LED_COUNT / 255); + } +#endif +#ifdef RGB_MATRIX_ENABLE + if (rgb_matrix_is_enabled()) { + uint32_t totalBuf = 0; + + for (uint8_t i = 0; i < DRIVER_COUNT; i++) + for (uint8_t j = 0; j < 192; j++) + totalBuf += g_pwm_buffer[i][j]; + /* We assumpt it is linear relationship*/ + uint32_t compensation = 60 * totalBuf / RGB_MATRIX_LED_COUNT / 255 / 3; + voltage += compensation; + } +#endif + battery_set_voltage(voltage); +} + +bool via_command_kb(uint8_t *data, uint8_t length) { + switch (data[0]) { +#ifdef KC_BLUETOOTH_ENABLE + case 0xAA: + ckbt51_dfu_rx(data, length); + break; +#endif +#ifdef ENABLE_FACTORY_TEST + case 0xAB: + factory_test_rx(data, length); + break; +#endif + default: + return false; + } + + return true; +} + +#if !defined(VIA_ENABLE) +void raw_hid_receive(uint8_t *data, uint8_t length) { + switch (data[0]) { + case RAW_HID_CMD: + via_command_kb(data, length); + break; + } +} +#endif diff --git a/keyboards/keychron/q6_pro/q6_pro.h b/keyboards/keychron/q6_pro/q6_pro.h new file mode 100755 index 0000000000..cd0954d579 --- /dev/null +++ b/keyboards/keychron/q6_pro/q6_pro.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 . + */ + +#pragma once + +#include "quantum.h" +#ifdef VIA_ENABLE +# include "via.h" +#endif + +#define ___ KC_NO + +#ifdef VIA_ENABLE +# define USER_START QK_KB_0 +#else +# define USER_START SAFE_RANGE +#endif + +// clang-format off +enum { + KC_LOPTN = USER_START, + KC_ROPTN, + KC_LCMMD, + KC_RCMMD, + KC_TASK, + KC_FILE, + KC_SNAP, + KC_CTANA, + KC_SIRI, +#ifdef KC_BLUETOOTH_ENABLE + BT_HST1, + BT_HST2, + BT_HST3, + BAT_LVL, +#else + BT_HST1 = KC_TRNS, + BT_HST2 = KC_TRNS, + BT_HST3 = KC_TRNS, + BAT_LVL = KC_TRNS, +#endif + NEW_SAFE_RANGE +}; diff --git a/keyboards/keychron/q6_pro/readme.md b/keyboards/keychron/q6_pro/readme.md new file mode 100755 index 0000000000..fc901acb51 --- /dev/null +++ b/keyboards/keychron/q6_pro/readme.md @@ -0,0 +1,21 @@ +# Keychron Q6 Pro + +![Keychron Q6 Pro] + +A customizable 96% keyboard. + +* Keyboard Maintainer: [Keychron](https://github.com/keychron) +* Hardware Supported: Keychron Q6 Pro +* Hardware Availability: + +Make example for this keyboard (after setting up your build environment): + + make keychron/q6_pro/ansi_encoder:default + +Flashing example for this keyboard: + + make keychron/q6_pro/ansi_encoder: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". + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/keychron/q6_pro/rules.mk b/keyboards/keychron/q6_pro/rules.mk new file mode 100755 index 0000000000..4ff33fb268 --- /dev/null +++ b/keyboards/keychron/q6_pro/rules.mk @@ -0,0 +1,13 @@ +# Build Options +# change yes to no to disable +# +# 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 +OPT_DEFS += -DKC_BLUETOOTH_ENABLE + +CUSTOM_MATRIX = lite + +SRC += matrix.c + +include keyboards/keychron/bluetooth/bluetooth.mk diff --git a/keyboards/keychron/q6_pro/via_json/q6_pro_ansi_encoder.json b/keyboards/keychron/q6_pro/via_json/q6_pro_ansi_encoder.json new file mode 100644 index 0000000000..155a1f0fa5 --- /dev/null +++ b/keyboards/keychron/q6_pro/via_json/q6_pro_ansi_encoder.json @@ -0,0 +1,346 @@ +{ + "name": "Keychron Q6 Pro", + "vendorId": "0x3434", + "productId": "0x0660", + "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": 21}, + "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", + "0,16", + { + "x": 0.25, + "c": "#cccccc" + }, + "0,17", + "0,18", + "0,19", + "0,20" + ], + [ + { + "y": 0.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", + { + "x": 0.25, + "c": "#cccccc" + }, + "1,17", + "1,18", + "1,19", + "1,20" + ], + [ + { + "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", + { + "x": 0.25, + "c": "#cccccc" + }, + "2,17", + "2,18", + "2,19", + { + "h": 2 + }, + "2,20" + ], + [ + { + "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", + { + "x": 3.5, + "c": "#cccccc" + }, + "3,17", + "3,18", + "3,19" + ], + [ + { + "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", + { + "x": 1.25, + "c": "#cccccc" + }, + "4,17", + "4,18", + "4,19", + { + "h": 2 + }, + "4,20" + ], + [ + { + "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", + { + "x": 0.25, + "c": "#cccccc", + "w": 2 + }, + "5,18", + "5,19" + ] + ] + } +} From b4a1428ecc2a693d48a0124e996f1b754f9c9fa9 Mon Sep 17 00:00:00 2001 From: lalalademaxiya1 <66767061+lalalademaxiya1@users.noreply.github.com> Date: Mon, 22 May 2023 12:07:58 +0800 Subject: [PATCH 02/17] Update q6 pro --- .../q6_pro/ansi_encoder/keymaps/default/rules.mk | 1 + .../q6_pro/ansi_encoder/keymaps/via/rules.mk | 1 + keyboards/keychron/q6_pro/info.json | 1 - keyboards/keychron/q6_pro/matrix.c | 16 ++++++---------- keyboards/keychron/q6_pro/q6_pro.c | 4 ++-- 5 files changed, 10 insertions(+), 13 deletions(-) create mode 100644 keyboards/keychron/q6_pro/ansi_encoder/keymaps/default/rules.mk diff --git a/keyboards/keychron/q6_pro/ansi_encoder/keymaps/default/rules.mk b/keyboards/keychron/q6_pro/ansi_encoder/keymaps/default/rules.mk new file mode 100644 index 0000000000..98eb98e882 --- /dev/null +++ b/keyboards/keychron/q6_pro/ansi_encoder/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP = yes diff --git a/keyboards/keychron/q6_pro/ansi_encoder/keymaps/via/rules.mk b/keyboards/keychron/q6_pro/ansi_encoder/keymaps/via/rules.mk index 1e5b99807c..b8c56c84c0 100644 --- a/keyboards/keychron/q6_pro/ansi_encoder/keymaps/via/rules.mk +++ b/keyboards/keychron/q6_pro/ansi_encoder/keymaps/via/rules.mk @@ -1 +1,2 @@ VIA_ENABLE = yes +ENCODER_MAP = yes diff --git a/keyboards/keychron/q6_pro/info.json b/keyboards/keychron/q6_pro/info.json index 186a4e2edd..02eef80f89 100755 --- a/keyboards/keychron/q6_pro/info.json +++ b/keyboards/keychron/q6_pro/info.json @@ -16,7 +16,6 @@ "dip_switch": true, "bluetooth": false, "encoder": true, - "encoder_map": true, "raw": true }, "rgb_matrix": { diff --git a/keyboards/keychron/q6_pro/matrix.c b/keyboards/keychron/q6_pro/matrix.c index 1c0dbdc537..deecad8a49 100644 --- a/keyboards/keychron/q6_pro/matrix.c +++ b/keyboards/keychron/q6_pro/matrix.c @@ -20,6 +20,8 @@ #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; @@ -47,10 +49,10 @@ static void HC595_output(uint32_t data, bool bit) { } else { writePinLow(HC595_DS); } + HC595_delay(n); writePinHigh(HC595_SHCP); HC595_delay(n); writePinLow(HC595_SHCP); - HC595_delay(n); if (bit) { break; } else { @@ -60,17 +62,15 @@ static void HC595_output(uint32_t data, bool bit) { writePinHigh(HC595_STCP); HC595_delay(n); writePinLow(HC595_STCP); - HC595_delay(n); } static void select_col(uint8_t col) { - if (col == 0) { + if (col == DIRECT_COL_NUM) { HC595_output(0x00, 1); } } -static void unselect_col(uint8_t col) { - (void)col; +static void unselect_col(void) { HC595_output(0X01, 1); } @@ -87,10 +87,6 @@ static void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t curre // Select col select_col(current_col); // select col - // if (!select_col(current_col)) { // select col - // return; // skip NO_PIN col - // } - matrix_output_select_delay(); // For each row... @@ -107,7 +103,7 @@ static void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t curre } // Unselect col - unselect_col(current_col); + unselect_col(); matrix_output_unselect_delay(current_col, key_pressed); // wait for all Row signals to go HIGH } diff --git a/keyboards/keychron/q6_pro/q6_pro.c b/keyboards/keychron/q6_pro/q6_pro.c index e50f245b5d..cff287f7eb 100755 --- a/keyboards/keychron/q6_pro/q6_pro.c +++ b/keyboards/keychron/q6_pro/q6_pro.c @@ -119,7 +119,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { break; case BAT_LVL: if (get_transport() == TRANSPORT_BLUETOOTH && !usb_power_connected()) { - bat_level_animation_start(battery_get_percentage()); + bat_level_animiation_start(battery_get_percentage()); } break; #endif @@ -134,7 +134,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { #if defined(ENCODER_ENABLE) && defined(PAL_USE_CALLBACKS) static void encoder_pad_cb(void *param) { - encoder_interrupt_read((uint32_t)param & 0XFF); + encoder_inerrupt_read((uint32_t)param & 0XFF); } #endif From c7b9295b75dab42633dab7bfb3eff13016f7ffd1 Mon Sep 17 00:00:00 2001 From: lalalademaxiya1 <66767061+lalalademaxiya1@users.noreply.github.com> Date: Wed, 24 May 2023 09:30:10 +0800 Subject: [PATCH 03/17] Correct encoder map definition spelling --- .../keychron/q6_pro/ansi_encoder/info.json | 120 ------------------ .../ansi_encoder/keymaps/default/rules.mk | 2 +- .../q6_pro/ansi_encoder/keymaps/via/rules.mk | 2 +- keyboards/keychron/q6_pro/info.json | 120 ++++++++++++++++++ 4 files changed, 122 insertions(+), 122 deletions(-) diff --git a/keyboards/keychron/q6_pro/ansi_encoder/info.json b/keyboards/keychron/q6_pro/ansi_encoder/info.json index 668610b5cf..70d32029e4 100755 --- a/keyboards/keychron/q6_pro/ansi_encoder/info.json +++ b/keyboards/keychron/q6_pro/ansi_encoder/info.json @@ -3,126 +3,6 @@ "pid": "0x0660", "device_version": "1.0.0" }, - "layouts": { - "LAYOUT": { - "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.25, "y":0}, - {"matrix":[0,15], "x":16.25, "y":0}, - {"matrix":[0,16], "x":17.25, "y":0}, - {"matrix":[0,17], "x":18.5, "y":0}, - {"matrix":[0,18], "x":19.5, "y":0}, - {"matrix":[0,19], "x":20.5, "y":0}, - {"matrix":[0,20], "x":21.5, "y":0}, - - {"matrix":[1, 0], "x":0, "y":1.25}, - {"matrix":[1, 1], "x":1, "y":1.25}, - {"matrix":[1, 2], "x":2, "y":1.25}, - {"matrix":[1, 3], "x":3, "y":1.25}, - {"matrix":[1, 4], "x":4, "y":1.25}, - {"matrix":[1, 5], "x":5, "y":1.25}, - {"matrix":[1, 6], "x":6, "y":1.25}, - {"matrix":[1, 7], "x":7, "y":1.25}, - {"matrix":[1, 8], "x":8, "y":1.25}, - {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,14], "x":15.25, "y":1.25}, - {"matrix":[1,15], "x":16.25, "y":1.25}, - {"matrix":[1,16], "x":17.25, "y":1.25}, - {"matrix":[1,17], "x":18.5, "y":1.25}, - {"matrix":[1,18], "x":19.5, "y":1.25}, - {"matrix":[1,19], "x":20.5, "y":1.25}, - {"matrix":[1,20], "x":21.5, "y":1.25}, - - {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, - {"matrix":[2, 1], "x":1.5, "y":2.25}, - {"matrix":[2, 2], "x":2.5, "y":2.25}, - {"matrix":[2, 3], "x":3.5, "y":2.25}, - {"matrix":[2, 4], "x":4.5, "y":2.25}, - {"matrix":[2, 5], "x":5.5, "y":2.25}, - {"matrix":[2, 6], "x":6.5, "y":2.25}, - {"matrix":[2, 7], "x":7.5, "y":2.25}, - {"matrix":[2, 8], "x":8.5, "y":2.25}, - {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5}, - {"matrix":[2,14], "x":15.25, "y":2.25}, - {"matrix":[2,15], "x":16.25, "y":2.25}, - {"matrix":[2,16], "x":17.25, "y":2.25}, - {"matrix":[2,17], "x":18.5, "y":2.25}, - {"matrix":[2,18], "x":19.5, "y":2.25}, - {"matrix":[2,19], "x":20.5, "y":2.25}, - {"matrix":[2,20], "x":21.5, "y":2.25, "h":2}, - - {"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":[3,17], "x":18.5, "y":3.25}, - {"matrix":[3,18], "x":19.5, "y":3.25}, - {"matrix":[3,19], "x":20.5, "y":3.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.25, "y":4.25}, - {"matrix":[4,17], "x":18.5, "y":4.25}, - {"matrix":[4,18], "x":19.5, "y":4.25}, - {"matrix":[4,19], "x":20.5, "y":4.25}, - {"matrix":[4,20], "x":21.5, "y":4.25, "h":2}, - - {"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.25, "y":5.25}, - {"matrix":[5,15], "x":16.25, "y":5.25}, - {"matrix":[5,16], "x":17.25, "y":5.25}, - {"matrix":[5,18], "x":18.5, "y":5.25, "w":2}, - {"matrix":[5,19], "x":20.5, "y":5.25} - ] - } - }, "rgb_matrix": { "layout": [ {"matrix":[0, 0], "flags":1, "x":0, "y":0}, diff --git a/keyboards/keychron/q6_pro/ansi_encoder/keymaps/default/rules.mk b/keyboards/keychron/q6_pro/ansi_encoder/keymaps/default/rules.mk index 98eb98e882..ee32568148 100644 --- a/keyboards/keychron/q6_pro/ansi_encoder/keymaps/default/rules.mk +++ b/keyboards/keychron/q6_pro/ansi_encoder/keymaps/default/rules.mk @@ -1 +1 @@ -ENCODER_MAP = yes +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/keychron/q6_pro/ansi_encoder/keymaps/via/rules.mk b/keyboards/keychron/q6_pro/ansi_encoder/keymaps/via/rules.mk index b8c56c84c0..f1adcab005 100644 --- a/keyboards/keychron/q6_pro/ansi_encoder/keymaps/via/rules.mk +++ b/keyboards/keychron/q6_pro/ansi_encoder/keymaps/via/rules.mk @@ -1,2 +1,2 @@ VIA_ENABLE = yes -ENCODER_MAP = yes +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/keychron/q6_pro/info.json b/keyboards/keychron/q6_pro/info.json index 02eef80f89..b94b557345 100755 --- a/keyboards/keychron/q6_pro/info.json +++ b/keyboards/keychron/q6_pro/info.json @@ -59,5 +59,125 @@ "rotary": [ {"pin_a": "A0", "pin_b": "A10"} ] + }, + "layouts": { + "LAYOUT": { + "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.25, "y":0}, + {"matrix":[0,15], "x":16.25, "y":0}, + {"matrix":[0,16], "x":17.25, "y":0}, + {"matrix":[0,17], "x":18.5, "y":0}, + {"matrix":[0,18], "x":19.5, "y":0}, + {"matrix":[0,19], "x":20.5, "y":0}, + {"matrix":[0,20], "x":21.5, "y":0}, + + {"matrix":[1, 0], "x":0, "y":1.25}, + {"matrix":[1, 1], "x":1, "y":1.25}, + {"matrix":[1, 2], "x":2, "y":1.25}, + {"matrix":[1, 3], "x":3, "y":1.25}, + {"matrix":[1, 4], "x":4, "y":1.25}, + {"matrix":[1, 5], "x":5, "y":1.25}, + {"matrix":[1, 6], "x":6, "y":1.25}, + {"matrix":[1, 7], "x":7, "y":1.25}, + {"matrix":[1, 8], "x":8, "y":1.25}, + {"matrix":[1, 9], "x":9, "y":1.25}, + {"matrix":[1,10], "x":10, "y":1.25}, + {"matrix":[1,11], "x":11, "y":1.25}, + {"matrix":[1,12], "x":12, "y":1.25}, + {"matrix":[1,13], "x":13, "y":1.25, "w":2}, + {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1,15], "x":16.25, "y":1.25}, + {"matrix":[1,16], "x":17.25, "y":1.25}, + {"matrix":[1,17], "x":18.5, "y":1.25}, + {"matrix":[1,18], "x":19.5, "y":1.25}, + {"matrix":[1,19], "x":20.5, "y":1.25}, + {"matrix":[1,20], "x":21.5, "y":1.25}, + + {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, + {"matrix":[2, 1], "x":1.5, "y":2.25}, + {"matrix":[2, 2], "x":2.5, "y":2.25}, + {"matrix":[2, 3], "x":3.5, "y":2.25}, + {"matrix":[2, 4], "x":4.5, "y":2.25}, + {"matrix":[2, 5], "x":5.5, "y":2.25}, + {"matrix":[2, 6], "x":6.5, "y":2.25}, + {"matrix":[2, 7], "x":7.5, "y":2.25}, + {"matrix":[2, 8], "x":8.5, "y":2.25}, + {"matrix":[2, 9], "x":9.5, "y":2.25}, + {"matrix":[2,10], "x":10.5, "y":2.25}, + {"matrix":[2,11], "x":11.5, "y":2.25}, + {"matrix":[2,12], "x":12.5, "y":2.25}, + {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5}, + {"matrix":[2,14], "x":15.25, "y":2.25}, + {"matrix":[2,15], "x":16.25, "y":2.25}, + {"matrix":[2,16], "x":17.25, "y":2.25}, + {"matrix":[2,17], "x":18.5, "y":2.25}, + {"matrix":[2,18], "x":19.5, "y":2.25}, + {"matrix":[2,19], "x":20.5, "y":2.25}, + {"matrix":[2,20], "x":21.5, "y":2.25, "h":2}, + + {"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":[3,17], "x":18.5, "y":3.25}, + {"matrix":[3,18], "x":19.5, "y":3.25}, + {"matrix":[3,19], "x":20.5, "y":3.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.25, "y":4.25}, + {"matrix":[4,17], "x":18.5, "y":4.25}, + {"matrix":[4,18], "x":19.5, "y":4.25}, + {"matrix":[4,19], "x":20.5, "y":4.25}, + {"matrix":[4,20], "x":21.5, "y":4.25, "h":2}, + + {"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.25, "y":5.25}, + {"matrix":[5,15], "x":16.25, "y":5.25}, + {"matrix":[5,16], "x":17.25, "y":5.25}, + {"matrix":[5,18], "x":18.5, "y":5.25, "w":2}, + {"matrix":[5,19], "x":20.5, "y":5.25} + ] + } } } From ef737f8529ad964aeca85bff62d9762e6b2ba621 Mon Sep 17 00:00:00 2001 From: lalalademaxiya1 <2831039915@qq.com> Date: Mon, 5 Jun 2023 15:48:12 +0800 Subject: [PATCH 04/17] Update q6_pro.c --- keyboards/keychron/q6_pro/q6_pro.c | 47 ++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/keyboards/keychron/q6_pro/q6_pro.c b/keyboards/keychron/q6_pro/q6_pro.c index cff287f7eb..10759ea81d 100755 --- a/keyboards/keychron/q6_pro/q6_pro.c +++ b/keyboards/keychron/q6_pro/q6_pro.c @@ -36,6 +36,7 @@ typedef struct PACKED { uint8_t keycode[3]; } key_combination_t; +static uint32_t factory_timer_buffer = 0; static uint32_t power_on_indicator_timer_buffer; static uint32_t siri_timer_buffer = 0; static uint8_t mac_keycode[4] = {KC_LOPT, KC_ROPT, KC_LCMD, KC_RCMD}; @@ -143,7 +144,9 @@ 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_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. @@ -171,7 +174,20 @@ void keyboard_post_init_kb(void) { keyboard_post_init_user(); } +static void ckbt51_param_init(void); + void matrix_scan_kb(void) { + if (factory_timer_buffer && timer_elapsed32(factory_timer_buffer) > 20000) { + factory_timer_buffer = 0; + if (bt_factory_reset) { + bt_factory_reset = false; + ckbt51_param_init(); + palWriteLine(CKBT51_RESET_PIN, PAL_LOW); + wait_ms(5); + palWriteLine(CKBT51_RESET_PIN, PAL_HIGH); + } + } + if (power_on_indicator_timer_buffer) { if (sync_timer_elapsed32(power_on_indicator_timer_buffer) > POWER_ON_LED_DURATION) { power_on_indicator_timer_buffer = 0; @@ -198,6 +214,7 @@ static void ckbt51_param_init(void) { /* Set bluetooth device name */ // ckbt51_set_local_name(STR(PRODUCT)); ckbt51_set_local_name(PRODUCT); + wait_ms(10); /* Set bluetooth parameters */ module_param_t param = {.event_mode = 0x02, .connected_idle_timeout = 7200, @@ -213,9 +230,9 @@ 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. */ if (firstDisconnect && sync_timer_read32() < 1000 && get_transport() == TRANSPORT_BLUETOOTH) { @@ -226,18 +243,18 @@ void bluetooth_enter_disconnected_kb(uint8_t host_idx) { } void ckbt51_default_ack_handler(uint8_t *data, uint8_t len) { - if (data[1] == 0x45) { - module_param_t param = {.event_mode = 0x02, - .connected_idle_timeout = 7200, - .pairing_timeout = 180, - .pairing_mode = 0, - .reconnect_timeout = 5, - .report_rate = 90, - .vendor_id_source = 1, - .verndor_id = 0, // Must be 0x3434 - .product_id = PRODUCT_ID}; - ckbt51_set_param(¶m); - } + // if (data[1] == 0x45) { + // module_param_t param = {.event_mode = 0x02, + // .connected_idle_timeout = 7200, + // .pairing_timeout = 180, + // .pairing_mode = 0, + // .reconnect_timeout = 5, + // .report_rate = 90, + // .vendor_id_source = 1, + // .verndor_id = 0, // Must be 0x3434 + // .product_id = PRODUCT_ID}; + // ckbt51_set_param(¶m); + // } } void bluetooth_pre_task(void) { From 3707b542c498ab833c0829c99de2102d01410adf Mon Sep 17 00:00:00 2001 From: lalalademaxiya1 <2831039915@qq.com> Date: Mon, 5 Jun 2023 17:23:24 +0800 Subject: [PATCH 05/17] Update q6_pro.c fixed the wrong pid and device name after factory reset --- keyboards/keychron/q6_pro/q6_pro.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/keyboards/keychron/q6_pro/q6_pro.c b/keyboards/keychron/q6_pro/q6_pro.c index 10759ea81d..5ad0d2d5f6 100755 --- a/keyboards/keychron/q6_pro/q6_pro.c +++ b/keyboards/keychron/q6_pro/q6_pro.c @@ -87,6 +87,9 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { } return false; // Skip all further processing of this key) case KC_TASK: + if (record->event.pressed) { + ckbt51_factory_reset(); + } case KC_FILE: case KC_SNAP: case KC_CTANA: @@ -177,11 +180,10 @@ void keyboard_post_init_kb(void) { static void ckbt51_param_init(void); void matrix_scan_kb(void) { - if (factory_timer_buffer && timer_elapsed32(factory_timer_buffer) > 20000) { + if (factory_timer_buffer && timer_elapsed32(factory_timer_buffer) > 2000) { factory_timer_buffer = 0; if (bt_factory_reset) { bt_factory_reset = false; - ckbt51_param_init(); palWriteLine(CKBT51_RESET_PIN, PAL_LOW); wait_ms(5); palWriteLine(CKBT51_RESET_PIN, PAL_HIGH); @@ -214,7 +216,6 @@ static void ckbt51_param_init(void) { /* Set bluetooth device name */ // ckbt51_set_local_name(STR(PRODUCT)); ckbt51_set_local_name(PRODUCT); - wait_ms(10); /* Set bluetooth parameters */ module_param_t param = {.event_mode = 0x02, .connected_idle_timeout = 7200, @@ -230,6 +231,7 @@ static void ckbt51_param_init(void) { void bluetooth_enter_disconnected_kb(uint8_t host_idx) { if (bt_factory_reset) { + ckbt51_param_init(); factory_timer_buffer = timer_read32(); } From 921a6749fd301f0ad38bb733ae8423b8de528123 Mon Sep 17 00:00:00 2001 From: lalalademaxiya1 <2831039915@qq.com> Date: Tue, 6 Jun 2023 10:29:00 +0800 Subject: [PATCH 06/17] Update k6_pro.c --- keyboards/keychron/q6_pro/q6_pro.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/keyboards/keychron/q6_pro/q6_pro.c b/keyboards/keychron/q6_pro/q6_pro.c index 5ad0d2d5f6..1b34937659 100755 --- a/keyboards/keychron/q6_pro/q6_pro.c +++ b/keyboards/keychron/q6_pro/q6_pro.c @@ -185,7 +185,7 @@ void matrix_scan_kb(void) { if (bt_factory_reset) { bt_factory_reset = false; palWriteLine(CKBT51_RESET_PIN, PAL_LOW); - wait_ms(5); + wait_ms(10); palWriteLine(CKBT51_RESET_PIN, PAL_HIGH); } } @@ -216,6 +216,7 @@ static void ckbt51_param_init(void) { /* Set bluetooth device name */ // ckbt51_set_local_name(STR(PRODUCT)); ckbt51_set_local_name(PRODUCT); + wait_ms(10); /* Set bluetooth parameters */ module_param_t param = {.event_mode = 0x02, .connected_idle_timeout = 7200, @@ -227,6 +228,7 @@ static void ckbt51_param_init(void) { .verndor_id = 0, // Must be 0x3434 .product_id = PRODUCT_ID}; ckbt51_set_param(¶m); + wait_ms(10); } void bluetooth_enter_disconnected_kb(uint8_t host_idx) { @@ -238,6 +240,8 @@ void bluetooth_enter_disconnected_kb(uint8_t host_idx) { /* CKBT51 bluetooth module boot time is slower, it enters disconnected after boot, so we place initialization here. */ if (firstDisconnect && sync_timer_read32() < 1000 && get_transport() == TRANSPORT_BLUETOOTH) { + ckbt51_set_local_name(PRODUCT); + ckbt51_param_init(); bluetooth_connect(); firstDisconnect = false; From 17671f67c85c226d816af3c79ef694e8be63dfde Mon Sep 17 00:00:00 2001 From: lalalademaxiya1 <2831039915@qq.com> Date: Thu, 8 Jun 2023 10:12:57 +0800 Subject: [PATCH 07/17] Fix key keep down after keyboard waked up --- keyboards/keychron/bluetooth/transport.c | 3 +++ keyboards/keychron/q6_pro/q6_pro.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/keyboards/keychron/bluetooth/transport.c b/keyboards/keychron/bluetooth/transport.c index e5986de11b..6c86906322 100644 --- a/keyboards/keychron/bluetooth/transport.c +++ b/keyboards/keychron/bluetooth/transport.c @@ -183,6 +183,9 @@ void usb_remote_wakeup(void) { usb_wakeup(&USB_DRIVER); } } + // palWriteLine(H3, PAL_HIGH); + wait_ms(500); + // palWriteLine(H3, PAL_LOW); /* Woken up */ // variables has been already cleared by the wakeup hook send_keyboard_report(); diff --git a/keyboards/keychron/q6_pro/q6_pro.c b/keyboards/keychron/q6_pro/q6_pro.c index 1b34937659..5ecc2cc485 100755 --- a/keyboards/keychron/q6_pro/q6_pro.c +++ b/keyboards/keychron/q6_pro/q6_pro.c @@ -151,6 +151,9 @@ void keyboard_post_init_kb(void) { palSetLineMode(CKBT51_RESET_PIN, PAL_MODE_OUTPUT_PUSHPULL); palWriteLine(CKBT51_RESET_PIN, PAL_HIGH); + palSetLineMode(H3, PAL_MODE_OUTPUT_PUSHPULL); + palWriteLine(H3, PAL_LOW); + /* IMPORTANT: DO NOT enable internal pull-up resistor * as there is an external pull-down resistor. */ From 21c86782afa0fa5dd45cd6f8d3eb1e38fad7a3e2 Mon Sep 17 00:00:00 2001 From: lalalademaxiya1 <2831039915@qq.com> Date: Mon, 19 Jun 2023 10:11:51 +0800 Subject: [PATCH 08/17] Add q6 pro iso --- .../keychron/q6_pro/ansi_encoder/config.h | 2 +- .../keychron/q6_pro/ansi_encoder/info.json | 128 ++++++- .../ansi_encoder/keymaps/default/keymap.c | 10 +- .../q6_pro/ansi_encoder/keymaps/via/keymap.c | 10 +- keyboards/keychron/q6_pro/config.h | 4 +- keyboards/keychron/q6_pro/info.json | 133 +------ .../keychron/q6_pro/iso_encoder/config.h | 51 +++ .../keychron/q6_pro/iso_encoder/info.json | 245 ++++++++++++ .../keychron/q6_pro/iso_encoder/iso_encoder.c | 143 +++++++ .../iso_encoder/keymaps/default/keymap.c | 65 ++++ .../iso_encoder/keymaps/default/rules.mk | 1 + .../q6_pro/iso_encoder/keymaps/via/keymap.c | 65 ++++ .../q6_pro/iso_encoder/keymaps/via/rules.mk | 2 + .../keychron/q6_pro/iso_encoder/rules.mk | 1 + keyboards/keychron/q6_pro/matrix.c | 101 +++-- keyboards/keychron/q6_pro/q6_pro.c | 50 ++- keyboards/keychron/q6_pro/readme.md | 2 + keyboards/keychron/q6_pro/rules.mk | 5 - .../q6_pro/via_json/q6_pro_ansi_encoder.json | 2 +- .../q6_pro/via_json/q6_pro_iso_encoder.json | 352 ++++++++++++++++++ 20 files changed, 1171 insertions(+), 201 deletions(-) create mode 100755 keyboards/keychron/q6_pro/iso_encoder/config.h create mode 100755 keyboards/keychron/q6_pro/iso_encoder/info.json create mode 100755 keyboards/keychron/q6_pro/iso_encoder/iso_encoder.c create mode 100755 keyboards/keychron/q6_pro/iso_encoder/keymaps/default/keymap.c create mode 100755 keyboards/keychron/q6_pro/iso_encoder/keymaps/default/rules.mk create mode 100755 keyboards/keychron/q6_pro/iso_encoder/keymaps/via/keymap.c create mode 100755 keyboards/keychron/q6_pro/iso_encoder/keymaps/via/rules.mk create mode 100755 keyboards/keychron/q6_pro/iso_encoder/rules.mk create mode 100755 keyboards/keychron/q6_pro/via_json/q6_pro_iso_encoder.json diff --git a/keyboards/keychron/q6_pro/ansi_encoder/config.h b/keyboards/keychron/q6_pro/ansi_encoder/config.h index c31a7acb10..1434cc669c 100755 --- a/keyboards/keychron/q6_pro/ansi_encoder/config.h +++ b/keyboards/keychron/q6_pro/ansi_encoder/config.h @@ -34,6 +34,7 @@ /* Turn off backllit if brightness value is low */ # define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48 +/* Indication led */ # define NUM_LOCK_INDEX 37 # define CAPS_LOCK_INDEX 62 # define LOW_BAT_IND_INDEX 98 @@ -47,5 +48,4 @@ /* 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/q6_pro/ansi_encoder/info.json b/keyboards/keychron/q6_pro/ansi_encoder/info.json index 70d32029e4..1e2440e21e 100755 --- a/keyboards/keychron/q6_pro/ansi_encoder/info.json +++ b/keyboards/keychron/q6_pro/ansi_encoder/info.json @@ -3,6 +3,126 @@ "pid": "0x0660", "device_version": "1.0.0" }, + "layouts": { + "LAYOUT_109_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.25, "y":0}, + {"matrix":[0,15], "x":16.25, "y":0}, + {"matrix":[0,16], "x":17.25, "y":0}, + {"matrix":[0,17], "x":18.5, "y":0}, + {"matrix":[0,18], "x":19.5, "y":0}, + {"matrix":[0,19], "x":20.5, "y":0}, + {"matrix":[0,20], "x":21.5, "y":0}, + + {"matrix":[1, 0], "x":0, "y":1.25}, + {"matrix":[1, 1], "x":1, "y":1.25}, + {"matrix":[1, 2], "x":2, "y":1.25}, + {"matrix":[1, 3], "x":3, "y":1.25}, + {"matrix":[1, 4], "x":4, "y":1.25}, + {"matrix":[1, 5], "x":5, "y":1.25}, + {"matrix":[1, 6], "x":6, "y":1.25}, + {"matrix":[1, 7], "x":7, "y":1.25}, + {"matrix":[1, 8], "x":8, "y":1.25}, + {"matrix":[1, 9], "x":9, "y":1.25}, + {"matrix":[1,10], "x":10, "y":1.25}, + {"matrix":[1,11], "x":11, "y":1.25}, + {"matrix":[1,12], "x":12, "y":1.25}, + {"matrix":[1,13], "x":13, "y":1.25, "w":2}, + {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1,15], "x":16.25, "y":1.25}, + {"matrix":[1,16], "x":17.25, "y":1.25}, + {"matrix":[1,17], "x":18.5, "y":1.25}, + {"matrix":[1,18], "x":19.5, "y":1.25}, + {"matrix":[1,19], "x":20.5, "y":1.25}, + {"matrix":[1,20], "x":21.5, "y":1.25}, + + {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, + {"matrix":[2, 1], "x":1.5, "y":2.25}, + {"matrix":[2, 2], "x":2.5, "y":2.25}, + {"matrix":[2, 3], "x":3.5, "y":2.25}, + {"matrix":[2, 4], "x":4.5, "y":2.25}, + {"matrix":[2, 5], "x":5.5, "y":2.25}, + {"matrix":[2, 6], "x":6.5, "y":2.25}, + {"matrix":[2, 7], "x":7.5, "y":2.25}, + {"matrix":[2, 8], "x":8.5, "y":2.25}, + {"matrix":[2, 9], "x":9.5, "y":2.25}, + {"matrix":[2,10], "x":10.5, "y":2.25}, + {"matrix":[2,11], "x":11.5, "y":2.25}, + {"matrix":[2,12], "x":12.5, "y":2.25}, + {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5}, + {"matrix":[2,14], "x":15.25, "y":2.25}, + {"matrix":[2,15], "x":16.25, "y":2.25}, + {"matrix":[2,16], "x":17.25, "y":2.25}, + {"matrix":[2,17], "x":18.5, "y":2.25}, + {"matrix":[2,18], "x":19.5, "y":2.25}, + {"matrix":[2,19], "x":20.5, "y":2.25}, + {"matrix":[2,20], "x":21.5, "y":2.25, "h":2}, + + {"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":[3,17], "x":18.5, "y":3.25}, + {"matrix":[3,18], "x":19.5, "y":3.25}, + {"matrix":[3,19], "x":20.5, "y":3.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.25, "y":4.25}, + {"matrix":[4,17], "x":18.5, "y":4.25}, + {"matrix":[4,18], "x":19.5, "y":4.25}, + {"matrix":[4,19], "x":20.5, "y":4.25}, + {"matrix":[4,20], "x":21.5, "y":4.25, "h":2}, + + {"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.25, "y":5.25}, + {"matrix":[5,15], "x":16.25, "y":5.25}, + {"matrix":[5,16], "x":17.25, "y":5.25}, + {"matrix":[5,18], "x":18.5, "y":5.25, "w":2}, + {"matrix":[5,19], "x":20.5, "y":5.25} + ] + } + }, "rgb_matrix": { "layout": [ {"matrix":[0, 0], "flags":1, "x":0, "y":0}, @@ -39,7 +159,7 @@ {"matrix":[1, 10], "flags":4, "x":104, "y":15}, {"matrix":[1, 11], "flags":4, "x":115, "y":15}, {"matrix":[1, 12], "flags":4, "x":125, "y":15}, - {"matrix":[1, 13], "flags":4, "x":141, "y":15}, + {"matrix":[1, 13], "flags":1, "x":141, "y":15}, {"matrix":[1, 14], "flags":1, "x":159, "y":15}, {"matrix":[1, 15], "flags":1, "x":169, "y":15}, {"matrix":[1, 16], "flags":1, "x":180, "y":15}, @@ -52,7 +172,7 @@ {"matrix":[2, 1], "flags":4, "x":16, "y":27}, {"matrix":[2, 2], "flags":4, "x":26, "y":27}, {"matrix":[2, 3], "flags":4, "x":36, "y":27}, - {"matrix":[2, 4], "flags":1, "x":47, "y":27}, + {"matrix":[2, 4], "flags":4, "x":47, "y":27}, {"matrix":[2, 5], "flags":4, "x":57, "y":27}, {"matrix":[2, 6], "flags":4, "x":68, "y":27}, {"matrix":[2, 7], "flags":4, "x":78, "y":27}, @@ -61,7 +181,7 @@ {"matrix":[2, 10], "flags":4, "x":109, "y":27}, {"matrix":[2, 11], "flags":4, "x":120, "y":27}, {"matrix":[2, 12], "flags":4, "x":130, "y":27}, - {"matrix":[2, 13], "flags":4, "x":143, "y":27}, + {"matrix":[2, 13], "flags":1, "x":143, "y":27}, {"matrix":[2, 14], "flags":1, "x":159, "y":27}, {"matrix":[2, 15], "flags":1, "x":169, "y":27}, {"matrix":[2, 16], "flags":1, "x":180, "y":27}, @@ -111,7 +231,7 @@ {"matrix":[5, 6], "flags":4, "x":66, "y":64}, {"matrix":[5, 10], "flags":1, "x":105, "y":64}, {"matrix":[5, 11], "flags":1, "x":118, "y":64}, - {"matrix":[5, 12], "flags":4, "x":131, "y":64}, + {"matrix":[5, 12], "flags":1, "x":131, "y":64}, {"matrix":[5, 13], "flags":1, "x":145, "y":64}, {"matrix":[5, 14], "flags":1, "x":159, "y":64}, {"matrix":[5, 15], "flags":1, "x":169, "y":64}, diff --git a/keyboards/keychron/q6_pro/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q6_pro/ansi_encoder/keymaps/default/keymap.c index c5277f5593..237cafbd58 100755 --- a/keyboards/keychron/q6_pro/ansi_encoder/keymaps/default/keymap.c +++ b/keyboards/keychron/q6_pro/ansi_encoder/keymaps/default/keymap.c @@ -21,32 +21,32 @@ enum layers{ MAC_BASE, MAC_FN, WIN_BASE, - WIN_FN + WIN_FN, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [MAC_BASE] = LAYOUT( + [MAC_BASE] = LAYOUT_109_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_F13, KC_F14, KC_F15, KC_F16, 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_NUM, KC_PSLS, KC_PAST, KC_PMNS, 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_P7, KC_P8, KC_P9, KC_PPLS, 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_P4, KC_P5, KC_P6, 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_P1, KC_P2, KC_P3, KC_PENT, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), - [MAC_FN] = LAYOUT( + [MAC_FN] = LAYOUT_109_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( + [WIN_BASE] = LAYOUT_109_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_NUM, KC_PSLS, KC_PAST, KC_PMNS, 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_P7, KC_P8, KC_P9, KC_PPLS, 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_P4, KC_P5, KC_P6, 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_P1, KC_P2, KC_P3, KC_PENT, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), - [WIN_FN] = LAYOUT( + [WIN_FN] = LAYOUT_109_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, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/keychron/q6_pro/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q6_pro/ansi_encoder/keymaps/via/keymap.c index c5277f5593..237cafbd58 100755 --- a/keyboards/keychron/q6_pro/ansi_encoder/keymaps/via/keymap.c +++ b/keyboards/keychron/q6_pro/ansi_encoder/keymaps/via/keymap.c @@ -21,32 +21,32 @@ enum layers{ MAC_BASE, MAC_FN, WIN_BASE, - WIN_FN + WIN_FN, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [MAC_BASE] = LAYOUT( + [MAC_BASE] = LAYOUT_109_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_F13, KC_F14, KC_F15, KC_F16, 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_NUM, KC_PSLS, KC_PAST, KC_PMNS, 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_P7, KC_P8, KC_P9, KC_PPLS, 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_P4, KC_P5, KC_P6, 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_P1, KC_P2, KC_P3, KC_PENT, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), - [MAC_FN] = LAYOUT( + [MAC_FN] = LAYOUT_109_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( + [WIN_BASE] = LAYOUT_109_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_NUM, KC_PSLS, KC_PAST, KC_PMNS, 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_P7, KC_P8, KC_P9, KC_PPLS, 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_P4, KC_P5, KC_P6, 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_P1, KC_P2, KC_P3, KC_PENT, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), - [WIN_FN] = LAYOUT( + [WIN_FN] = LAYOUT_109_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, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/keychron/q6_pro/config.h b/keyboards/keychron/q6_pro/config.h index f7b7305458..2d8b8e11c4 100755 --- a/keyboards/keychron/q6_pro/config.h +++ b/keyboards/keychron/q6_pro/config.h @@ -18,10 +18,10 @@ /* turn off effects when suspended */ #define RGB_DISABLE_WHEN_USB_SUSPENDED -#define LED_DISABLE_WHEN_USB_SUSPENDED /* DIP switch */ -#define DIP_SWITCH_PINS { A8 } +#define DIP_SWITCH_PINS \ + { A8 } /* Increase I2C speed to 1000 KHz */ #define I2C1_TIMINGR_PRESC 0U diff --git a/keyboards/keychron/q6_pro/info.json b/keyboards/keychron/q6_pro/info.json index b94b557345..9235c9aa70 100755 --- a/keyboards/keychron/q6_pro/info.json +++ b/keyboards/keychron/q6_pro/info.json @@ -5,6 +5,9 @@ "maintainer": "lalalademaxiya1", "processor": "STM32L432", "bootloader": "stm32-dfu", + "usb": { + "vid": "0x3434" + }, "features": { "bootmagic": true, "command": false, @@ -44,140 +47,16 @@ "solid_splash": true } }, - "bluetooth": { - "driver": "custom" - }, - "usb": { - "vid": "0x3434" - }, "matrix_pins": { "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], - "rows": ["B5", "B4", "B3", "A15", "A14", "A13"] + "rows": ["B5", "B4", "B3", "A15", "A14", "A13"], + "custom": true, + "custom_lite": true }, "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "A0", "pin_b": "A10"} ] - }, - "layouts": { - "LAYOUT": { - "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.25, "y":0}, - {"matrix":[0,15], "x":16.25, "y":0}, - {"matrix":[0,16], "x":17.25, "y":0}, - {"matrix":[0,17], "x":18.5, "y":0}, - {"matrix":[0,18], "x":19.5, "y":0}, - {"matrix":[0,19], "x":20.5, "y":0}, - {"matrix":[0,20], "x":21.5, "y":0}, - - {"matrix":[1, 0], "x":0, "y":1.25}, - {"matrix":[1, 1], "x":1, "y":1.25}, - {"matrix":[1, 2], "x":2, "y":1.25}, - {"matrix":[1, 3], "x":3, "y":1.25}, - {"matrix":[1, 4], "x":4, "y":1.25}, - {"matrix":[1, 5], "x":5, "y":1.25}, - {"matrix":[1, 6], "x":6, "y":1.25}, - {"matrix":[1, 7], "x":7, "y":1.25}, - {"matrix":[1, 8], "x":8, "y":1.25}, - {"matrix":[1, 9], "x":9, "y":1.25}, - {"matrix":[1,10], "x":10, "y":1.25}, - {"matrix":[1,11], "x":11, "y":1.25}, - {"matrix":[1,12], "x":12, "y":1.25}, - {"matrix":[1,13], "x":13, "y":1.25, "w":2}, - {"matrix":[1,14], "x":15.25, "y":1.25}, - {"matrix":[1,15], "x":16.25, "y":1.25}, - {"matrix":[1,16], "x":17.25, "y":1.25}, - {"matrix":[1,17], "x":18.5, "y":1.25}, - {"matrix":[1,18], "x":19.5, "y":1.25}, - {"matrix":[1,19], "x":20.5, "y":1.25}, - {"matrix":[1,20], "x":21.5, "y":1.25}, - - {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, - {"matrix":[2, 1], "x":1.5, "y":2.25}, - {"matrix":[2, 2], "x":2.5, "y":2.25}, - {"matrix":[2, 3], "x":3.5, "y":2.25}, - {"matrix":[2, 4], "x":4.5, "y":2.25}, - {"matrix":[2, 5], "x":5.5, "y":2.25}, - {"matrix":[2, 6], "x":6.5, "y":2.25}, - {"matrix":[2, 7], "x":7.5, "y":2.25}, - {"matrix":[2, 8], "x":8.5, "y":2.25}, - {"matrix":[2, 9], "x":9.5, "y":2.25}, - {"matrix":[2,10], "x":10.5, "y":2.25}, - {"matrix":[2,11], "x":11.5, "y":2.25}, - {"matrix":[2,12], "x":12.5, "y":2.25}, - {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5}, - {"matrix":[2,14], "x":15.25, "y":2.25}, - {"matrix":[2,15], "x":16.25, "y":2.25}, - {"matrix":[2,16], "x":17.25, "y":2.25}, - {"matrix":[2,17], "x":18.5, "y":2.25}, - {"matrix":[2,18], "x":19.5, "y":2.25}, - {"matrix":[2,19], "x":20.5, "y":2.25}, - {"matrix":[2,20], "x":21.5, "y":2.25, "h":2}, - - {"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":[3,17], "x":18.5, "y":3.25}, - {"matrix":[3,18], "x":19.5, "y":3.25}, - {"matrix":[3,19], "x":20.5, "y":3.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.25, "y":4.25}, - {"matrix":[4,17], "x":18.5, "y":4.25}, - {"matrix":[4,18], "x":19.5, "y":4.25}, - {"matrix":[4,19], "x":20.5, "y":4.25}, - {"matrix":[4,20], "x":21.5, "y":4.25, "h":2}, - - {"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.25, "y":5.25}, - {"matrix":[5,15], "x":16.25, "y":5.25}, - {"matrix":[5,16], "x":17.25, "y":5.25}, - {"matrix":[5,18], "x":18.5, "y":5.25, "w":2}, - {"matrix":[5,19], "x":20.5, "y":5.25} - ] - } } } diff --git a/keyboards/keychron/q6_pro/iso_encoder/config.h b/keyboards/keychron/q6_pro/iso_encoder/config.h new file mode 100755 index 0000000000..8369f62a98 --- /dev/null +++ b/keyboards/keychron/q6_pro/iso_encoder/config.h @@ -0,0 +1,51 @@ +/* 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 . + */ + +#pragma once + +#ifdef RGB_MATRIX_ENABLE +/* RGB Matrix Driver Configuration */ +# define DRIVER_COUNT 2 +# define DRIVER_ADDR_1 0b1110111 +# define DRIVER_ADDR_2 0b1110100 +# define DRIVER_1_LED_TOTAL 59 +# define DRIVER_2_LED_TOTAL 50 +# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) + +/* Set to infinit, which is use in USB mode by default */ +# define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE + +/* Allow to shutdown driver to save power */ +# define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE + +/* Turn off backllit if brightness value is low */ +# define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48 + +/* Indication led */ +# define NUM_LOCK_INDEX 37 +# define CAPS_LOCK_INDEX 61 +# define LOW_BAT_IND_INDEX 99 + +// 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 + +/* 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/q6_pro/iso_encoder/info.json b/keyboards/keychron/q6_pro/iso_encoder/info.json new file mode 100755 index 0000000000..c0feb6f218 --- /dev/null +++ b/keyboards/keychron/q6_pro/iso_encoder/info.json @@ -0,0 +1,245 @@ +{ + "usb": { + "pid": "0x0661", + "device_version": "1.0.0" + }, + "layouts": { + "LAYOUT_110_iso": { + "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.25, "y":0}, + {"matrix":[0,15], "x":16.25, "y":0}, + {"matrix":[0,16], "x":17.25, "y":0}, + {"matrix":[0,17], "x":18.5, "y":0}, + {"matrix":[0,18], "x":19.5, "y":0}, + {"matrix":[0,19], "x":20.5, "y":0}, + {"matrix":[0,20], "x":21.5, "y":0}, + + {"matrix":[1,0], "x":0, "y":1.25}, + {"matrix":[1,1], "x":1, "y":1.25}, + {"matrix":[1,2], "x":2, "y":1.25}, + {"matrix":[1,3], "x":3, "y":1.25}, + {"matrix":[1,4], "x":4, "y":1.25}, + {"matrix":[1,5], "x":5, "y":1.25}, + {"matrix":[1,6], "x":6, "y":1.25}, + {"matrix":[1,7], "x":7, "y":1.25}, + {"matrix":[1,8], "x":8, "y":1.25}, + {"matrix":[1,9], "x":9, "y":1.25}, + {"matrix":[1,10], "x":10, "y":1.25}, + {"matrix":[1,11], "x":11, "y":1.25}, + {"matrix":[1,12], "x":12, "y":1.25}, + {"matrix":[1,13], "x":13, "y":1.25, "w":2}, + {"matrix":[1,14], "x":15.25, "y":1.25}, + {"matrix":[1,15], "x":16.25, "y":1.25}, + {"matrix":[1,16], "x":17.25, "y":1.25}, + {"matrix":[1,17], "x":18.5, "y":1.25}, + {"matrix":[1,18], "x":19.5, "y":1.25}, + {"matrix":[1,19], "x":20.5, "y":1.25}, + {"matrix":[1,20], "x":21.5, "y":1.25}, + + {"matrix":[2,0], "x":0, "y":2.25, "w":1.5}, + {"matrix":[2,1], "x":1.5, "y":2.25}, + {"matrix":[2,2], "x":2.5, "y":2.25}, + {"matrix":[2,3], "x":3.5, "y":2.25}, + {"matrix":[2,4], "x":4.5, "y":2.25}, + {"matrix":[2,5], "x":5.5, "y":2.25}, + {"matrix":[2,6], "x":6.5, "y":2.25}, + {"matrix":[2,7], "x":7.5, "y":2.25}, + {"matrix":[2,8], "x":8.5, "y":2.25}, + {"matrix":[2,9], "x":9.5, "y":2.25}, + {"matrix":[2,10], "x":10.5, "y":2.25}, + {"matrix":[2,11], "x":11.5, "y":2.25}, + {"matrix":[2,12], "x":12.5, "y":2.25}, + {"matrix":[2,14], "x":15.25, "y":2.25}, + {"matrix":[2,15], "x":16.25, "y":2.25}, + {"matrix":[2,16], "x":17.25, "y":2.25}, + {"matrix":[2,17], "x":18.5, "y":2.25}, + {"matrix":[2,18], "x":19.5, "y":2.25}, + {"matrix":[2,19], "x":20.5, "y":2.25}, + {"matrix":[2,20], "x":21.5, "y":2.25, "h":2}, + + {"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}, + {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2}, + {"matrix":[3,17], "x":18.5, "y":3.25}, + {"matrix":[3,18], "x":19.5, "y":3.25}, + {"matrix":[3,19], "x":20.5, "y":3.25}, + + {"matrix":[4,0], "x":0, "y":4.25, "w":1.25}, + {"matrix":[4,1], "x":1.25, "y":4.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.25, "y":4.25}, + {"matrix":[4,17], "x":18.5, "y":4.25}, + {"matrix":[4,18], "x":19.5, "y":4.25}, + {"matrix":[4,19], "x":20.5, "y":4.25}, + {"matrix":[4,20], "x":21.5, "y":4.25, "h":2}, + + {"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.25, "y":5.25}, + {"matrix":[5,15], "x":16.25, "y":5.25}, + {"matrix":[5,16], "x":17.25, "y":5.25}, + {"matrix":[5,18], "x":18.5, "y":5.25, "w":2}, + {"matrix":[5,19], "x":20.5, "y":5.25} + ] + } + }, + "rgb_matrix": { + "layout": [ + {"matrix":[0, 0], "flags":1, "x":0, "y":0}, + {"matrix":[0, 1], "flags":1, "x":13, "y":0}, + {"matrix":[0, 2], "flags":1, "x":24, "y":0}, + {"matrix":[0, 3], "flags":1, "x":34, "y":0}, + {"matrix":[0, 4], "flags":1, "x":45, "y":0}, + {"matrix":[0, 5], "flags":1, "x":57, "y":0}, + {"matrix":[0, 6], "flags":1, "x":68, "y":0}, + {"matrix":[0, 7], "flags":1, "x":78, "y":0}, + {"matrix":[0, 8], "flags":1, "x":89, "y":0}, + {"matrix":[0, 9], "flags":1, "x":102, "y":0}, + {"matrix":[0, 10], "flags":1, "x":112, "y":0}, + {"matrix":[0, 11], "flags":1, "x":123, "y":0}, + {"matrix":[0, 12], "flags":1, "x":133, "y":0}, + {"matrix":[0, 14], "flags":1, "x":159, "y":0}, + {"matrix":[0, 15], "flags":1, "x":169, "y":0}, + {"matrix":[0, 16], "flags":1, "x":180, "y":0}, + {"matrix":[0, 17], "flags":4, "x":193, "y":0}, + {"matrix":[0, 18], "flags":4, "x":203, "y":0}, + {"matrix":[0, 19], "flags":4, "x":214, "y":0}, + {"matrix":[0, 20], "flags":4, "x":224, "y":0}, + + {"matrix":[1, 0], "flags":1, "x":0, "y":15}, + {"matrix":[1, 1], "flags":8, "x":10, "y":15}, + {"matrix":[1, 2], "flags":8, "x":21, "y":15}, + {"matrix":[1, 3], "flags":8, "x":32, "y":15}, + {"matrix":[1, 4], "flags":4, "x":42, "y":15}, + {"matrix":[1, 5], "flags":4, "x":52, "y":15}, + {"matrix":[1, 6], "flags":4, "x":63, "y":15}, + {"matrix":[1, 7], "flags":4, "x":73, "y":15}, + {"matrix":[1, 8], "flags":4, "x":83, "y":15}, + {"matrix":[1, 9], "flags":4, "x":94, "y":15}, + {"matrix":[1, 10], "flags":4, "x":104, "y":15}, + {"matrix":[1, 11], "flags":4, "x":115, "y":15}, + {"matrix":[1, 12], "flags":4, "x":125, "y":15}, + {"matrix":[1, 13], "flags":1, "x":141, "y":15}, + {"matrix":[1, 14], "flags":1, "x":159, "y":15}, + {"matrix":[1, 15], "flags":1, "x":169, "y":15}, + {"matrix":[1, 16], "flags":1, "x":180, "y":15}, + {"matrix":[1, 17], "flags":8, "x":193, "y":15}, + {"matrix":[1, 18], "flags":4, "x":203, "y":15}, + {"matrix":[1, 19], "flags":4, "x":214, "y":15}, + {"matrix":[1, 20], "flags":4, "x":224, "y":15}, + + {"matrix":[2, 0], "flags":1, "x":3, "y":27}, + {"matrix":[2, 1], "flags":4, "x":16, "y":27}, + {"matrix":[2, 2], "flags":4, "x":26, "y":27}, + {"matrix":[2, 3], "flags":4, "x":36, "y":27}, + {"matrix":[2, 4], "flags":1, "x":47, "y":27}, + {"matrix":[2, 5], "flags":4, "x":57, "y":27}, + {"matrix":[2, 6], "flags":4, "x":68, "y":27}, + {"matrix":[2, 7], "flags":4, "x":78, "y":27}, + {"matrix":[2, 8], "flags":4, "x":89, "y":27}, + {"matrix":[2, 9], "flags":4, "x":99, "y":27}, + {"matrix":[2, 10], "flags":4, "x":109, "y":27}, + {"matrix":[2, 11], "flags":4, "x":120, "y":27}, + {"matrix":[2, 12], "flags":4, "x":130, "y":27}, + {"matrix":[2, 14], "flags":1, "x":159, "y":27}, + {"matrix":[2, 15], "flags":1, "x":169, "y":27}, + {"matrix":[2, 16], "flags":1, "x":180, "y":27}, + {"matrix":[2, 17], "flags":4, "x":193, "y":27}, + {"matrix":[2, 18], "flags":4, "x":203, "y":27}, + {"matrix":[2, 19], "flags":4, "x":214, "y":27}, + {"matrix":[2, 20], "flags":4, "x":224, "y":27}, + + {"matrix":[3, 0], "flags":8, "x":4, "y":40}, + {"matrix":[3, 1], "flags":4, "x":18, "y":40}, + {"matrix":[3, 2], "flags":4, "x":29, "y":40}, + {"matrix":[3, 3], "flags":4, "x":39, "y":40}, + {"matrix":[3, 4], "flags":4, "x":50, "y":40}, + {"matrix":[3, 5], "flags":4, "x":60, "y":40}, + {"matrix":[3, 6], "flags":4, "x":70, "y":40}, + {"matrix":[3, 7], "flags":4, "x":81, "y":40}, + {"matrix":[3, 8], "flags":4, "x":91, "y":40}, + {"matrix":[3, 9], "flags":4, "x":102, "y":40}, + {"matrix":[3, 10], "flags":4, "x":112, "y":40}, + {"matrix":[3, 11], "flags":4, "x":122, "y":40}, + {"matrix":[3, 13], "flags":1, "x":133, "y":40}, + {"matrix":[2, 13], "flags":1, "x":147, "y":35}, + {"matrix":[3, 17], "flags":4, "x":193, "y":40}, + {"matrix":[3, 18], "flags":4, "x":203, "y":40}, + {"matrix":[3, 19], "flags":4, "x":214, "y":40}, + + {"matrix":[4, 0], "flags":1, "x":1, "y":52}, + {"matrix":[4, 1], "flags":1, "x":14, "y":52}, + {"matrix":[4, 2], "flags":4, "x":23, "y":52}, + {"matrix":[4, 3], "flags":4, "x":34, "y":52}, + {"matrix":[4, 4], "flags":4, "x":44, "y":52}, + {"matrix":[4, 5], "flags":4, "x":55, "y":52}, + {"matrix":[4, 6], "flags":4, "x":65, "y":52}, + {"matrix":[4, 7], "flags":4, "x":76, "y":52}, + {"matrix":[4, 8], "flags":4, "x":86, "y":52}, + {"matrix":[4, 9], "flags":4, "x":96, "y":52}, + {"matrix":[4, 10], "flags":4, "x":107, "y":52}, + {"matrix":[4, 11], "flags":4, "x":117, "y":52}, + {"matrix":[4, 13], "flags":1, "x":137, "y":52}, + {"matrix":[4, 15], "flags":1, "x":169, "y":52}, + {"matrix":[4, 17], "flags":4, "x":193, "y":52}, + {"matrix":[4, 18], "flags":4, "x":203, "y":52}, + {"matrix":[4, 19], "flags":4, "x":214, "y":52}, + {"matrix":[4, 20], "flags":4, "x":224, "y":52}, + + {"matrix":[5, 0], "flags":1, "x":1, "y":64}, + {"matrix":[5, 1], "flags":1, "x":14, "y":64}, + {"matrix":[5, 2], "flags":1, "x":27, "y":64}, + {"matrix":[5, 6], "flags":4, "x":66, "y":64}, + {"matrix":[5, 10], "flags":1, "x":105, "y":64}, + {"matrix":[5, 11], "flags":1, "x":118, "y":64}, + {"matrix":[5, 12], "flags":1, "x":131, "y":64}, + {"matrix":[5, 13], "flags":1, "x":145, "y":64}, + {"matrix":[5, 14], "flags":1, "x":159, "y":64}, + {"matrix":[5, 15], "flags":1, "x":169, "y":64}, + {"matrix":[5, 16], "flags":1, "x":180, "y":64}, + {"matrix":[5, 18], "flags":4, "x":198, "y":64}, + {"matrix":[5, 19], "flags":4, "x":214, "y":64} + ] + } +} diff --git a/keyboards/keychron/q6_pro/iso_encoder/iso_encoder.c b/keyboards/keychron/q6_pro/iso_encoder/iso_encoder.c new file mode 100755 index 0000000000..325a2a356e --- /dev/null +++ b/keyboards/keychron/q6_pro/iso_encoder/iso_encoder.c @@ -0,0 +1,143 @@ +/* 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 . + */ + +#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}, + {0, L_5, J_5, K_5}, + {0, L_6, J_6, K_6}, + {0, L_7, J_7, K_7}, + {0, L_8, J_8, K_8}, + + {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}, + {0, L_9, J_9, K_9}, + {0, L_10, J_10, K_10}, + {0, L_11, J_11, K_11}, + {0, L_12, J_12, K_12}, + + {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}, + {0, L_13, J_13, K_13}, + {0, L_14, J_14, K_14}, + {0, L_15, J_15, K_15}, + {0, L_16, J_16, K_16}, + + {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}, + {1, L_9, J_9, K_9}, + {1, L_8, J_8, K_8}, + {1, L_7, J_7, K_7}, + + {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, L_6, J_6, K_6}, + {1, L_5, J_5, K_5}, + {1, L_4, J_4, K_4}, + {1, L_3, J_3, K_3}, + + {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}, + {1, L_2, J_2, K_2}, + {1, L_1, J_1, K_1} +}; +#endif diff --git a/keyboards/keychron/q6_pro/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q6_pro/iso_encoder/keymaps/default/keymap.c new file mode 100755 index 0000000000..dbd8f810d1 --- /dev/null +++ b/keyboards/keychron/q6_pro/iso_encoder/keymaps/default/keymap.c @@ -0,0 +1,65 @@ +/* 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 . + */ + +#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_110_iso( + 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_F13, KC_F14, KC_F15, KC_F16, + 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_NUM, KC_PSLS, KC_PAST, KC_PMNS, + 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_P7, KC_P8, KC_P9, KC_PPLS, + 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_P4, KC_P5, KC_P6, + 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_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), + [MAC_FN] = LAYOUT_110_iso( + _______, 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_110_iso( + 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_NUM, KC_PSLS, KC_PAST, KC_PMNS, + 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_P7, KC_P8, KC_P9, KC_PPLS, + 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_P4, KC_P5, KC_P6, + 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_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), + [WIN_FN] = LAYOUT_110_iso( + _______, 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[][1][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/q6_pro/iso_encoder/keymaps/default/rules.mk b/keyboards/keychron/q6_pro/iso_encoder/keymaps/default/rules.mk new file mode 100755 index 0000000000..ee32568148 --- /dev/null +++ b/keyboards/keychron/q6_pro/iso_encoder/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/keychron/q6_pro/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q6_pro/iso_encoder/keymaps/via/keymap.c new file mode 100755 index 0000000000..dbd8f810d1 --- /dev/null +++ b/keyboards/keychron/q6_pro/iso_encoder/keymaps/via/keymap.c @@ -0,0 +1,65 @@ +/* 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 . + */ + +#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_110_iso( + 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_F13, KC_F14, KC_F15, KC_F16, + 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_NUM, KC_PSLS, KC_PAST, KC_PMNS, + 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_P7, KC_P8, KC_P9, KC_PPLS, + 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_P4, KC_P5, KC_P6, + 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_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), + [MAC_FN] = LAYOUT_110_iso( + _______, 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_110_iso( + 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_NUM, KC_PSLS, KC_PAST, KC_PMNS, + 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_P7, KC_P8, KC_P9, KC_PPLS, + 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_P4, KC_P5, KC_P6, + 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_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ), + [WIN_FN] = LAYOUT_110_iso( + _______, 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[][1][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/q6_pro/iso_encoder/keymaps/via/rules.mk b/keyboards/keychron/q6_pro/iso_encoder/keymaps/via/rules.mk new file mode 100755 index 0000000000..f1adcab005 --- /dev/null +++ b/keyboards/keychron/q6_pro/iso_encoder/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/keychron/q6_pro/iso_encoder/rules.mk b/keyboards/keychron/q6_pro/iso_encoder/rules.mk new file mode 100755 index 0000000000..6e7633bfe0 --- /dev/null +++ b/keyboards/keychron/q6_pro/iso_encoder/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank diff --git a/keyboards/keychron/q6_pro/matrix.c b/keyboards/keychron/q6_pro/matrix.c index deecad8a49..c87e226973 100644 --- a/keyboards/keychron/q6_pro/matrix.c +++ b/keyboards/keychron/q6_pro/matrix.c @@ -33,17 +33,28 @@ static inline uint8_t readMatrixPin(pin_t pin) { } } -static inline void HC595_delay(uint8_t n) { +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(uint32_t data, bool bit) { +static void HC595_output(uint32_t data) { + uint8_t i; uint8_t n = 1; - uint8_t i = 1; - for (i = 0; i < MATRIX_COLS; i++) { + for (i = 0; i < (MATRIX_COLS - DIRECT_COL_NUM); i++) { + writePinLow(HC595_SHCP); if (data & 0x1) { writePinHigh(HC595_DS); } else { @@ -52,42 +63,83 @@ static void HC595_output(uint32_t data, bool bit) { HC595_delay(n); writePinHigh(HC595_SHCP); HC595_delay(n); - writePinLow(HC595_SHCP); - if (bit) { - break; - } else { - data = data >> 1; - } + + data = data >> 1; } - writePinHigh(HC595_STCP); - HC595_delay(n); writePinLow(HC595_STCP); + HC595_delay(n); + writePinHigh(HC595_STCP); +} + +static void HC595_output_bit(uint8_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) { - HC595_output(0x00, 1); + if (col < DIRECT_COL_NUM) { + setPinOutput_writeLow(col_pins[col]); + } else { + if (col == DIRECT_COL_NUM) HC595_output_bit(0x00); } } -static void unselect_col(void) { - HC595_output(0X01, 1); +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) { - HC595_output(0xFFFFFFFF, 0); + 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(0xFFFFFFFF); + break; + } + } } void select_all_cols(void) { - HC595_output(0x0, 0); + 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(0x00000000); + break; + } + } } static void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col, matrix_row_t row_shifter) { - bool key_pressed = false; - // Select col - select_col(current_col); // select col - matrix_output_select_delay(); + select_col(current_col); + HC595_delay(200); // For each row... for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) { @@ -95,7 +147,6 @@ static void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t curre if (readMatrixPin(row_pins[row_index]) == 0) { // Pin LO, set col bit current_matrix[row_index] |= row_shifter; - key_pressed = true; } else { // Pin HI, clear col bit current_matrix[row_index] &= ~row_shifter; @@ -103,8 +154,8 @@ static void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t curre } // Unselect col - unselect_col(); - matrix_output_unselect_delay(current_col, key_pressed); // wait for all Row signals to go HIGH + unselect_col(current_col); + HC595_delay(200); // wait for all Row signals to go HIGH } void matrix_init_custom(void) { diff --git a/keyboards/keychron/q6_pro/q6_pro.c b/keyboards/keychron/q6_pro/q6_pro.c index 5ecc2cc485..c099bfec90 100755 --- a/keyboards/keychron/q6_pro/q6_pro.c +++ b/keyboards/keychron/q6_pro/q6_pro.c @@ -36,10 +36,10 @@ typedef struct PACKED { uint8_t keycode[3]; } key_combination_t; -static uint32_t factory_timer_buffer = 0; -static uint32_t power_on_indicator_timer_buffer; -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 power_on_indicator_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) @@ -61,7 +61,11 @@ static void pairing_key_timer_cb(void *arg) { bool dip_switch_update_kb(uint8_t index, bool active) { if (index == 0) { +#ifdef INVERT_OS_SWITCH_STATE + default_layer_set(1UL << (!active ? 2 : 0)); +#else default_layer_set(1UL << (active ? 2 : 0)); +#endif } dip_switch_update_user(index, active); @@ -136,7 +140,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { return true; } -#if defined(ENCODER_ENABLE) && defined(PAL_USE_CALLBACKS) +#if defined(KC_BLUETOOTH_ENABLE) && defined(ENCODER_ENABLE) static void encoder_pad_cb(void *param) { encoder_inerrupt_read((uint32_t)param & 0XFF); } @@ -151,9 +155,6 @@ void keyboard_post_init_kb(void) { palSetLineMode(CKBT51_RESET_PIN, PAL_MODE_OUTPUT_PUSHPULL); palWriteLine(CKBT51_RESET_PIN, PAL_HIGH); - palSetLineMode(H3, PAL_MODE_OUTPUT_PUSHPULL); - palWriteLine(H3, PAL_LOW); - /* IMPORTANT: DO NOT enable internal pull-up resistor * as there is an external pull-down resistor. */ @@ -161,12 +162,11 @@ void keyboard_post_init_kb(void) { ckbt51_init(false); bluetooth_init(); -#endif power_on_indicator_timer_buffer = sync_timer_read32() | 1; writePin(BAT_LOW_LED_PIN, BAT_LOW_LED_PIN_ON_STATE); -#if defined(ENCODER_ENABLE) && defined(PAL_USE_CALLBACKS) +# ifdef ENCODER_ENABLE pin_t encoders_pad_a[NUM_ENCODERS] = ENCODERS_PAD_A; pin_t encoders_pad_b[NUM_ENCODERS] = ENCODERS_PAD_B; for (uint32_t i = 0; i < NUM_ENCODERS; i++) { @@ -175,6 +175,7 @@ void keyboard_post_init_kb(void) { palSetLineCallback(encoders_pad_a[i], encoder_pad_cb, (void *)i); palSetLineCallback(encoders_pad_b[i], encoder_pad_cb, (void *)i); } +# endif #endif keyboard_post_init_user(); @@ -188,7 +189,7 @@ void matrix_scan_kb(void) { if (bt_factory_reset) { bt_factory_reset = false; palWriteLine(CKBT51_RESET_PIN, PAL_LOW); - wait_ms(10); + wait_ms(5); palWriteLine(CKBT51_RESET_PIN, PAL_HIGH); } } @@ -239,12 +240,9 @@ void bluetooth_enter_disconnected_kb(uint8_t host_idx) { 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. */ if (firstDisconnect && sync_timer_read32() < 1000 && get_transport() == TRANSPORT_BLUETOOTH) { - ckbt51_set_local_name(PRODUCT); - ckbt51_param_init(); bluetooth_connect(); firstDisconnect = false; @@ -252,18 +250,18 @@ void bluetooth_enter_disconnected_kb(uint8_t host_idx) { } void ckbt51_default_ack_handler(uint8_t *data, uint8_t len) { - // if (data[1] == 0x45) { - // module_param_t param = {.event_mode = 0x02, - // .connected_idle_timeout = 7200, - // .pairing_timeout = 180, - // .pairing_mode = 0, - // .reconnect_timeout = 5, - // .report_rate = 90, - // .vendor_id_source = 1, - // .verndor_id = 0, // Must be 0x3434 - // .product_id = PRODUCT_ID}; - // ckbt51_set_param(¶m); - // } + if (data[1] == 0x45) { + module_param_t param = {.event_mode = 0x02, + .connected_idle_timeout = 7200, + .pairing_timeout = 180, + .pairing_mode = 0, + .reconnect_timeout = 5, + .report_rate = 90, + .vendor_id_source = 1, + .verndor_id = 0, // Must be 0x3434 + .product_id = PRODUCT_ID}; + ckbt51_set_param(¶m); + } } void bluetooth_pre_task(void) { diff --git a/keyboards/keychron/q6_pro/readme.md b/keyboards/keychron/q6_pro/readme.md index fc901acb51..999fb9d16a 100755 --- a/keyboards/keychron/q6_pro/readme.md +++ b/keyboards/keychron/q6_pro/readme.md @@ -11,10 +11,12 @@ A customizable 96% keyboard. Make example for this keyboard (after setting up your build environment): make keychron/q6_pro/ansi_encoder:default + make keychron/q6_pro/iso_encoder:default Flashing example for this keyboard: make keychron/q6_pro/ansi_encoder:default:flash + make keychron/q6_pro/iso_encoder: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/q6_pro/rules.mk b/keyboards/keychron/q6_pro/rules.mk index 4ff33fb268..98cf5c564b 100755 --- a/keyboards/keychron/q6_pro/rules.mk +++ b/keyboards/keychron/q6_pro/rules.mk @@ -1,13 +1,8 @@ -# Build Options -# change yes to no to disable -# # 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 OPT_DEFS += -DKC_BLUETOOTH_ENABLE -CUSTOM_MATRIX = lite - SRC += matrix.c include keyboards/keychron/bluetooth/bluetooth.mk diff --git a/keyboards/keychron/q6_pro/via_json/q6_pro_ansi_encoder.json b/keyboards/keychron/q6_pro/via_json/q6_pro_ansi_encoder.json index 155a1f0fa5..e0f94063c3 100644 --- a/keyboards/keychron/q6_pro/via_json/q6_pro_ansi_encoder.json +++ b/keyboards/keychron/q6_pro/via_json/q6_pro_ansi_encoder.json @@ -1,5 +1,5 @@ { - "name": "Keychron Q6 Pro", + "name": "Keychron Q6 Pro ANSI Knob", "vendorId": "0x3434", "productId": "0x0660", "keycodes": ["qmk_lighting"], diff --git a/keyboards/keychron/q6_pro/via_json/q6_pro_iso_encoder.json b/keyboards/keychron/q6_pro/via_json/q6_pro_iso_encoder.json new file mode 100755 index 0000000000..1b6520de97 --- /dev/null +++ b/keyboards/keychron/q6_pro/via_json/q6_pro_iso_encoder.json @@ -0,0 +1,352 @@ +{ + "name": "Keychron Q6 Pro ISO Knob", + "vendorId": "0x3434", + "productId": "0x0661", + "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": 21}, + "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", + "0,16", + { + "x": 0.25, + "c": "#cccccc" + }, + "0,17", + "0,18", + "0,19", + "0,20" + ], + [ + { + "y": 0.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", + { + "x": 0.25, + "c": "#cccccc" + }, + "1,17", + "1,18", + "1,19", + "1,20" + ], + [ + { + "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": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "2,13", + { + "x": 0.25, + "c": "#aaaaaa" + }, + "2,14", + "2,15", + "2,16", + { + "x": 0.25, + "c": "#cccccc" + }, + "2,17", + "2,18", + "2,19", + { + "h": 2 + }, + "2,20" + ], + [ + { + "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", + { + "x": 4.75, + "c": "#cccccc" + }, + "3,17", + "3,18", + "3,19" + ], + [ + { + "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", + { + "x": 1.25, + "c": "#cccccc" + }, + "4,17", + "4,18", + "4,19", + { + "h": 2 + }, + "4,20" + ], + [ + { + "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", + { + "x": 0.25, + "c": "#cccccc", + "w": 2 + }, + "5,18", + "5,19" + ] + ] + } +} From 4baf65ddac74345343cbc01dc4558fb5368cd52d Mon Sep 17 00:00:00 2001 From: lalalademaxiya1 <66767061+lalalademaxiya1@users.noreply.github.com> Date: Fri, 30 Jun 2023 11:39:23 +0800 Subject: [PATCH 09/17] Update keyboards/keychron/bluetooth/transport.c Co-authored-by: lokher --- keyboards/keychron/bluetooth/transport.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/keychron/bluetooth/transport.c b/keyboards/keychron/bluetooth/transport.c index 6c86906322..c720cbf659 100644 --- a/keyboards/keychron/bluetooth/transport.c +++ b/keyboards/keychron/bluetooth/transport.c @@ -183,9 +183,7 @@ void usb_remote_wakeup(void) { usb_wakeup(&USB_DRIVER); } } - // palWriteLine(H3, PAL_HIGH); wait_ms(500); - // palWriteLine(H3, PAL_LOW); /* Woken up */ // variables has been already cleared by the wakeup hook send_keyboard_report(); From 91853633a4e2274279c62d557ee5c8c7f0105713 Mon Sep 17 00:00:00 2001 From: lalalademaxiya1 <66767061+lalalademaxiya1@users.noreply.github.com> Date: Fri, 30 Jun 2023 11:39:32 +0800 Subject: [PATCH 10/17] Update keyboards/keychron/q6_pro/ansi_encoder/config.h Co-authored-by: lokher --- keyboards/keychron/q6_pro/ansi_encoder/config.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/keyboards/keychron/q6_pro/ansi_encoder/config.h b/keyboards/keychron/q6_pro/ansi_encoder/config.h index 1434cc669c..5cba1a2022 100755 --- a/keyboards/keychron/q6_pro/ansi_encoder/config.h +++ b/keyboards/keychron/q6_pro/ansi_encoder/config.h @@ -39,9 +39,7 @@ # define CAPS_LOCK_INDEX 62 # define LOW_BAT_IND_INDEX 98 -// RGB Matrix Animation modes. Explicitly enabled -// For full list of effects, see: -// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects +/* Enable Reactive Animation */ # define RGB_MATRIX_FRAMEBUFFER_EFFECTS # define RGB_MATRIX_KEYPRESSES From 45ecc290bcd46c61260a3b41a5da7f8a332486fe Mon Sep 17 00:00:00 2001 From: lalalademaxiya1 <66767061+lalalademaxiya1@users.noreply.github.com> Date: Fri, 30 Jun 2023 11:39:39 +0800 Subject: [PATCH 11/17] Update keyboards/keychron/q6_pro/halconf.h Co-authored-by: lokher --- keyboards/keychron/q6_pro/halconf.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/keychron/q6_pro/halconf.h b/keyboards/keychron/q6_pro/halconf.h index b0ca1150f6..8d8e138e4e 100755 --- a/keyboards/keychron/q6_pro/halconf.h +++ b/keyboards/keychron/q6_pro/halconf.h @@ -19,7 +19,6 @@ #define _CHIBIOS_HAL_CONF_VER_8_0_ #define HAL_USE_I2C TRUE -#define HAL_USE_SPI TRUE #ifdef KC_BLUETOOTH_ENABLE # define PAL_USE_CALLBACKS TRUE From 9eeb728480aa24869b44b603d356c29b421ccb87 Mon Sep 17 00:00:00 2001 From: lalalademaxiya1 <66767061+lalalademaxiya1@users.noreply.github.com> Date: Fri, 30 Jun 2023 11:39:49 +0800 Subject: [PATCH 12/17] Update keyboards/keychron/q6_pro/info.json Co-authored-by: lokher --- keyboards/keychron/q6_pro/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/keychron/q6_pro/info.json b/keyboards/keychron/q6_pro/info.json index 9235c9aa70..00cc833b29 100755 --- a/keyboards/keychron/q6_pro/info.json +++ b/keyboards/keychron/q6_pro/info.json @@ -17,7 +17,6 @@ "nkro": true, "rgb_matrix": true, "dip_switch": true, - "bluetooth": false, "encoder": true, "raw": true }, From d187df2f533e36f05e3e26145582d8825b667b64 Mon Sep 17 00:00:00 2001 From: lalalademaxiya1 <66767061+lalalademaxiya1@users.noreply.github.com> Date: Fri, 30 Jun 2023 11:40:00 +0800 Subject: [PATCH 13/17] Update keyboards/keychron/q6_pro/q6_pro.c Co-authored-by: lokher --- keyboards/keychron/q6_pro/q6_pro.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/keychron/q6_pro/q6_pro.c b/keyboards/keychron/q6_pro/q6_pro.c index c099bfec90..bba69f3260 100755 --- a/keyboards/keychron/q6_pro/q6_pro.c +++ b/keyboards/keychron/q6_pro/q6_pro.c @@ -218,7 +218,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); wait_ms(10); /* Set bluetooth parameters */ From e4804ec20e8cb84c625f8e1315f3bc76b77126a4 Mon Sep 17 00:00:00 2001 From: lalalademaxiya1 <66767061+lalalademaxiya1@users.noreply.github.com> Date: Fri, 30 Jun 2023 11:40:09 +0800 Subject: [PATCH 14/17] Update keyboards/keychron/q6_pro/mcuconf.h Co-authored-by: lokher --- keyboards/keychron/q6_pro/mcuconf.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/keychron/q6_pro/mcuconf.h b/keyboards/keychron/q6_pro/mcuconf.h index 87dd1ba2b9..882d6bd568 100755 --- a/keyboards/keychron/q6_pro/mcuconf.h +++ b/keyboards/keychron/q6_pro/mcuconf.h @@ -30,9 +30,6 @@ #undef STM32_I2C_USE_I2C1 #define STM32_I2C_USE_I2C1 TRUE -#undef STM32_SPI_USE_SPI1 -#define STM32_SPI_USE_SPI1 TRUE - #ifdef KC_BLUETOOTH_ENABLE # undef STM32_SERIAL_USE_USART2 # define STM32_SERIAL_USE_USART2 TRUE From ee4d74928df83c54c1fd8471141a2849599c3dfb Mon Sep 17 00:00:00 2001 From: lalalademaxiya1 <66767061+lalalademaxiya1@users.noreply.github.com> Date: Fri, 30 Jun 2023 11:40:17 +0800 Subject: [PATCH 15/17] Update keyboards/keychron/q6_pro/q6_pro.h Co-authored-by: lokher --- keyboards/keychron/q6_pro/q6_pro.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/keychron/q6_pro/q6_pro.h b/keyboards/keychron/q6_pro/q6_pro.h index cd0954d579..9cc6693d4d 100755 --- a/keyboards/keychron/q6_pro/q6_pro.h +++ b/keyboards/keychron/q6_pro/q6_pro.h @@ -51,5 +51,5 @@ enum { BT_HST3 = KC_TRNS, BAT_LVL = KC_TRNS, #endif - NEW_SAFE_RANGE + NEW_SAFE_RANGE }; From 064f3702f7d79185cad174627ff2e2c54f584813 Mon Sep 17 00:00:00 2001 From: lalalademaxiya1 <66767061+lalalademaxiya1@users.noreply.github.com> Date: Fri, 30 Jun 2023 11:40:31 +0800 Subject: [PATCH 16/17] Update keyboards/keychron/q6_pro/rules.mk Co-authored-by: lokher --- keyboards/keychron/q6_pro/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/keychron/q6_pro/rules.mk b/keyboards/keychron/q6_pro/rules.mk index 98cf5c564b..1f9fc1ab58 100755 --- a/keyboards/keychron/q6_pro/rules.mk +++ b/keyboards/keychron/q6_pro/rules.mk @@ -1,7 +1,6 @@ # 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 -OPT_DEFS += -DKC_BLUETOOTH_ENABLE SRC += matrix.c From 94d0939cc0085b5db5875452a50fcc16badc13da Mon Sep 17 00:00:00 2001 From: lalalademaxiya1 <2831039915@qq.com> Date: Fri, 30 Jun 2023 11:48:42 +0800 Subject: [PATCH 17/17] Updated q6 pro --- keyboards/keychron/q6_pro/iso_encoder/config.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/keyboards/keychron/q6_pro/iso_encoder/config.h b/keyboards/keychron/q6_pro/iso_encoder/config.h index 8369f62a98..d685d96b9f 100755 --- a/keyboards/keychron/q6_pro/iso_encoder/config.h +++ b/keyboards/keychron/q6_pro/iso_encoder/config.h @@ -39,9 +39,7 @@ # define CAPS_LOCK_INDEX 61 # define LOW_BAT_IND_INDEX 99 -// RGB Matrix Animation modes. Explicitly enabled -// For full list of effects, see: -// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects +/* Enable Reactive Animation */ # define RGB_MATRIX_FRAMEBUFFER_EFFECTS # define RGB_MATRIX_KEYPRESSES