From b1a59b2e9214cff9fa036a21729c112c88408fab Mon Sep 17 00:00:00 2001 From: lalalademaxiya1 <2831039915@qq.com> Date: Sat, 10 Jun 2023 09:00:19 +0800 Subject: [PATCH 01/15] Add k12 pro --- keyboards/keychron/k12_pro/ansi/rgb/config.h | 99 ++++++ keyboards/keychron/k12_pro/ansi/rgb/info.json | 85 +++++ .../k12_pro/ansi/rgb/keymaps/default/keymap.c | 63 ++++ .../k12_pro/ansi/rgb/keymaps/via/keymap.c | 63 ++++ .../k12_pro/ansi/rgb/keymaps/via/rules.mk | 2 + keyboards/keychron/k12_pro/ansi/rgb/rgb.c | 123 +++++++ keyboards/keychron/k12_pro/ansi/rgb/rules.mk | 2 + .../keychron/k12_pro/ansi/white/config.h | 74 +++++ .../keychron/k12_pro/ansi/white/info.json | 85 +++++ .../ansi/white/keymaps/default/keymap.c | 63 ++++ .../k12_pro/ansi/white/keymaps/via/keymap.c | 63 ++++ .../k12_pro/ansi/white/keymaps/via/rules.mk | 2 + .../keychron/k12_pro/ansi/white/rules.mk | 2 + keyboards/keychron/k12_pro/ansi/white/white.c | 121 +++++++ keyboards/keychron/k12_pro/config.h | 92 ++++++ keyboards/keychron/k12_pro/halconf.h | 27 ++ keyboards/keychron/k12_pro/k12_pro.c | 301 ++++++++++++++++++ keyboards/keychron/k12_pro/k12_pro.h | 52 +++ keyboards/keychron/k12_pro/mcuconf.h | 37 +++ keyboards/keychron/k12_pro/readme.md | 23 ++ keyboards/keychron/k12_pro/rules.mk | 11 + 21 files changed, 1390 insertions(+) create mode 100755 keyboards/keychron/k12_pro/ansi/rgb/config.h create mode 100755 keyboards/keychron/k12_pro/ansi/rgb/info.json create mode 100755 keyboards/keychron/k12_pro/ansi/rgb/keymaps/default/keymap.c create mode 100755 keyboards/keychron/k12_pro/ansi/rgb/keymaps/via/keymap.c create mode 100755 keyboards/keychron/k12_pro/ansi/rgb/keymaps/via/rules.mk create mode 100755 keyboards/keychron/k12_pro/ansi/rgb/rgb.c create mode 100755 keyboards/keychron/k12_pro/ansi/rgb/rules.mk create mode 100755 keyboards/keychron/k12_pro/ansi/white/config.h create mode 100755 keyboards/keychron/k12_pro/ansi/white/info.json create mode 100755 keyboards/keychron/k12_pro/ansi/white/keymaps/default/keymap.c create mode 100755 keyboards/keychron/k12_pro/ansi/white/keymaps/via/keymap.c create mode 100755 keyboards/keychron/k12_pro/ansi/white/keymaps/via/rules.mk create mode 100755 keyboards/keychron/k12_pro/ansi/white/rules.mk create mode 100755 keyboards/keychron/k12_pro/ansi/white/white.c create mode 100755 keyboards/keychron/k12_pro/config.h create mode 100755 keyboards/keychron/k12_pro/halconf.h create mode 100755 keyboards/keychron/k12_pro/k12_pro.c create mode 100755 keyboards/keychron/k12_pro/k12_pro.h create mode 100755 keyboards/keychron/k12_pro/mcuconf.h create mode 100755 keyboards/keychron/k12_pro/readme.md create mode 100755 keyboards/keychron/k12_pro/rules.mk diff --git a/keyboards/keychron/k12_pro/ansi/rgb/config.h b/keyboards/keychron/k12_pro/ansi/rgb/config.h new file mode 100755 index 0000000000..87e2fdd57e --- /dev/null +++ b/keyboards/keychron/k12_pro/ansi/rgb/config.h @@ -0,0 +1,99 @@ +/* Copyright 2021 @ 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 1 + +# define DRIVER_ADDR_1 0b1110100 +# define DRIVER_1_LED_COUNT 61 +# define RGB_MATRIX_LED_COUNT DRIVER_1_LED_COUNT + +/* Set to infinit, which is use in USB mode by default + */ +# define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE +/* Allow shutdown of led driver to save power */ +# define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE +/* Turn off backlight on low brightness to save power */ +# define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 32 + +# define DIM_CAPS_LOCK +# define CAPS_LOCK_INDEX 28 +# define LOW_BAT_IND_INDEX 56 + +/* RGB Matrix Animation modes. Explicitly enabled + * For full list of effects, see: + * https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects + */ + +# define RGB_MATRIX_KEYPRESSES +# define RGB_MATRIX_FRAMEBUFFER_EFFECTS + +// # define ENABLE_RGB_MATRIX_ALPHAS_MODS +// # define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +// # define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_BREATHING +// # define ENABLE_RGB_MATRIX_BAND_SAT +// # define ENABLE_RGB_MATRIX_BAND_VAL +// # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +// # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +// # define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +# define ENABLE_RGB_MATRIX_CYCLE_ALL +# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +# define ENABLE_RGB_MATRIX_DUAL_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_BEACON +// # define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS +// # define ENABLE_RGB_MATRIX_RAINDROPS +# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +// # define ENABLE_RGB_MATRIX_HUE_BREATHING +// # define ENABLE_RGB_MATRIX_HUE_PENDULUM +// # define ENABLE_RGB_MATRIX_HUE_WAVE +# define ENABLE_RGB_MATRIX_PIXEL_RAIN +// # define ENABLE_RGB_MATRIX_PIXEL_FLOW +// # define ENABLE_RGB_MATRIX_PIXEL_FRACTAL + +/* enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined */ +# define ENABLE_RGB_MATRIX_TYPING_HEATMAP +# define ENABLE_RGB_MATRIX_DIGITAL_RAIN + +/* enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined*/ +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +# define ENABLE_RGB_MATRIX_SPLASH +// # define ENABLE_RGB_MATRIX_MULTISPLASH +# define ENABLE_RGB_MATRIX_SOLID_SPLASH +// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH + +/* 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/k12_pro/ansi/rgb/info.json b/keyboards/keychron/k12_pro/ansi/rgb/info.json new file mode 100755 index 0000000000..54d1ba7dbb --- /dev/null +++ b/keyboards/keychron/k12_pro/ansi/rgb/info.json @@ -0,0 +1,85 @@ +{ + "keyboard_name": "Keychron K12 Pro", + "manufacturer": "Keychron", + "url": "https://github.com/Keychron", + "maintainer": "lalalademaxiya1", + "usb": { + "vid": "0x3434", + "pid": "0x02C0", + "device_version": "1.0.0" + }, + "matrix_pins": { + "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null ], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", + "processor": "STM32L432", + "bootloader": "stm32-dfu", + "layouts": { + "LAYOUT_ansi_61": { + "layout": [ + {"matrix":[0,0], "x":0, "y":0}, + {"matrix":[0,1], "x":1, "y":0}, + {"matrix":[0,2], "x":2, "y":0}, + {"matrix":[0,3], "x":3, "y":0}, + {"matrix":[0,4], "x":4, "y":0}, + {"matrix":[0,5], "x":5, "y":0}, + {"matrix":[0,6], "x":6, "y":0}, + {"matrix":[0,7], "x":7, "y":0}, + {"matrix":[0,8], "x":8, "y":0}, + {"matrix":[0,9], "x":9, "y":0}, + {"matrix":[0,10], "x":10, "y":0}, + {"matrix":[0,11], "x":11, "y":0}, + {"matrix":[0,12], "x":12, "y":0}, + {"matrix":[0,13], "x":13, "y":0, "w":2}, + {"matrix":[1,0], "x":0, "y":1, "w":1.5}, + {"matrix":[1,1], "x":1.5, "y":1}, + {"matrix":[1,2], "x":2.5, "y":1}, + {"matrix":[1,3], "x":3.5, "y":1}, + {"matrix":[1,4], "x":4.5, "y":1}, + {"matrix":[1,5], "x":5.5, "y":1}, + {"matrix":[1,6], "x":6.5, "y":1}, + {"matrix":[1,7], "x":7.5, "y":1}, + {"matrix":[1,8], "x":8.5, "y":1}, + {"matrix":[1,9], "x":9.5, "y":1}, + {"matrix":[1,10], "x":10.5, "y":1}, + {"matrix":[1,11], "x":11.5, "y":1}, + {"matrix":[1,12], "x":12.5, "y":1}, + {"matrix":[1,13], "x":13.5, "y":1, "w":1.5}, + {"matrix":[2,0], "x":0, "y":2, "w":1.75}, + {"matrix":[2,1], "x":1.75, "y":2}, + {"matrix":[2,2], "x":2.75, "y":2}, + {"matrix":[2,3], "x":3.75, "y":2}, + {"matrix":[2,4], "x":4.75, "y":2}, + {"matrix":[2,5], "x":5.75, "y":2}, + {"matrix":[2,6], "x":6.75, "y":2}, + {"matrix":[2,7], "x":7.75, "y":2}, + {"matrix":[2,8], "x":8.75, "y":2}, + {"matrix":[2,9], "x":9.75, "y":2}, + {"matrix":[2,10], "x":10.75, "y":2}, + {"matrix":[2,11], "x":11.75, "y":2}, + {"matrix":[2,13], "x":12.75, "y":2, "w":2.25}, + {"matrix":[3,0], "x":0, "y":3, "w":2.25}, + {"matrix":[3,2], "x":2.25, "y":3}, + {"matrix":[3,3], "x":3.25, "y":3}, + {"matrix":[3,4], "x":4.25, "y":3}, + {"matrix":[3,5], "x":5.25, "y":3}, + {"matrix":[3,6], "x":6.25, "y":3}, + {"matrix":[3,7], "x":7.25, "y":3}, + {"matrix":[3,8], "x":8.25, "y":3}, + {"matrix":[3,9], "x":9.25, "y":3}, + {"matrix":[3,10], "x":10.25, "y":3}, + {"matrix":[3,11], "x":11.25, "y":3}, + {"matrix":[3,13], "x":12.25, "y":3, "w":2.75}, + {"matrix":[4,0], "x":0, "y":4, "w":1.25}, + {"matrix":[4,1], "x":1.25, "y":4, "w":1.25}, + {"matrix":[4,2], "x":2.5, "y":4, "w":1.25}, + {"matrix":[4,6], "x":3.75, "y":4, "w":6.25}, + {"matrix":[4,10], "x":10, "y":4, "w":1.25}, + {"matrix":[4,11], "x":11.25, "y":4, "w":1.25}, + {"matrix":[4,12], "x":12.5, "y":4, "w":1.25}, + {"matrix":[4,13], "x":13.75, "y":4, "w":1.25} + ] + } + } +} diff --git a/keyboards/keychron/k12_pro/ansi/rgb/keymaps/default/keymap.c b/keyboards/keychron/k12_pro/ansi/rgb/keymaps/default/keymap.c new file mode 100755 index 0000000000..9ea3fd599c --- /dev/null +++ b/keyboards/keychron/k12_pro/ansi/rgb/keymaps/default/keymap.c @@ -0,0 +1,63 @@ +/* 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, + WIN_BASE, + MAC_FN1, + WIN_FN1, + FN2 +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [MAC_BASE] = LAYOUT_ansi_61( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN1),MO(FN2), KC_RCTL), + + [WIN_BASE] = LAYOUT_ansi_61( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN1),MO(FN2), KC_RCTL), + + [MAC_FN1] = LAYOUT_ansi_61( + KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LNPD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RGB_MOD, + _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, KC_INS, KC_PGUP, KC_HOME, _______, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, KC_UP, KC_SNAP, KC_PGDN, KC_END, _______, + _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL, _______, + _______, _______, _______, _______, _______, _______, _______, _______), + + [WIN_FN1] = LAYOUT_ansi_61( + KC_GRV, 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_MOD, + _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, KC_APP, KC_SCRL, KC_INS, KC_PGUP, KC_HOME, _______, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, KC_UP, KC_PSCR, KC_PGDN, KC_END, _______, + _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL, _______, + _______, _______, _______, _______, _______, _______, _______, _______), + + [FN2] = LAYOUT_ansi_61( + KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, BAT_LVL, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______), +}; diff --git a/keyboards/keychron/k12_pro/ansi/rgb/keymaps/via/keymap.c b/keyboards/keychron/k12_pro/ansi/rgb/keymaps/via/keymap.c new file mode 100755 index 0000000000..9ae0a33690 --- /dev/null +++ b/keyboards/keychron/k12_pro/ansi/rgb/keymaps/via/keymap.c @@ -0,0 +1,63 @@ +/* Copyright 2021 @ 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, + WIN_BASE, + MAC_FN1, + WIN_FN1, + FN2 +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [MAC_BASE] = LAYOUT_ansi_61( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN1),MO(FN2), KC_RCTL), + + [WIN_BASE] = LAYOUT_ansi_61( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN1),MO(FN2), KC_RCTL), + + [MAC_FN1] = LAYOUT_ansi_61( + KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LNPD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RGB_MOD, + _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, KC_INS, KC_PGUP, KC_HOME, _______, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, KC_UP, KC_SNAP, KC_PGDN, KC_END, _______, + _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL, _______, + _______, _______, _______, _______, _______, _______, _______, _______), + + [WIN_FN1] = LAYOUT_ansi_61( + KC_GRV, 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_MOD, + _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, KC_APP, KC_SCRL, KC_INS, KC_PGUP, KC_HOME, _______, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, KC_UP, KC_PSCR, KC_PGDN, KC_END, _______, + _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL, _______, + _______, _______, _______, _______, _______, _______, _______, _______), + + [FN2] = LAYOUT_ansi_61( + KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, BAT_LVL, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______), +}; diff --git a/keyboards/keychron/k12_pro/ansi/rgb/keymaps/via/rules.mk b/keyboards/keychron/k12_pro/ansi/rgb/keymaps/via/rules.mk new file mode 100755 index 0000000000..4eae6e776c --- /dev/null +++ b/keyboards/keychron/k12_pro/ansi/rgb/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +OPT_DEFS += -DDYNAMIC_KEYMAP_LAYER_COUNT=5 diff --git a/keyboards/keychron/k12_pro/ansi/rgb/rgb.c b/keyboards/keychron/k12_pro/ansi/rgb/rgb.c new file mode 100755 index 0000000000..e3ab9e457c --- /dev/null +++ b/keyboards/keychron/k12_pro/ansi/rgb/rgb.c @@ -0,0 +1,123 @@ +/* Copyright 2021 @ 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_16, G_16, H_16}, + {0, I_15, G_15, H_15}, + {0, I_14, G_14, H_14}, + {0, I_13, G_13, H_13}, + {0, I_12, G_12, H_12}, + {0, I_11, G_11, H_11}, + {0, I_10, G_10, H_10}, + {0, I_9, G_9, H_9}, + {0, I_8, G_8, H_8}, + {0, I_7, G_7, H_7}, + {0, I_6, G_6, H_6}, + {0, I_5, G_5, H_5}, + {0, I_4, G_4, H_4}, + {0, I_3, G_3, H_3}, + + {0, F_16, D_16, E_16}, + {0, F_15, D_15, E_15}, + {0, F_14, D_14, E_14}, + {0, F_13, D_13, E_13}, + {0, F_12, D_12, E_12}, + {0, F_11, D_11, E_11}, + {0, F_10, D_10, E_10}, + {0, F_9, D_9, E_9}, + {0, F_8, D_8, E_8}, + {0, F_7, D_7, E_7}, + {0, F_6, D_6, E_6}, + {0, F_5, D_5, E_5}, + {0, F_4, D_4, E_4}, + {0, F_3, D_3, E_3}, + + {0, C_16, A_16, B_16}, + {0, C_15, A_15, B_15}, + {0, C_14, A_14, B_14}, + {0, C_13, A_13, B_13}, + {0, C_12, A_12, B_12}, + {0, C_11, A_11, B_11}, + {0, C_10, A_10, B_10}, + {0, C_9, A_9, B_9}, + {0, C_8, A_8, B_8}, + {0, C_7, A_7, B_7}, + {0, C_6, A_6, B_6}, + {0, C_5, A_5, B_5}, + {0, C_3, A_3, B_3}, + + {0, L_16, J_16, K_16}, + {0, L_14, J_14, K_14}, + {0, L_13, J_13, K_13}, + {0, L_12, J_12, K_12}, + {0, L_11, J_11, K_11}, + {0, L_10, J_10, K_10}, + {0, L_9, J_9, K_9}, + {0, L_8, J_8, K_8}, + {0, L_7, J_7, K_7}, + {0, L_6, J_6, K_6}, + {0, L_5, J_5, K_5}, + {0, L_3, J_3, K_3}, + + {0, C_1, A_1, B_1}, + {0, C_2, A_2, B_2}, + {0, L_1, J_1, K_1}, + {0, L_2, J_2, K_2}, + {0, F_1, D_1, E_1}, + {0, F_2, D_2, E_2}, + {0, I_1, G_1, H_1}, + {0, I_2, G_2, H_2} +}; + +#define __ NO_LED + +led_config_t g_led_config = { + { + // Key Matrix to LED Index + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 }, + { 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27 }, + { 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, __, 40 }, + { 41, __, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, __, 52 }, + { 53, 54, 55, __, __, __, 56, __, __, __, 57, 58, 59, 60 } + }, + { + // LED Index to Physical Position + {0,0}, {16,0}, {32,0}, {48,0}, {65,0}, {81,0}, {97,0}, {113,0}, {129,0}, {145,0}, {161,0}, {178,0}, {194,0}, {218,0}, + {4,16}, {24,16}, {40,16}, {57,16}, {73,16}, {89,16}, {105,16}, {121,16}, {137,16}, {153,16}, {170,16}, {186,16}, {202,16}, {222,16}, + {6,32}, {28,32}, {44,32}, {61,32}, {77,32}, {93,32}, {109,32}, {125,32}, {141,32}, {157,32}, {174,32}, {190,32}, {216,32}, + {10,48}, {36,48}, {52,48}, {69,48}, {85,48}, {101,48}, {117,48}, {133,48}, {149,48}, {165,48}, {182,48}, {212,48}, + {2,64}, {22,64}, {42,64}, {103,64}, {163,64}, {184,64}, {204,64}, {224,64}, + }, + { + // RGB LED Index to Flag + 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 1, 8, 8, 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 1, 1, 1, 4, 1, 4, 4, 1, + } +}; +#endif diff --git a/keyboards/keychron/k12_pro/ansi/rgb/rules.mk b/keyboards/keychron/k12_pro/ansi/rgb/rules.mk new file mode 100755 index 0000000000..7af34ccd60 --- /dev/null +++ b/keyboards/keychron/k12_pro/ansi/rgb/rules.mk @@ -0,0 +1,2 @@ +RGB_MATRIX_ENABLE = yes +RGB_MATRIX_DRIVER = CKLED2001 diff --git a/keyboards/keychron/k12_pro/ansi/white/config.h b/keyboards/keychron/k12_pro/ansi/white/config.h new file mode 100755 index 0000000000..9d998cdd76 --- /dev/null +++ b/keyboards/keychron/k12_pro/ansi/white/config.h @@ -0,0 +1,74 @@ +/* Copyright 2021 @ 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 LED_MATRIX_ENABLE +/* LED matrix driver configuration */ +# define DRIVER_COUNT 1 +# define DRIVER_ADDR_1 0b1110100 +# define LED_MATRIX_LED_COUNT 61 + +/* Set to infinit, which is use in USB mode by default */ +# define LED_MATRIX_TIMEOUT LED_MATRIX_TIMEOUT_INFINITE +/* Allow shutdown of led driver to save power */ +# define LED_MATRIX_DRIVER_SHUTDOWN_ENABLE +/* Turn off backlight on low brightness to save power */ +# define LED_MATRIX_BRIGHTNESS_TURN_OFF_VAL 32 + +# define DIM_CAPS_LOCK +# define CAPS_LOCK_INDEX 28 +# define LOW_BAT_IND_INDEX 56 + +/* LED Matrix Animation modes. Explicitly enabled + * For full list of effects, see: + * https://docs.qmk.fm/#/feature_led_matrix?id=led-matrix-effects + */ +# define LED_MATRIX_KEYPRESSES + +# define ENABLE_LED_MATRIX_NONE +# define ENABLE_LED_MATRIX_SOLID +//# define ENABLE_LED_MATRIX_ALPHAS_MODS +# define ENABLE_LED_MATRIX_BREATHING +//# define ENABLE_LED_MATRIX_BAND +# define ENABLE_LED_MATRIX_BAND_PINWHEEL +# define ENABLE_LED_MATRIX_BAND_SPIRAL +# define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT +# define ENABLE_LED_MATRIX_CYCLE_UP_DOWN +# define ENABLE_LED_MATRIX_CYCLE_OUT_IN +# define ENABLE_LED_MATRIX_DUAL_BEACON + +# define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE +//# define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE +# define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE +//# define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS +//# define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS +//# define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS +# define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS +# define ENABLE_LED_MATRIX_SOLID_SPLASH +//# define ENABLE_LED_MATRIX_SOLID_MULTISPLASH + +# define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT +# define ENABLE_LED_MATRIX_WAVE_UP_DOWN +# define ENABLE_LED_MATRIX_EFFECT_MAX + +/* Use first 6 channels of LED driver */ +# define PHASE_CHANNEL MSKPHASE_6CHANNEL + +/* 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/k12_pro/ansi/white/info.json b/keyboards/keychron/k12_pro/ansi/white/info.json new file mode 100755 index 0000000000..4862eed4ca --- /dev/null +++ b/keyboards/keychron/k12_pro/ansi/white/info.json @@ -0,0 +1,85 @@ +{ + "keyboard_name": "Keychron K12 Pro", + "manufacturer": "Keychron", + "url": "https://github.com/Keychron", + "maintainer": "lalalademaxiya1", + "usb": { + "vid": "0x3434", + "pid": "0x02C3", + "device_version": "1.0.0" + }, + "matrix_pins": { + "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null ], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL", + "processor": "STM32L432", + "bootloader": "stm32-dfu", + "layouts": { + "LAYOUT_ansi_61": { + "layout": [ + {"matrix":[0,0], "x":0, "y":0}, + {"matrix":[0,1], "x":1, "y":0}, + {"matrix":[0,2], "x":2, "y":0}, + {"matrix":[0,3], "x":3, "y":0}, + {"matrix":[0,4], "x":4, "y":0}, + {"matrix":[0,5], "x":5, "y":0}, + {"matrix":[0,6], "x":6, "y":0}, + {"matrix":[0,7], "x":7, "y":0}, + {"matrix":[0,8], "x":8, "y":0}, + {"matrix":[0,9], "x":9, "y":0}, + {"matrix":[0,10], "x":10, "y":0}, + {"matrix":[0,11], "x":11, "y":0}, + {"matrix":[0,12], "x":12, "y":0}, + {"matrix":[0,13], "x":13, "y":0, "w":2}, + {"matrix":[1,0], "x":0, "y":1, "w":1.5}, + {"matrix":[1,1], "x":1.5, "y":1}, + {"matrix":[1,2], "x":2.5, "y":1}, + {"matrix":[1,3], "x":3.5, "y":1}, + {"matrix":[1,4], "x":4.5, "y":1}, + {"matrix":[1,5], "x":5.5, "y":1}, + {"matrix":[1,6], "x":6.5, "y":1}, + {"matrix":[1,7], "x":7.5, "y":1}, + {"matrix":[1,8], "x":8.5, "y":1}, + {"matrix":[1,9], "x":9.5, "y":1}, + {"matrix":[1,10], "x":10.5, "y":1}, + {"matrix":[1,11], "x":11.5, "y":1}, + {"matrix":[1,12], "x":12.5, "y":1}, + {"matrix":[1,13], "x":13.5, "y":1, "w":1.5}, + {"matrix":[2,0], "x":0, "y":2, "w":1.75}, + {"matrix":[2,1], "x":1.75, "y":2}, + {"matrix":[2,2], "x":2.75, "y":2}, + {"matrix":[2,3], "x":3.75, "y":2}, + {"matrix":[2,4], "x":4.75, "y":2}, + {"matrix":[2,5], "x":5.75, "y":2}, + {"matrix":[2,6], "x":6.75, "y":2}, + {"matrix":[2,7], "x":7.75, "y":2}, + {"matrix":[2,8], "x":8.75, "y":2}, + {"matrix":[2,9], "x":9.75, "y":2}, + {"matrix":[2,10], "x":10.75, "y":2}, + {"matrix":[2,11], "x":11.75, "y":2}, + {"matrix":[2,13], "x":12.75, "y":2, "w":2.25}, + {"matrix":[3,0], "x":0, "y":3, "w":2.25}, + {"matrix":[3,2], "x":2.25, "y":3}, + {"matrix":[3,3], "x":3.25, "y":3}, + {"matrix":[3,4], "x":4.25, "y":3}, + {"matrix":[3,5], "x":5.25, "y":3}, + {"matrix":[3,6], "x":6.25, "y":3}, + {"matrix":[3,7], "x":7.25, "y":3}, + {"matrix":[3,8], "x":8.25, "y":3}, + {"matrix":[3,9], "x":9.25, "y":3}, + {"matrix":[3,10], "x":10.25, "y":3}, + {"matrix":[3,11], "x":11.25, "y":3}, + {"matrix":[3,13], "x":12.25, "y":3, "w":2.75}, + {"matrix":[4,0], "x":0, "y":4, "w":1.25}, + {"matrix":[4,1], "x":1.25, "y":4, "w":1.25}, + {"matrix":[4,2], "x":2.5, "y":4, "w":1.25}, + {"matrix":[4,6], "x":3.75, "y":4, "w":6.25}, + {"matrix":[4,10], "x":10, "y":4, "w":1.25}, + {"matrix":[4,11], "x":11.25, "y":4, "w":1.25}, + {"matrix":[4,12], "x":12.5, "y":4, "w":1.25}, + {"matrix":[4,13], "x":13.75, "y":4, "w":1.25} + ] + } + } +} diff --git a/keyboards/keychron/k12_pro/ansi/white/keymaps/default/keymap.c b/keyboards/keychron/k12_pro/ansi/white/keymaps/default/keymap.c new file mode 100755 index 0000000000..dcbea75c81 --- /dev/null +++ b/keyboards/keychron/k12_pro/ansi/white/keymaps/default/keymap.c @@ -0,0 +1,63 @@ +/* Copyright 2021 @ 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, + WIN_BASE, + MAC_FN1, + WIN_FN1, + FN2 +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [MAC_BASE] = LAYOUT_ansi_61( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN1),MO(FN2), KC_RCTL), + + [WIN_BASE] = LAYOUT_ansi_61( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN1),MO(FN2), KC_RCTL), + + [MAC_FN1] = LAYOUT_ansi_61( + KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LNPD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, BL_STEP, + _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, KC_INS, KC_PGUP, KC_HOME, _______, + BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, KC_UP, KC_SNAP, KC_PGDN, KC_END, _______, + _______, _______, BL_DOWN, _______, _______, _______, NK_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL, _______, + _______, _______, _______, _______, _______, _______, _______, _______), + + [WIN_FN1] = LAYOUT_ansi_61( + KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, BL_STEP, + _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, KC_APP, KC_SCRL, KC_INS, KC_PGUP, KC_HOME, _______, + BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, KC_UP, KC_PSCR, KC_PGDN, KC_END, _______, + _______, _______, BL_DOWN, _______, _______, _______, NK_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL, _______, + _______, _______, _______, _______, _______, _______, _______, _______), + + [FN2] = LAYOUT_ansi_61( + KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, BAT_LVL, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______), +}; diff --git a/keyboards/keychron/k12_pro/ansi/white/keymaps/via/keymap.c b/keyboards/keychron/k12_pro/ansi/white/keymaps/via/keymap.c new file mode 100755 index 0000000000..dcbea75c81 --- /dev/null +++ b/keyboards/keychron/k12_pro/ansi/white/keymaps/via/keymap.c @@ -0,0 +1,63 @@ +/* Copyright 2021 @ 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, + WIN_BASE, + MAC_FN1, + WIN_FN1, + FN2 +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [MAC_BASE] = LAYOUT_ansi_61( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN1),MO(FN2), KC_RCTL), + + [WIN_BASE] = LAYOUT_ansi_61( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN1),MO(FN2), KC_RCTL), + + [MAC_FN1] = LAYOUT_ansi_61( + KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LNPD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, BL_STEP, + _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, KC_INS, KC_PGUP, KC_HOME, _______, + BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, KC_UP, KC_SNAP, KC_PGDN, KC_END, _______, + _______, _______, BL_DOWN, _______, _______, _______, NK_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL, _______, + _______, _______, _______, _______, _______, _______, _______, _______), + + [WIN_FN1] = LAYOUT_ansi_61( + KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, BL_STEP, + _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, KC_APP, KC_SCRL, KC_INS, KC_PGUP, KC_HOME, _______, + BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, KC_UP, KC_PSCR, KC_PGDN, KC_END, _______, + _______, _______, BL_DOWN, _______, _______, _______, NK_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL, _______, + _______, _______, _______, _______, _______, _______, _______, _______), + + [FN2] = LAYOUT_ansi_61( + KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, BAT_LVL, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______), +}; diff --git a/keyboards/keychron/k12_pro/ansi/white/keymaps/via/rules.mk b/keyboards/keychron/k12_pro/ansi/white/keymaps/via/rules.mk new file mode 100755 index 0000000000..4eae6e776c --- /dev/null +++ b/keyboards/keychron/k12_pro/ansi/white/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +OPT_DEFS += -DDYNAMIC_KEYMAP_LAYER_COUNT=5 diff --git a/keyboards/keychron/k12_pro/ansi/white/rules.mk b/keyboards/keychron/k12_pro/ansi/white/rules.mk new file mode 100755 index 0000000000..6b0c2a0769 --- /dev/null +++ b/keyboards/keychron/k12_pro/ansi/white/rules.mk @@ -0,0 +1,2 @@ +LED_MATRIX_ENABLE = yes +LED_MATRIX_DRIVER = CKLED2001 \ No newline at end of file diff --git a/keyboards/keychron/k12_pro/ansi/white/white.c b/keyboards/keychron/k12_pro/ansi/white/white.c new file mode 100755 index 0000000000..9df73fd3ac --- /dev/null +++ b/keyboards/keychron/k12_pro/ansi/white/white.c @@ -0,0 +1,121 @@ +/* Copyright 2022 @ 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 LED_MATRIX_ENABLE +const ckled2001_led g_ckled2001_leds[LED_MATRIX_LED_COUNT] = { +/* Refer to CKLED2001 manual for these locations + * driver + * | LED address + * | | */ + {0, B_16}, + {0, B_15}, + {0, B_14}, + {0, B_13}, + {0, B_12}, + {0, B_11}, + {0, B_10}, + {0, B_9}, + {0, B_8}, + {0, B_7}, + {0, B_6}, + {0, B_5}, + {0, B_4}, + {0, B_3}, + + {0, C_16}, + {0, C_15}, + {0, C_14}, + {0, C_13}, + {0, C_12}, + {0, C_11}, + {0, C_10}, + {0, C_9}, + {0, C_8}, + {0, C_7}, + {0, C_6}, + {0, C_5}, + {0, C_4}, + {0, C_3}, + + {0, D_16}, + {0, D_15}, + {0, D_14}, + {0, D_13}, + {0, D_12}, + {0, D_11}, + {0, D_10}, + {0, D_9}, + {0, D_8}, + {0, D_7}, + {0, D_6}, + {0, D_5}, + {0, D_3}, + + {0, E_16}, + {0, E_14}, + {0, E_13}, + {0, E_12}, + {0, E_11}, + {0, E_10}, + {0, E_9}, + {0, E_8}, + {0, E_7}, + {0, E_6}, + {0, E_5}, + {0, E_3}, + + {0, F_16}, + {0, F_15}, + {0, F_14}, + {0, F_10}, + {0, F_6}, + {0, F_5}, + {0, F_4}, + {0, F_3}, +}; + +#define __ NO_LED + +led_config_t g_led_config = { + { + // Key Matrix to LED Index + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 }, + { 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27 }, + { 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, __, 40 }, + { 41, __, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, __, 52 }, + { 53, 54, 55, __, __, __, 56, __, __, __, 57, 58, 59, 60 } + }, + { + // LED Index to Physical Position + {0,0}, {16,0}, {32,0}, {48,0}, {65,0}, {81,0}, {97,0}, {113,0}, {129,0}, {145,0}, {161,0}, {178,0}, {194,0}, {218,0}, + {4,16}, {24,16}, {40,16}, {57,16}, {73,16}, {89,16}, {105,16}, {121,16}, {137,16}, {153,16}, {170,16}, {186,16}, {202,16}, {222,16}, + {6,32}, {28,32}, {44,32}, {61,32}, {77,32}, {93,32}, {109,32}, {125,32}, {141,32}, {157,32}, {174,32}, {190,32}, {216,32}, + {10,48}, {36,48}, {52,48}, {69,48}, {85,48}, {101,48}, {117,48}, {133,48}, {149,48}, {165,48}, {182,48}, {212,48}, + {2,64}, {22,64}, {42,64}, {103,64}, {163,64}, {184,64}, {204,64}, {224,64}, + }, + { + // RGB LED Index to Flag + 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 1, 8, 8, 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 1, 1, 1, 4, 1, 4, 4, 1, + } +}; +#endif diff --git a/keyboards/keychron/k12_pro/config.h b/keyboards/keychron/k12_pro/config.h new file mode 100755 index 0000000000..ee1d93d9a8 --- /dev/null +++ b/keyboards/keychron/k12_pro/config.h @@ -0,0 +1,92 @@ +/* Copyright 2022 @ 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 + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCE 5 + +/* DIP switch for Mac/win OS switch */ +#define DIP_SWITCH_PINS \ + { A8 } + +/* Caps lock LED Pin */ +#define LED_CAPS_LOCK_PIN A0 +#define LED_PIN_ON_STATE 1 + +/* 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 A10 + +# 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) || defined(LED_MATRIX_ENABLE) + +# define LED_DRIVER_SHUTDOWN_PIN C14 + +# define HOST_LED_MATRIX_LIST \ + { 15, 16, 17 } + +# define BAT_LEVEL_LED_LIST \ + { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 } + +/* 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 + +/* Emulated EEPROM configuration */ +#define FEE_DENSITY_BYTES FEE_PAGE_SIZE +#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047 + +/* Factory test keys */ +#define FN_KEY1 MO(4) diff --git a/keyboards/keychron/k12_pro/halconf.h b/keyboards/keychron/k12_pro/halconf.h new file mode 100755 index 0000000000..fafd0c1fed --- /dev/null +++ b/keyboards/keychron/k12_pro/halconf.h @@ -0,0 +1,27 @@ +/* Copyright 2020 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 HAL_USE_I2C 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/k12_pro/k12_pro.c b/keyboards/keychron/k12_pro/k12_pro.c new file mode 100755 index 0000000000..ee10feb979 --- /dev/null +++ b/keyboards/keychron/k12_pro/k12_pro.c @@ -0,0 +1,301 @@ +/* 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 "k12_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 ? 1 : 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_MCTL: + /* Mission Control */ + host_consumer_send(record->event.pressed ? 0x29F : 0); + return false; // Skip all further processing of this key + case KC_LNPD: + /* Lanuchpad */ + host_consumer_send(record->event.pressed ? 0x2A0 : 0); + 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() | 1; + } + 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; +} + +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); + 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/k12_pro/k12_pro.h b/keyboards/keychron/k12_pro/k12_pro.h new file mode 100755 index 0000000000..d229b15380 --- /dev/null +++ b/keyboards/keychron/k12_pro/k12_pro.h @@ -0,0 +1,52 @@ +/* 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 USER00 +#else +# define USER_START SAFE_RANGE +#endif + +// clang-format off +enum { + KC_LOPTN = USER_START, + KC_ROPTN, + KC_LCMMD, + KC_RCMMD, + KC_MCTL, + KC_LNPD, + KC_TASK, + KC_FILE, + KC_SNAP, + KC_CTANA, + KC_SIRI, +#ifdef KC_BLUETOOTH_ENABLE + BT_HST1, + BT_HST2, + BT_HST3, +#endif + BAT_LVL, + NEW_SAFE_RANGE, +}; diff --git a/keyboards/keychron/k12_pro/mcuconf.h b/keyboards/keychron/k12_pro/mcuconf.h new file mode 100755 index 0000000000..fc7c1de23c --- /dev/null +++ b/keyboards/keychron/k12_pro/mcuconf.h @@ -0,0 +1,37 @@ +/* Copyright 2020 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 + +#ifdef KC_BLUETOOTH_ENABLE +# undef STM32_SERIAL_USE_USART2 +# define STM32_SERIAL_USE_USART2 TRUE +#endif \ No newline at end of file diff --git a/keyboards/keychron/k12_pro/readme.md b/keyboards/keychron/k12_pro/readme.md new file mode 100755 index 0000000000..5becacaf56 --- /dev/null +++ b/keyboards/keychron/k12_pro/readme.md @@ -0,0 +1,23 @@ +# Keychron K12 Pro + +![Keychron K6 Pro]() + +A customizable 60% keyboard. + +* Keyboard Maintainer: [Keychron](https://github.com/keychron) +* Hardware Supported: Keychron K12 Pro +* Hardware Availability: + +Make example for this keyboard (after setting up your build environment): + + make keychron/k12_pro/ansi/rgb:default + make keychron/k12_pro/ansi/white:default + +Flashing example for this keyboard: + + make keychron/k12_pro/ansi/rgb:default:flash + make keychron/k12_pro/ansi/white: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/k12_pro/rules.mk b/keyboards/keychron/k12_pro/rules.mk new file mode 100755 index 0000000000..e1659c0112 --- /dev/null +++ b/keyboards/keychron/k12_pro/rules.mk @@ -0,0 +1,11 @@ +# 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 + +VPATH += keyboards/keychron/common +SRC += matrix.c + +include keyboards/keychron/bluetooth/bluetooth.mk From b487b5be0a5035ed3645c83ed5b49bdc860a3889 Mon Sep 17 00:00:00 2001 From: lalalademaxiya1 <2831039915@qq.com> Date: Sat, 10 Jun 2023 11:15:42 +0800 Subject: [PATCH 02/15] Update k12 pro --- keyboards/keychron/k12_pro/ansi/rgb/rules.mk | 3 +-- keyboards/keychron/k12_pro/config.h | 6 +----- keyboards/keychron/k12_pro/k12_pro.h | 13 ++++++++----- keyboards/keychron/k12_pro/readme.md | 4 ++-- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/keyboards/keychron/k12_pro/ansi/rgb/rules.mk b/keyboards/keychron/k12_pro/ansi/rgb/rules.mk index 7af34ccd60..6e7633bfe0 100755 --- a/keyboards/keychron/k12_pro/ansi/rgb/rules.mk +++ b/keyboards/keychron/k12_pro/ansi/rgb/rules.mk @@ -1,2 +1 @@ -RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = CKLED2001 +# This file intentionally left blank diff --git a/keyboards/keychron/k12_pro/config.h b/keyboards/keychron/k12_pro/config.h index ee1d93d9a8..be20e88e12 100755 --- a/keyboards/keychron/k12_pro/config.h +++ b/keyboards/keychron/k12_pro/config.h @@ -20,12 +20,8 @@ #define RGB_DISABLE_WHEN_USB_SUSPENDED #define LED_DISABLE_WHEN_USB_SUSPENDED -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - /* DIP switch for Mac/win OS switch */ -#define DIP_SWITCH_PINS \ - { A8 } +#define DIP_SWITCH_PINS { A8 } /* Caps lock LED Pin */ #define LED_CAPS_LOCK_PIN A0 diff --git a/keyboards/keychron/k12_pro/k12_pro.h b/keyboards/keychron/k12_pro/k12_pro.h index d229b15380..cd0954d579 100755 --- a/keyboards/keychron/k12_pro/k12_pro.h +++ b/keyboards/keychron/k12_pro/k12_pro.h @@ -24,7 +24,7 @@ #define ___ KC_NO #ifdef VIA_ENABLE -# define USER_START USER00 +# define USER_START QK_KB_0 #else # define USER_START SAFE_RANGE #endif @@ -35,8 +35,6 @@ enum { KC_ROPTN, KC_LCMMD, KC_RCMMD, - KC_MCTL, - KC_LNPD, KC_TASK, KC_FILE, KC_SNAP, @@ -46,7 +44,12 @@ enum { BT_HST1, BT_HST2, BT_HST3, -#endif BAT_LVL, - NEW_SAFE_RANGE, +#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/k12_pro/readme.md b/keyboards/keychron/k12_pro/readme.md index 5becacaf56..34cc89c63d 100755 --- a/keyboards/keychron/k12_pro/readme.md +++ b/keyboards/keychron/k12_pro/readme.md @@ -1,12 +1,12 @@ # Keychron K12 Pro -![Keychron K6 Pro]() +![Keychron K12 Pro](https://i.imgur.com/1nFRfJs.jpg) A customizable 60% keyboard. * Keyboard Maintainer: [Keychron](https://github.com/keychron) * Hardware Supported: Keychron K12 Pro -* Hardware Availability: +* Hardware Availability: [Keychron K12 Pro QMK/VIA Wireless Mechanical Keyboard]() Make example for this keyboard (after setting up your build environment): From 034f6724208b3b37e2cd398408fef3743276d31a Mon Sep 17 00:00:00 2001 From: lalalademaxiya1 <2831039915@qq.com> Date: Thu, 15 Jun 2023 11:01:52 +0800 Subject: [PATCH 03/15] Add k12 pro --- keyboards/keychron/k12_pro/ansi/rgb/config.h | 65 +----- keyboards/keychron/k12_pro/ansi/rgb/info.json | 112 +++++++++-- .../k12_pro/ansi/rgb/keymaps/default/keymap.c | 14 +- .../k12_pro/ansi/rgb/keymaps/via/keymap.c | 16 +- keyboards/keychron/k12_pro/ansi/rgb/rgb.c | 31 +-- .../keychron/k12_pro/ansi/white/config.h | 46 ++--- .../keychron/k12_pro/ansi/white/info.json | 107 ++++++++-- .../ansi/white/keymaps/default/keymap.c | 16 +- .../k12_pro/ansi/white/keymaps/via/keymap.c | 16 +- .../keychron/k12_pro/ansi/white/rules.mk | 3 +- keyboards/keychron/k12_pro/ansi/white/white.c | 31 +-- keyboards/keychron/k12_pro/config.h | 14 +- keyboards/keychron/k12_pro/halconf.h | 2 + keyboards/keychron/k12_pro/info.json | 27 +++ keyboards/keychron/k12_pro/k12_pro.c | 45 +++-- keyboards/keychron/k12_pro/matrix.c | 190 ++++++++++++++++++ keyboards/keychron/k12_pro/mcuconf.h | 3 +- keyboards/keychron/k12_pro/rules.mk | 3 - 18 files changed, 506 insertions(+), 235 deletions(-) create mode 100755 keyboards/keychron/k12_pro/info.json create mode 100755 keyboards/keychron/k12_pro/matrix.c diff --git a/keyboards/keychron/k12_pro/ansi/rgb/config.h b/keyboards/keychron/k12_pro/ansi/rgb/config.h index 87e2fdd57e..29bf4ecbb8 100755 --- a/keyboards/keychron/k12_pro/ansi/rgb/config.h +++ b/keyboards/keychron/k12_pro/ansi/rgb/config.h @@ -19,7 +19,6 @@ #ifdef RGB_MATRIX_ENABLE /* RGB Matrix driver configuration */ # define DRIVER_COUNT 1 - # define DRIVER_ADDR_1 0b1110100 # define DRIVER_1_LED_COUNT 61 # define RGB_MATRIX_LED_COUNT DRIVER_1_LED_COUNT @@ -27,73 +26,25 @@ /* Set to infinit, which is use in USB mode by default */ # define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE + /* Allow shutdown of led driver to save power */ # define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE -/* Turn off backlight on low brightness to save power */ -# define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 32 +/* Turn off backlight on low brightness to save power */ +# define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48 + +/* Indication led */ # define DIM_CAPS_LOCK # define CAPS_LOCK_INDEX 28 # define LOW_BAT_IND_INDEX 56 -/* RGB Matrix Animation modes. Explicitly enabled - * For full list of effects, see: - * https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects - */ - +// RGB Matrix Animation modes. Explicitly enabled +// For full list of effects, see: +// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects # define RGB_MATRIX_KEYPRESSES # define RGB_MATRIX_FRAMEBUFFER_EFFECTS -// # define ENABLE_RGB_MATRIX_ALPHAS_MODS -// # define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN -// # define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT -# define ENABLE_RGB_MATRIX_BREATHING -// # define ENABLE_RGB_MATRIX_BAND_SAT -// # define ENABLE_RGB_MATRIX_BAND_VAL -// # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT -// # define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL -// # define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT -# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL -# define ENABLE_RGB_MATRIX_CYCLE_ALL -# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT -# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN -# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON -# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN -# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL -# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL -# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL -# define ENABLE_RGB_MATRIX_DUAL_BEACON -# define ENABLE_RGB_MATRIX_RAINBOW_BEACON -// # define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS -// # define ENABLE_RGB_MATRIX_RAINDROPS -# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS -// # define ENABLE_RGB_MATRIX_HUE_BREATHING -// # define ENABLE_RGB_MATRIX_HUE_PENDULUM -// # define ENABLE_RGB_MATRIX_HUE_WAVE -# define ENABLE_RGB_MATRIX_PIXEL_RAIN -// # define ENABLE_RGB_MATRIX_PIXEL_FLOW -// # define ENABLE_RGB_MATRIX_PIXEL_FRACTAL - -/* enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined */ -# define ENABLE_RGB_MATRIX_TYPING_HEATMAP -# define ENABLE_RGB_MATRIX_DIGITAL_RAIN - -/* enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined*/ -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE -// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE -// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE -// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS -// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS -# define ENABLE_RGB_MATRIX_SPLASH -// # define ENABLE_RGB_MATRIX_MULTISPLASH -# define ENABLE_RGB_MATRIX_SOLID_SPLASH -// # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH - /* 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/k12_pro/ansi/rgb/info.json b/keyboards/keychron/k12_pro/ansi/rgb/info.json index 54d1ba7dbb..076ff2981a 100755 --- a/keyboards/keychron/k12_pro/ansi/rgb/info.json +++ b/keyboards/keychron/k12_pro/ansi/rgb/info.json @@ -1,22 +1,13 @@ { - "keyboard_name": "Keychron K12 Pro", - "manufacturer": "Keychron", - "url": "https://github.com/Keychron", - "maintainer": "lalalademaxiya1", "usb": { - "vid": "0x3434", "pid": "0x02C0", "device_version": "1.0.0" }, - "matrix_pins": { - "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null ], - "rows": ["B4", "B3", "A15", "A14", "A13"] + "features": { + "rgb_matrix": true }, - "diode_direction": "ROW2COL", - "processor": "STM32L432", - "bootloader": "stm32-dfu", "layouts": { - "LAYOUT_ansi_61": { + "LAYOUT_61_ansi": { "layout": [ {"matrix":[0,0], "x":0, "y":0}, {"matrix":[0,1], "x":1, "y":0}, @@ -32,6 +23,7 @@ {"matrix":[0,11], "x":11, "y":0}, {"matrix":[0,12], "x":12, "y":0}, {"matrix":[0,13], "x":13, "y":0, "w":2}, + {"matrix":[1,0], "x":0, "y":1, "w":1.5}, {"matrix":[1,1], "x":1.5, "y":1}, {"matrix":[1,2], "x":2.5, "y":1}, @@ -46,6 +38,7 @@ {"matrix":[1,11], "x":11.5, "y":1}, {"matrix":[1,12], "x":12.5, "y":1}, {"matrix":[1,13], "x":13.5, "y":1, "w":1.5}, + {"matrix":[2,0], "x":0, "y":2, "w":1.75}, {"matrix":[2,1], "x":1.75, "y":2}, {"matrix":[2,2], "x":2.75, "y":2}, @@ -59,6 +52,7 @@ {"matrix":[2,10], "x":10.75, "y":2}, {"matrix":[2,11], "x":11.75, "y":2}, {"matrix":[2,13], "x":12.75, "y":2, "w":2.25}, + {"matrix":[3,0], "x":0, "y":3, "w":2.25}, {"matrix":[3,2], "x":2.25, "y":3}, {"matrix":[3,3], "x":3.25, "y":3}, @@ -71,6 +65,7 @@ {"matrix":[3,10], "x":10.25, "y":3}, {"matrix":[3,11], "x":11.25, "y":3}, {"matrix":[3,13], "x":12.25, "y":3, "w":2.75}, + {"matrix":[4,0], "x":0, "y":4, "w":1.25}, {"matrix":[4,1], "x":1.25, "y":4, "w":1.25}, {"matrix":[4,2], "x":2.5, "y":4, "w":1.25}, @@ -81,5 +76,98 @@ {"matrix":[4,13], "x":13.75, "y":4, "w":1.25} ] } + }, + "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 + }, + "layout": [ + {"matrix":[0, 0], "flags":1, "x":0, "y":0}, + {"matrix":[0, 1], "flags":4, "x":16, "y":0}, + {"matrix":[0, 2], "flags":4, "x":32, "y":0}, + {"matrix":[0, 3], "flags":4, "x":48, "y":0}, + {"matrix":[0, 4], "flags":4, "x":65, "y":0}, + {"matrix":[0, 5], "flags":4, "x":81, "y":0}, + {"matrix":[0, 6], "flags":4, "x":97, "y":0}, + {"matrix":[0, 7], "flags":4, "x":113, "y":0}, + {"matrix":[0, 8], "flags":4, "x":129, "y":0}, + {"matrix":[0, 9], "flags":4, "x":145, "y":0}, + {"matrix":[0, 10], "flags":4, "x":161, "y":0}, + {"matrix":[0, 11], "flags":4, "x":178, "y":0}, + {"matrix":[0, 12], "flags":4, "x":194, "y":0}, + {"matrix":[0, 13], "flags":1, "x":218, "y":0}, + + {"matrix":[1, 0], "flags":1, "x":4, "y":16}, + {"matrix":[1, 1], "flags":8, "x":24, "y":16}, + {"matrix":[1, 2], "flags":8, "x":40, "y":16}, + {"matrix":[1, 3], "flags":8, "x":57, "y":16}, + {"matrix":[1, 4], "flags":4, "x":73, "y":16}, + {"matrix":[1, 5], "flags":4, "x":89, "y":16}, + {"matrix":[1, 6], "flags":4, "x":105, "y":16}, + {"matrix":[1, 7], "flags":4, "x":121, "y":16}, + {"matrix":[1, 8], "flags":4, "x":137, "y":16}, + {"matrix":[1, 9], "flags":4, "x":153, "y":16}, + {"matrix":[1, 10], "flags":4, "x":170, "y":16}, + {"matrix":[1, 11], "flags":4, "x":186, "y":16}, + {"matrix":[1, 12], "flags":4, "x":202, "y":16}, + {"matrix":[1, 13], "flags":1, "x":222, "y":16}, + + {"matrix":[2, 0], "flags":8, "x":6, "y":32}, + {"matrix":[2, 1], "flags":4, "x":28, "y":32}, + {"matrix":[2, 2], "flags":4, "x":44, "y":32}, + {"matrix":[2, 3], "flags":4, "x":61, "y":32}, + {"matrix":[2, 4], "flags":4, "x":77, "y":32}, + {"matrix":[2, 5], "flags":4, "x":93, "y":32}, + {"matrix":[2, 6], "flags":4, "x":109, "y":32}, + {"matrix":[2, 7], "flags":4, "x":125, "y":32}, + {"matrix":[2, 8], "flags":4, "x":141, "y":32}, + {"matrix":[2, 9], "flags":4, "x":157, "y":32}, + {"matrix":[2, 10], "flags":4, "x":174, "y":32}, + {"matrix":[2, 11], "flags":4, "x":190, "y":32}, + {"matrix":[2, 13], "flags":1, "x":216, "y":32}, + + {"matrix":[3, 0], "flags":1, "x":10, "y":48}, + {"matrix":[3, 2], "flags":4, "x":36, "y":48}, + {"matrix":[3, 3], "flags":4, "x":52, "y":48}, + {"matrix":[3, 4], "flags":4, "x":69, "y":48}, + {"matrix":[3, 5], "flags":4, "x":85, "y":48}, + {"matrix":[3, 6], "flags":4, "x":101, "y":48}, + {"matrix":[3, 7], "flags":4, "x":117, "y":48}, + {"matrix":[3, 8], "flags":4, "x":133, "y":48}, + {"matrix":[3, 9], "flags":4, "x":149, "y":48}, + {"matrix":[3, 10], "flags":4, "x":165, "y":48}, + {"matrix":[3, 11], "flags":4, "x":182, "y":48}, + {"matrix":[3, 13], "flags":1, "x":212, "y":48}, + + {"matrix":[4, 0], "flags":1, "x":2, "y":64}, + {"matrix":[4, 1], "flags":1, "x":22, "y":64}, + {"matrix":[4, 2], "flags":1, "x":42, "y":64}, + {"matrix":[4, 6], "flags":4, "x":103, "y":64}, + {"matrix":[4, 10], "flags":1, "x":163, "y":64}, + {"matrix":[4, 11], "flags":1, "x":184, "y":64}, + {"matrix":[4, 12], "flags":1, "x":204, "y":64}, + {"matrix":[4, 13], "flags":1, "x":224, "y":64} + ] } } diff --git a/keyboards/keychron/k12_pro/ansi/rgb/keymaps/default/keymap.c b/keyboards/keychron/k12_pro/ansi/rgb/keymaps/default/keymap.c index 9ea3fd599c..fe95a35ea7 100755 --- a/keyboards/keychron/k12_pro/ansi/rgb/keymaps/default/keymap.c +++ b/keyboards/keychron/k12_pro/ansi/rgb/keymaps/default/keymap.c @@ -22,39 +22,39 @@ enum layers{ WIN_BASE, MAC_FN1, WIN_FN1, - FN2 + FN2, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [MAC_BASE] = LAYOUT_ansi_61( + [MAC_BASE] = LAYOUT_61_ansi( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN1),MO(FN2), KC_RCTL), - [WIN_BASE] = LAYOUT_ansi_61( + [WIN_BASE] = LAYOUT_61_ansi( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN1),MO(FN2), KC_RCTL), - [MAC_FN1] = LAYOUT_ansi_61( - KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LNPD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RGB_MOD, + [MAC_FN1] = LAYOUT_61_ansi( + KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RGB_MOD, _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, KC_INS, KC_PGUP, KC_HOME, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, KC_UP, KC_SNAP, KC_PGDN, KC_END, _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______), - [WIN_FN1] = LAYOUT_ansi_61( + [WIN_FN1] = LAYOUT_61_ansi( KC_GRV, 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_MOD, _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, KC_APP, KC_SCRL, KC_INS, KC_PGUP, KC_HOME, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, KC_UP, KC_PSCR, KC_PGDN, KC_END, _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______), - [FN2] = LAYOUT_ansi_61( + [FN2] = LAYOUT_61_ansi( KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/keychron/k12_pro/ansi/rgb/keymaps/via/keymap.c b/keyboards/keychron/k12_pro/ansi/rgb/keymaps/via/keymap.c index 9ae0a33690..fe95a35ea7 100755 --- a/keyboards/keychron/k12_pro/ansi/rgb/keymaps/via/keymap.c +++ b/keyboards/keychron/k12_pro/ansi/rgb/keymaps/via/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.com) +/* 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 @@ -22,39 +22,39 @@ enum layers{ WIN_BASE, MAC_FN1, WIN_FN1, - FN2 + FN2, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [MAC_BASE] = LAYOUT_ansi_61( + [MAC_BASE] = LAYOUT_61_ansi( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN1),MO(FN2), KC_RCTL), - [WIN_BASE] = LAYOUT_ansi_61( + [WIN_BASE] = LAYOUT_61_ansi( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN1),MO(FN2), KC_RCTL), - [MAC_FN1] = LAYOUT_ansi_61( - KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LNPD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RGB_MOD, + [MAC_FN1] = LAYOUT_61_ansi( + KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RGB_MOD, _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, KC_INS, KC_PGUP, KC_HOME, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, KC_UP, KC_SNAP, KC_PGDN, KC_END, _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______), - [WIN_FN1] = LAYOUT_ansi_61( + [WIN_FN1] = LAYOUT_61_ansi( KC_GRV, 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_MOD, _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, KC_APP, KC_SCRL, KC_INS, KC_PGUP, KC_HOME, _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, KC_UP, KC_PSCR, KC_PGDN, KC_END, _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, NK_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______), - [FN2] = LAYOUT_ansi_61( + [FN2] = LAYOUT_61_ansi( KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/keychron/k12_pro/ansi/rgb/rgb.c b/keyboards/keychron/k12_pro/ansi/rgb/rgb.c index e3ab9e457c..dadd8454f4 100755 --- a/keyboards/keychron/k12_pro/ansi/rgb/rgb.c +++ b/keyboards/keychron/k12_pro/ansi/rgb/rgb.c @@ -1,4 +1,4 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.com) +/* 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 @@ -91,33 +91,4 @@ const ckled2001_led g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { {0, I_1, G_1, H_1}, {0, I_2, G_2, H_2} }; - -#define __ NO_LED - -led_config_t g_led_config = { - { - // Key Matrix to LED Index - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 }, - { 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27 }, - { 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, __, 40 }, - { 41, __, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, __, 52 }, - { 53, 54, 55, __, __, __, 56, __, __, __, 57, 58, 59, 60 } - }, - { - // LED Index to Physical Position - {0,0}, {16,0}, {32,0}, {48,0}, {65,0}, {81,0}, {97,0}, {113,0}, {129,0}, {145,0}, {161,0}, {178,0}, {194,0}, {218,0}, - {4,16}, {24,16}, {40,16}, {57,16}, {73,16}, {89,16}, {105,16}, {121,16}, {137,16}, {153,16}, {170,16}, {186,16}, {202,16}, {222,16}, - {6,32}, {28,32}, {44,32}, {61,32}, {77,32}, {93,32}, {109,32}, {125,32}, {141,32}, {157,32}, {174,32}, {190,32}, {216,32}, - {10,48}, {36,48}, {52,48}, {69,48}, {85,48}, {101,48}, {117,48}, {133,48}, {149,48}, {165,48}, {182,48}, {212,48}, - {2,64}, {22,64}, {42,64}, {103,64}, {163,64}, {184,64}, {204,64}, {224,64}, - }, - { - // RGB LED Index to Flag - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 1, 8, 8, 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 1, 1, 1, 4, 1, 4, 4, 1, - } -}; #endif diff --git a/keyboards/keychron/k12_pro/ansi/white/config.h b/keyboards/keychron/k12_pro/ansi/white/config.h index 9d998cdd76..6d384f56fb 100755 --- a/keyboards/keychron/k12_pro/ansi/white/config.h +++ b/keyboards/keychron/k12_pro/ansi/white/config.h @@ -24,51 +24,29 @@ /* Set to infinit, which is use in USB mode by default */ # define LED_MATRIX_TIMEOUT LED_MATRIX_TIMEOUT_INFINITE + /* Allow shutdown of led driver to save power */ # define LED_MATRIX_DRIVER_SHUTDOWN_ENABLE -/* Turn off backlight on low brightness to save power */ -# define LED_MATRIX_BRIGHTNESS_TURN_OFF_VAL 32 +/* Turn off backlight on low brightness to save power */ +# define LED_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48 + +/* Indication led */ # define DIM_CAPS_LOCK # define CAPS_LOCK_INDEX 28 # define LOW_BAT_IND_INDEX 56 -/* LED Matrix Animation modes. Explicitly enabled - * For full list of effects, see: - * https://docs.qmk.fm/#/feature_led_matrix?id=led-matrix-effects - */ +// LED Matrix Animation modes. Explicitly enabled +// For full list of effects, see: +// https://docs.qmk.fm/#/feature_led_matrix?id=led-matrix-effects +// #if defined(LED_MATRIX_KEYPRESSES) || defined(LED_MATRIX_KEYRELEASES) # define LED_MATRIX_KEYPRESSES - -# define ENABLE_LED_MATRIX_NONE -# define ENABLE_LED_MATRIX_SOLID -//# define ENABLE_LED_MATRIX_ALPHAS_MODS -# define ENABLE_LED_MATRIX_BREATHING -//# define ENABLE_LED_MATRIX_BAND -# define ENABLE_LED_MATRIX_BAND_PINWHEEL -# define ENABLE_LED_MATRIX_BAND_SPIRAL -# define ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT -# define ENABLE_LED_MATRIX_CYCLE_UP_DOWN -# define ENABLE_LED_MATRIX_CYCLE_OUT_IN -# define ENABLE_LED_MATRIX_DUAL_BEACON - -# define ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE -//# define ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE -# define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE -//# define ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS -//# define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS -//# define ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS -# define ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS -# define ENABLE_LED_MATRIX_SOLID_SPLASH -//# define ENABLE_LED_MATRIX_SOLID_MULTISPLASH - -# define ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT -# define ENABLE_LED_MATRIX_WAVE_UP_DOWN -# define ENABLE_LED_MATRIX_EFFECT_MAX +# define LED_MATRIX_KEYRELEASES /* Use first 6 channels of LED driver */ # define PHASE_CHANNEL MSKPHASE_6CHANNEL /* Set LED driver current */ -# define CKLED2001_CURRENT_TUNE { 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28 } - +# define CKLED2001_CURRENT_TUNE \ + { 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28 } #endif diff --git a/keyboards/keychron/k12_pro/ansi/white/info.json b/keyboards/keychron/k12_pro/ansi/white/info.json index 4862eed4ca..a5924349fd 100755 --- a/keyboards/keychron/k12_pro/ansi/white/info.json +++ b/keyboards/keychron/k12_pro/ansi/white/info.json @@ -1,22 +1,13 @@ { - "keyboard_name": "Keychron K12 Pro", - "manufacturer": "Keychron", - "url": "https://github.com/Keychron", - "maintainer": "lalalademaxiya1", "usb": { - "vid": "0x3434", "pid": "0x02C3", "device_version": "1.0.0" }, - "matrix_pins": { - "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null ], - "rows": ["B4", "B3", "A15", "A14", "A13"] + "features": { + "led_matrix": true }, - "diode_direction": "ROW2COL", - "processor": "STM32L432", - "bootloader": "stm32-dfu", "layouts": { - "LAYOUT_ansi_61": { + "LAYOUT_61_ansi": { "layout": [ {"matrix":[0,0], "x":0, "y":0}, {"matrix":[0,1], "x":1, "y":0}, @@ -32,6 +23,7 @@ {"matrix":[0,11], "x":11, "y":0}, {"matrix":[0,12], "x":12, "y":0}, {"matrix":[0,13], "x":13, "y":0, "w":2}, + {"matrix":[1,0], "x":0, "y":1, "w":1.5}, {"matrix":[1,1], "x":1.5, "y":1}, {"matrix":[1,2], "x":2.5, "y":1}, @@ -46,6 +38,7 @@ {"matrix":[1,11], "x":11.5, "y":1}, {"matrix":[1,12], "x":12.5, "y":1}, {"matrix":[1,13], "x":13.5, "y":1, "w":1.5}, + {"matrix":[2,0], "x":0, "y":2, "w":1.75}, {"matrix":[2,1], "x":1.75, "y":2}, {"matrix":[2,2], "x":2.75, "y":2}, @@ -59,6 +52,7 @@ {"matrix":[2,10], "x":10.75, "y":2}, {"matrix":[2,11], "x":11.75, "y":2}, {"matrix":[2,13], "x":12.75, "y":2, "w":2.25}, + {"matrix":[3,0], "x":0, "y":3, "w":2.25}, {"matrix":[3,2], "x":2.25, "y":3}, {"matrix":[3,3], "x":3.25, "y":3}, @@ -71,6 +65,7 @@ {"matrix":[3,10], "x":10.25, "y":3}, {"matrix":[3,11], "x":11.25, "y":3}, {"matrix":[3,13], "x":12.25, "y":3, "w":2.75}, + {"matrix":[4,0], "x":0, "y":4, "w":1.25}, {"matrix":[4,1], "x":1.25, "y":4, "w":1.25}, {"matrix":[4,2], "x":2.5, "y":4, "w":1.25}, @@ -81,5 +76,93 @@ {"matrix":[4,13], "x":13.75, "y":4, "w":1.25} ] } + }, + "led_matrix": { + "driver": "CKLED2001", + "animations": { + "none": true, + "solid": true, + "breathing": true, + "band_pinwheel": true, + "band_spiral": true, + "cycle_left_right": true, + "cycle_up_down": true, + "cycle_out_in": true, + "dual_beacon": true, + "solid_reactive_simple": true, + "solid_reactive_multiwide": true, + "solid_reactive_multinexus": true, + "solid_splash": true, + "wave_left_right": true, + "wave_up_down": true, + "effect_max": true + }, + "layout": [ + {"matrix":[0, 0], "flags":1, "x":0, "y":0}, + {"matrix":[0, 1], "flags":4, "x":16, "y":0}, + {"matrix":[0, 2], "flags":4, "x":32, "y":0}, + {"matrix":[0, 3], "flags":4, "x":48, "y":0}, + {"matrix":[0, 4], "flags":4, "x":65, "y":0}, + {"matrix":[0, 5], "flags":4, "x":81, "y":0}, + {"matrix":[0, 6], "flags":4, "x":97, "y":0}, + {"matrix":[0, 7], "flags":4, "x":113, "y":0}, + {"matrix":[0, 8], "flags":4, "x":129, "y":0}, + {"matrix":[0, 9], "flags":4, "x":145, "y":0}, + {"matrix":[0, 10], "flags":4, "x":161, "y":0}, + {"matrix":[0, 11], "flags":4, "x":178, "y":0}, + {"matrix":[0, 12], "flags":4, "x":194, "y":0}, + {"matrix":[0, 13], "flags":1, "x":218, "y":0}, + + {"matrix":[1, 0], "flags":1, "x":4, "y":16}, + {"matrix":[1, 1], "flags":8, "x":24, "y":16}, + {"matrix":[1, 2], "flags":8, "x":40, "y":16}, + {"matrix":[1, 3], "flags":8, "x":57, "y":16}, + {"matrix":[1, 4], "flags":4, "x":73, "y":16}, + {"matrix":[1, 5], "flags":4, "x":89, "y":16}, + {"matrix":[1, 6], "flags":4, "x":105, "y":16}, + {"matrix":[1, 7], "flags":4, "x":121, "y":16}, + {"matrix":[1, 8], "flags":4, "x":137, "y":16}, + {"matrix":[1, 9], "flags":4, "x":153, "y":16}, + {"matrix":[1, 10], "flags":4, "x":170, "y":16}, + {"matrix":[1, 11], "flags":4, "x":186, "y":16}, + {"matrix":[1, 12], "flags":4, "x":202, "y":16}, + {"matrix":[1, 13], "flags":1, "x":222, "y":16}, + + {"matrix":[2, 0], "flags":8, "x":6, "y":32}, + {"matrix":[2, 1], "flags":4, "x":28, "y":32}, + {"matrix":[2, 2], "flags":4, "x":44, "y":32}, + {"matrix":[2, 3], "flags":4, "x":61, "y":32}, + {"matrix":[2, 4], "flags":4, "x":77, "y":32}, + {"matrix":[2, 5], "flags":4, "x":93, "y":32}, + {"matrix":[2, 6], "flags":4, "x":109, "y":32}, + {"matrix":[2, 7], "flags":4, "x":125, "y":32}, + {"matrix":[2, 8], "flags":4, "x":141, "y":32}, + {"matrix":[2, 9], "flags":4, "x":157, "y":32}, + {"matrix":[2, 10], "flags":4, "x":174, "y":32}, + {"matrix":[2, 11], "flags":4, "x":190, "y":32}, + {"matrix":[2, 13], "flags":1, "x":216, "y":32}, + + {"matrix":[3, 0], "flags":1, "x":10, "y":48}, + {"matrix":[3, 2], "flags":4, "x":36, "y":48}, + {"matrix":[3, 3], "flags":4, "x":52, "y":48}, + {"matrix":[3, 4], "flags":4, "x":69, "y":48}, + {"matrix":[3, 5], "flags":4, "x":85, "y":48}, + {"matrix":[3, 6], "flags":4, "x":101, "y":48}, + {"matrix":[3, 7], "flags":4, "x":117, "y":48}, + {"matrix":[3, 8], "flags":4, "x":133, "y":48}, + {"matrix":[3, 9], "flags":4, "x":149, "y":48}, + {"matrix":[3, 10], "flags":4, "x":165, "y":48}, + {"matrix":[3, 11], "flags":4, "x":182, "y":48}, + {"matrix":[3, 13], "flags":1, "x":212, "y":48}, + + {"matrix":[4, 0], "flags":1, "x":2, "y":64}, + {"matrix":[4, 1], "flags":1, "x":22, "y":64}, + {"matrix":[4, 2], "flags":1, "x":42, "y":64}, + {"matrix":[4, 6], "flags":4, "x":103, "y":64}, + {"matrix":[4, 10], "flags":1, "x":163, "y":64}, + {"matrix":[4, 11], "flags":1, "x":184, "y":64}, + {"matrix":[4, 12], "flags":1, "x":204, "y":64}, + {"matrix":[4, 13], "flags":1, "x":224, "y":64} + ] } } diff --git a/keyboards/keychron/k12_pro/ansi/white/keymaps/default/keymap.c b/keyboards/keychron/k12_pro/ansi/white/keymaps/default/keymap.c index dcbea75c81..f9e24ea577 100755 --- a/keyboards/keychron/k12_pro/ansi/white/keymaps/default/keymap.c +++ b/keyboards/keychron/k12_pro/ansi/white/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.com) +/* 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 @@ -22,39 +22,39 @@ enum layers{ WIN_BASE, MAC_FN1, WIN_FN1, - FN2 + FN2, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [MAC_BASE] = LAYOUT_ansi_61( + [MAC_BASE] = LAYOUT_61_ansi( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN1),MO(FN2), KC_RCTL), - [WIN_BASE] = LAYOUT_ansi_61( + [WIN_BASE] = LAYOUT_61_ansi( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN1),MO(FN2), KC_RCTL), - [MAC_FN1] = LAYOUT_ansi_61( - KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LNPD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, BL_STEP, + [MAC_FN1] = LAYOUT_61_ansi( + KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, BL_STEP, _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, KC_INS, KC_PGUP, KC_HOME, _______, BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, KC_UP, KC_SNAP, KC_PGDN, KC_END, _______, _______, _______, BL_DOWN, _______, _______, _______, NK_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______), - [WIN_FN1] = LAYOUT_ansi_61( + [WIN_FN1] = LAYOUT_61_ansi( KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, BL_STEP, _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, KC_APP, KC_SCRL, KC_INS, KC_PGUP, KC_HOME, _______, BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, KC_UP, KC_PSCR, KC_PGDN, KC_END, _______, _______, _______, BL_DOWN, _______, _______, _______, NK_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______), - [FN2] = LAYOUT_ansi_61( + [FN2] = LAYOUT_61_ansi( KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/keychron/k12_pro/ansi/white/keymaps/via/keymap.c b/keyboards/keychron/k12_pro/ansi/white/keymaps/via/keymap.c index dcbea75c81..f9e24ea577 100755 --- a/keyboards/keychron/k12_pro/ansi/white/keymaps/via/keymap.c +++ b/keyboards/keychron/k12_pro/ansi/white/keymaps/via/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.com) +/* 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 @@ -22,39 +22,39 @@ enum layers{ WIN_BASE, MAC_FN1, WIN_FN1, - FN2 + FN2, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [MAC_BASE] = LAYOUT_ansi_61( + [MAC_BASE] = LAYOUT_61_ansi( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN1),MO(FN2), KC_RCTL), - [WIN_BASE] = LAYOUT_ansi_61( + [WIN_BASE] = LAYOUT_61_ansi( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN1),MO(FN2), KC_RCTL), - [MAC_FN1] = LAYOUT_ansi_61( - KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LNPD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, BL_STEP, + [MAC_FN1] = LAYOUT_61_ansi( + KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, BL_STEP, _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, KC_INS, KC_PGUP, KC_HOME, _______, BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, KC_UP, KC_SNAP, KC_PGDN, KC_END, _______, _______, _______, BL_DOWN, _______, _______, _______, NK_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______), - [WIN_FN1] = LAYOUT_ansi_61( + [WIN_FN1] = LAYOUT_61_ansi( KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, BL_STEP, _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, KC_APP, KC_SCRL, KC_INS, KC_PGUP, KC_HOME, _______, BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, KC_UP, KC_PSCR, KC_PGDN, KC_END, _______, _______, _______, BL_DOWN, _______, _______, _______, NK_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______), - [FN2] = LAYOUT_ansi_61( + [FN2] = LAYOUT_61_ansi( KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/keychron/k12_pro/ansi/white/rules.mk b/keyboards/keychron/k12_pro/ansi/white/rules.mk index 6b0c2a0769..6e7633bfe0 100755 --- a/keyboards/keychron/k12_pro/ansi/white/rules.mk +++ b/keyboards/keychron/k12_pro/ansi/white/rules.mk @@ -1,2 +1 @@ -LED_MATRIX_ENABLE = yes -LED_MATRIX_DRIVER = CKLED2001 \ No newline at end of file +# This file intentionally left blank diff --git a/keyboards/keychron/k12_pro/ansi/white/white.c b/keyboards/keychron/k12_pro/ansi/white/white.c index 9df73fd3ac..806ef479b3 100755 --- a/keyboards/keychron/k12_pro/ansi/white/white.c +++ b/keyboards/keychron/k12_pro/ansi/white/white.c @@ -1,4 +1,4 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.com) +/* 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 @@ -89,33 +89,4 @@ const ckled2001_led g_ckled2001_leds[LED_MATRIX_LED_COUNT] = { {0, F_4}, {0, F_3}, }; - -#define __ NO_LED - -led_config_t g_led_config = { - { - // Key Matrix to LED Index - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 }, - { 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27 }, - { 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, __, 40 }, - { 41, __, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, __, 52 }, - { 53, 54, 55, __, __, __, 56, __, __, __, 57, 58, 59, 60 } - }, - { - // LED Index to Physical Position - {0,0}, {16,0}, {32,0}, {48,0}, {65,0}, {81,0}, {97,0}, {113,0}, {129,0}, {145,0}, {161,0}, {178,0}, {194,0}, {218,0}, - {4,16}, {24,16}, {40,16}, {57,16}, {73,16}, {89,16}, {105,16}, {121,16}, {137,16}, {153,16}, {170,16}, {186,16}, {202,16}, {222,16}, - {6,32}, {28,32}, {44,32}, {61,32}, {77,32}, {93,32}, {109,32}, {125,32}, {141,32}, {157,32}, {174,32}, {190,32}, {216,32}, - {10,48}, {36,48}, {52,48}, {69,48}, {85,48}, {101,48}, {117,48}, {133,48}, {149,48}, {165,48}, {182,48}, {212,48}, - {2,64}, {22,64}, {42,64}, {103,64}, {163,64}, {184,64}, {204,64}, {224,64}, - }, - { - // RGB LED Index to Flag - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 1, 8, 8, 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 1, 1, 1, 4, 1, 4, 4, 1, - } -}; #endif diff --git a/keyboards/keychron/k12_pro/config.h b/keyboards/keychron/k12_pro/config.h index be20e88e12..6cf586ec95 100755 --- a/keyboards/keychron/k12_pro/config.h +++ b/keyboards/keychron/k12_pro/config.h @@ -1,4 +1,4 @@ -/* Copyright 2022 @ Keychron (https://www.keychron.com) +/* 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 @@ -21,7 +21,8 @@ #define LED_DISABLE_WHEN_USB_SUSPENDED /* DIP switch for Mac/win OS switch */ -#define DIP_SWITCH_PINS { A8 } +#define DIP_SWITCH_PINS \ + { A8 } /* Caps lock LED Pin */ #define LED_CAPS_LOCK_PIN A0 @@ -74,15 +75,18 @@ # define BLUETOOTH_NKRO_ENABLE /* Raw hid command for factory test and bluetooth DFU */ -# define RAW_HID_CMD 0xAA ... 0xAB +# define RAW_HID_CMD 0xAA ... 0xAB #else /* Raw hid command for factory test */ -# define RAW_HID_CMD 0xAB +# define RAW_HID_CMD 0xAB #endif /* Emulated EEPROM configuration */ #define FEE_DENSITY_BYTES FEE_PAGE_SIZE -#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047 +#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(4) diff --git a/keyboards/keychron/k12_pro/halconf.h b/keyboards/keychron/k12_pro/halconf.h index fafd0c1fed..306f917783 100755 --- a/keyboards/keychron/k12_pro/halconf.h +++ b/keyboards/keychron/k12_pro/halconf.h @@ -16,6 +16,8 @@ #pragma once +#define _CHIBIOS_HAL_CONF_VER_8_0_ + #define HAL_USE_I2C TRUE #ifdef KC_BLUETOOTH_ENABLE diff --git a/keyboards/keychron/k12_pro/info.json b/keyboards/keychron/k12_pro/info.json new file mode 100755 index 0000000000..b30c4465e9 --- /dev/null +++ b/keyboards/keychron/k12_pro/info.json @@ -0,0 +1,27 @@ +{ + "keyboard_name": "Keychron K12 Pro", + "manufacturer": "Keychron", + "url": "https://github.com/Keychron", + "maintainer": "lalalademaxiya1", + "processor": "STM32L432", + "bootloader": "stm32-dfu", + "usb": { + "vid": "0x3434" + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "dip_switch": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "bluetooth": false, + "raw": true + }, + "matrix_pins": { + "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null ], + "rows": ["B4", "B3", "A15", "A14", "A13"] + }, + "diode_direction": "ROW2COL" +} diff --git a/keyboards/keychron/k12_pro/k12_pro.c b/keyboards/keychron/k12_pro/k12_pro.c index ee10feb979..6fde4e6f92 100755 --- a/keyboards/keychron/k12_pro/k12_pro.c +++ b/keyboards/keychron/k12_pro/k12_pro.c @@ -36,9 +36,10 @@ typedef struct PACKED { 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}; +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) @@ -48,7 +49,7 @@ key_combination_t key_comb_list[4] = { }; #ifdef KC_BLUETOOTH_ENABLE -bool firstDisconnect = true; +bool firstDisconnect = true; bool bt_factory_reset = false; static virtual_timer_t pairing_key_timer; extern uint8_t g_pwm_buffer[DRIVER_COUNT][192]; @@ -60,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_STATTE + default_layer_set(1UL << (!active ? 1 : 0)); +#else default_layer_set(1UL << (active ? 1 : 0)); +#endif } dip_switch_update_user(index, active); @@ -85,14 +90,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { unregister_code(mac_keycode[keycode - KC_LOPTN]); } return false; // Skip all further processing of this key) - case KC_MCTL: - /* Mission Control */ - host_consumer_send(record->event.pressed ? 0x29F : 0); - return false; // Skip all further processing of this key - case KC_LNPD: - /* Lanuchpad */ - host_consumer_send(record->event.pressed ? 0x2A0 : 0); - return false; // Skip all further processing of this key case KC_TASK: case KC_FILE: case KC_SNAP: @@ -127,7 +124,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 @@ -145,7 +142,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. @@ -154,7 +153,7 @@ void keyboard_post_init_kb(void) { ckbt51_init(false); bluetooth_init(); -# endif +#endif power_on_indicator_timer_buffer = sync_timer_read32() | 1; writePin(BAT_LOW_LED_PIN, BAT_LOW_LED_PIN_ON_STATE); @@ -162,6 +161,16 @@ void keyboard_post_init_kb(void) { } void matrix_scan_kb(void) { + if (factory_timer_buffer && timer_elapsed32(factory_timer_buffer) > 2000) { + factory_timer_buffer = 0; + if (bt_factory_reset) { + bt_factory_reset = false; + palWriteLine(CKBT51_RESET_PIN, PAL_LOW); + wait_ms(5); + palWriteLine(CKBT51_RESET_PIN, PAL_HIGH); + } + } + if (power_on_indicator_timer_buffer) { if (sync_timer_elapsed32(power_on_indicator_timer_buffer) > POWER_ON_LED_DURATION) { power_on_indicator_timer_buffer = 0; @@ -179,7 +188,7 @@ void matrix_scan_kb(void) { #ifdef FACTORY_RESET_TASK FACTORY_RESET_TASK(); -# endif +#endif matrix_scan_user(); } @@ -188,6 +197,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, @@ -199,12 +209,13 @@ 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) { 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. */ diff --git a/keyboards/keychron/k12_pro/matrix.c b/keyboards/keychron/k12_pro/matrix.c new file mode 100755 index 0000000000..06c9baec3f --- /dev/null +++ b/keyboards/keychron/k12_pro/matrix.c @@ -0,0 +1,190 @@ +/* Copyright 2023 @ Keychron (https://www.keychron.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "quantum.h" + +#define HC595_STCP B0 +#define HC595_SHCP A1 +#define HC595_DS A7 + +#define DIRECT_COL_NUM 0 + +pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; +pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; + +static inline uint8_t readMatrixPin(pin_t pin) { + if (pin != NO_PIN) { + return readPin(pin); + } else { + return 1; + } +} + +static inline void setPinOutput_writeLow(pin_t pin) { + setPinOutput(pin); + writePinLow(pin); +} + +static inline void setPinOutput_writeHigh(pin_t pin) { + setPinOutput(pin); + writePinHigh(pin); +} + +static inline void HC595_delay(uint16_t n) { + while (n-- > 0) { + asm volatile("nop" ::: "memory"); + } +} + +static void HC595_output(uint16_t data) { + uint8_t n = 1; + uint8_t i; + + for (i = 1; i < (MATRIX_COLS - DIRECT_COL_NUM); i++) { + writePinLow(HC595_SHCP); + if (data & 0x1) { + writePinHigh(HC595_DS); + } else { + writePinLow(HC595_DS); + } + HC595_delay(n); + writePinHigh(HC595_SHCP); + HC595_delay(n); + + data = data >> 1; + } + writePinLow(HC595_STCP); + HC595_delay(n); + writePinHigh(HC595_STCP); +} + +static void HC595_output_bit(uint16_t data) { + uint8_t n = 1; + + writePinLow(HC595_SHCP); + if (data & 0x1) { + writePinHigh(HC595_DS); + } else { + writePinLow(HC595_DS); + } + HC595_delay(n); + + writePinHigh(HC595_SHCP); + HC595_delay(n); + + writePinLow(HC595_STCP); + HC595_delay(n); + writePinHigh(HC595_STCP); +} + +static void select_col(uint8_t col) { + if (col < DIRECT_COL_NUM) { + setPinOutput_writeLow(col_pins[col]); + } else { + if (col == DIRECT_COL_NUM) { + HC595_output_bit(0x00); + } + } +} + +static void unselect_col(uint8_t col) { + if (col < DIRECT_COL_NUM) { +#ifdef MATRIX_UNSELECT_DRIVE_HIGH + setPinOutput_writeHigh(col_pins[col]); +#else + setPinInputHigh(col_pins[col]); +#endif + } else { + HC595_output_bit(0x01); + } +} + +static void unselect_cols(void) { + for (uint8_t x = 0; x < MATRIX_COLS; x++) { + if (x < DIRECT_COL_NUM) { +#ifdef MATRIX_UNSELECT_DRIVE_HIGH + setPinOutput_writeHigh(col_pins[x]); +#else + setPinInputHigh(col_pins[x]); +#endif + } else { + if (x == DIRECT_COL_NUM) HC595_output(0xFFFF); + break; + } + } +} + +void select_all_cols(void) { + for (uint8_t x = 0; x < MATRIX_COLS; x++) { + if (x < DIRECT_COL_NUM) { + setPinOutput_writeLow(col_pins[x]); + } else { + if (x == DIRECT_COL_NUM) HC595_output(0x0000); + break; + } + } +} + +static void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col, matrix_row_t row_shifter) { + // Select col + select_col(current_col); + HC595_delay(200); + + // For each row... + for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) { + // Check row pin state + if (readMatrixPin(row_pins[row_index]) == 0) { + // Pin LO, set col bit + current_matrix[row_index] |= row_shifter; + } else { + // Pin HI, clear col bit + current_matrix[row_index] &= ~row_shifter; + } + } + + // Unselect col + unselect_col(current_col); + HC595_delay(200); // wait for all Row signals to go HIGH +} + +void matrix_init_custom(void) { + setPinOutput(HC595_DS); + setPinOutput(HC595_STCP); + setPinOutput(HC595_SHCP); + + for (uint8_t x = 0; x < MATRIX_ROWS; x++) { + if (row_pins[x] != NO_PIN) { + setPinInputHigh(row_pins[x]); + } + } + + unselect_cols(); +} + +bool matrix_scan_custom(matrix_row_t current_matrix[]) { + matrix_row_t curr_matrix[MATRIX_ROWS] = {0}; + + // Set col, read rows + matrix_row_t row_shifter = MATRIX_ROW_SHIFTER; + for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++, row_shifter <<= 1) { + matrix_read_rows_on_col(curr_matrix, current_col, row_shifter); + } + + bool changed = memcmp(current_matrix, curr_matrix, sizeof(curr_matrix)) != 0; + if (changed) memcpy(current_matrix, curr_matrix, sizeof(curr_matrix)); + + return changed; +} diff --git a/keyboards/keychron/k12_pro/mcuconf.h b/keyboards/keychron/k12_pro/mcuconf.h index fc7c1de23c..4dae767a44 100755 --- a/keyboards/keychron/k12_pro/mcuconf.h +++ b/keyboards/keychron/k12_pro/mcuconf.h @@ -14,7 +14,6 @@ * along with this program. If not, see . */ - #pragma once #include_next @@ -34,4 +33,4 @@ #ifdef KC_BLUETOOTH_ENABLE # undef STM32_SERIAL_USE_USART2 # define STM32_SERIAL_USE_USART2 TRUE -#endif \ No newline at end of file +#endif diff --git a/keyboards/keychron/k12_pro/rules.mk b/keyboards/keychron/k12_pro/rules.mk index e1659c0112..98cf5c564b 100755 --- a/keyboards/keychron/k12_pro/rules.mk +++ b/keyboards/keychron/k12_pro/rules.mk @@ -3,9 +3,6 @@ OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST OPT_DEFS += -DKC_BLUETOOTH_ENABLE -CUSTOM_MATRIX = lite - -VPATH += keyboards/keychron/common SRC += matrix.c include keyboards/keychron/bluetooth/bluetooth.mk From 9024a98df20fc0ce2d757206abea0f611ed19557 Mon Sep 17 00:00:00 2001 From: lalalademaxiya1 <2831039915@qq.com> Date: Thu, 15 Jun 2023 11:42:15 +0800 Subject: [PATCH 04/15] Add via json --- .../k12_pro/via_json/k12_pro_ansi_rgb.json | 225 ++++++++++++++++++ .../k12_pro/via_json/k12_pro_ansi_white.json | 164 +++++++++++++ 2 files changed, 389 insertions(+) create mode 100755 keyboards/keychron/k12_pro/via_json/k12_pro_ansi_rgb.json create mode 100755 keyboards/keychron/k12_pro/via_json/k12_pro_ansi_white.json diff --git a/keyboards/keychron/k12_pro/via_json/k12_pro_ansi_rgb.json b/keyboards/keychron/k12_pro/via_json/k12_pro_ansi_rgb.json new file mode 100755 index 0000000000..ce4e7a5a8f --- /dev/null +++ b/keyboards/keychron/k12_pro/via_json/k12_pro_ansi_rgb.json @@ -0,0 +1,225 @@ +{ + "name": "Keychron K12 Pro ANSI RGB", + "vendorId": "0x3434", + "productId": "0x02C0", + "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": 5, "cols": 14}, + "layouts": { + "keymap": [ + [ + { + "c": "#777777" + }, + "0,0", + { + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12", + { + "c": "#aaaaaa", + "w": 2 + }, + "0,13" + ], + [ + { + "w": 1.5 + }, + "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": 1.5 + }, + "1,13" + ], + [ + { + "w": 1.75 + }, + "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", + { + "c": "#777777", + "w": 2.25 + }, + "2,13" + ], + [ + { + "c": "#aaaaaa", + "w": 2.25 + }, + "3,0", + { + "c": "#cccccc" + }, + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "3,13" + ], + [ + { + "w": 1.25 + }, + "4,0", + { + "w": 1.25 + }, + "4,1", + { + "w": 1.25 + }, + "4,2", + { + "c": "#cccccc", + "w": 6.25 + }, + "4,6", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,10", + { + "w": 1.25 + }, + "4,11", + { + "w": 1.25 + }, + "4,12", + { + "w": 1.25 + }, + "4,13" + ] + ] + } +} diff --git a/keyboards/keychron/k12_pro/via_json/k12_pro_ansi_white.json b/keyboards/keychron/k12_pro/via_json/k12_pro_ansi_white.json new file mode 100755 index 0000000000..06b5c0e006 --- /dev/null +++ b/keyboards/keychron/k12_pro/via_json/k12_pro_ansi_white.json @@ -0,0 +1,164 @@ +{ + "name": "Keychron K12 Pro ANSI White", + "vendorId": "0x3434", + "productId": "0x02C3", + "keycodes": ["qmk_lighting"], + "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": 5, "cols": 14}, + "layouts": { + "keymap": [ + [ + { + "c": "#777777" + }, + "0,0", + { + "c": "#cccccc" + }, + "0,1", + "0,2", + "0,3", + "0,4", + "0,5", + "0,6", + "0,7", + "0,8", + "0,9", + "0,10", + "0,11", + "0,12", + { + "c": "#aaaaaa", + "w": 2 + }, + "0,13" + ], + [ + { + "w": 1.5 + }, + "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": 1.5 + }, + "1,13" + ], + [ + { + "w": 1.75 + }, + "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", + { + "c": "#777777", + "w": 2.25 + }, + "2,13" + ], + [ + { + "c": "#aaaaaa", + "w": 2.25 + }, + "3,0", + { + "c": "#cccccc" + }, + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "3,9", + "3,10", + "3,11", + { + "c": "#aaaaaa", + "w": 2.75 + }, + "3,13" + ], + [ + { + "w": 1.25 + }, + "4,0", + { + "w": 1.25 + }, + "4,1", + { + "w": 1.25 + }, + "4,2", + { + "c": "#cccccc", + "w": 6.25 + }, + "4,6", + { + "c": "#aaaaaa", + "w": 1.25 + }, + "4,10", + { + "w": 1.25 + }, + "4,11", + { + "w": 1.25 + }, + "4,12", + { + "w": 1.25 + }, + "4,13" + ] + ] + } +} From 1a31d90e430acaab4962679addae8ce21cf5a826 Mon Sep 17 00:00:00 2001 From: lalalademaxiya1 <2831039915@qq.com> Date: Thu, 15 Jun 2023 11:49:05 +0800 Subject: [PATCH 05/15] Update info.json --- keyboards/keychron/k12_pro/info.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/keyboards/keychron/k12_pro/info.json b/keyboards/keychron/k12_pro/info.json index b30c4465e9..069269ad7c 100755 --- a/keyboards/keychron/k12_pro/info.json +++ b/keyboards/keychron/k12_pro/info.json @@ -21,7 +21,9 @@ }, "matrix_pins": { "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null ], - "rows": ["B4", "B3", "A15", "A14", "A13"] + "rows": ["B4", "B3", "A15", "A14", "A13"], + "custom": true, + "custom_lite": true }, "diode_direction": "ROW2COL" } From 8660a5c5970e938a2f208250ea5e75ea50f43699 Mon Sep 17 00:00:00 2001 From: lalalademaxiya1 <2831039915@qq.com> Date: Thu, 15 Jun 2023 14:10:10 +0800 Subject: [PATCH 06/15] Move layout definition into k12_pro/info.json --- keyboards/keychron/k12_pro/ansi/rgb/info.json | 71 ------------------ .../keychron/k12_pro/ansi/white/info.json | 71 ------------------ keyboards/keychron/k12_pro/info.json | 73 ++++++++++++++++++- 3 files changed, 72 insertions(+), 143 deletions(-) diff --git a/keyboards/keychron/k12_pro/ansi/rgb/info.json b/keyboards/keychron/k12_pro/ansi/rgb/info.json index 076ff2981a..19a90487a9 100755 --- a/keyboards/keychron/k12_pro/ansi/rgb/info.json +++ b/keyboards/keychron/k12_pro/ansi/rgb/info.json @@ -6,77 +6,6 @@ "features": { "rgb_matrix": true }, - "layouts": { - "LAYOUT_61_ansi": { - "layout": [ - {"matrix":[0,0], "x":0, "y":0}, - {"matrix":[0,1], "x":1, "y":0}, - {"matrix":[0,2], "x":2, "y":0}, - {"matrix":[0,3], "x":3, "y":0}, - {"matrix":[0,4], "x":4, "y":0}, - {"matrix":[0,5], "x":5, "y":0}, - {"matrix":[0,6], "x":6, "y":0}, - {"matrix":[0,7], "x":7, "y":0}, - {"matrix":[0,8], "x":8, "y":0}, - {"matrix":[0,9], "x":9, "y":0}, - {"matrix":[0,10], "x":10, "y":0}, - {"matrix":[0,11], "x":11, "y":0}, - {"matrix":[0,12], "x":12, "y":0}, - {"matrix":[0,13], "x":13, "y":0, "w":2}, - - {"matrix":[1,0], "x":0, "y":1, "w":1.5}, - {"matrix":[1,1], "x":1.5, "y":1}, - {"matrix":[1,2], "x":2.5, "y":1}, - {"matrix":[1,3], "x":3.5, "y":1}, - {"matrix":[1,4], "x":4.5, "y":1}, - {"matrix":[1,5], "x":5.5, "y":1}, - {"matrix":[1,6], "x":6.5, "y":1}, - {"matrix":[1,7], "x":7.5, "y":1}, - {"matrix":[1,8], "x":8.5, "y":1}, - {"matrix":[1,9], "x":9.5, "y":1}, - {"matrix":[1,10], "x":10.5, "y":1}, - {"matrix":[1,11], "x":11.5, "y":1}, - {"matrix":[1,12], "x":12.5, "y":1}, - {"matrix":[1,13], "x":13.5, "y":1, "w":1.5}, - - {"matrix":[2,0], "x":0, "y":2, "w":1.75}, - {"matrix":[2,1], "x":1.75, "y":2}, - {"matrix":[2,2], "x":2.75, "y":2}, - {"matrix":[2,3], "x":3.75, "y":2}, - {"matrix":[2,4], "x":4.75, "y":2}, - {"matrix":[2,5], "x":5.75, "y":2}, - {"matrix":[2,6], "x":6.75, "y":2}, - {"matrix":[2,7], "x":7.75, "y":2}, - {"matrix":[2,8], "x":8.75, "y":2}, - {"matrix":[2,9], "x":9.75, "y":2}, - {"matrix":[2,10], "x":10.75, "y":2}, - {"matrix":[2,11], "x":11.75, "y":2}, - {"matrix":[2,13], "x":12.75, "y":2, "w":2.25}, - - {"matrix":[3,0], "x":0, "y":3, "w":2.25}, - {"matrix":[3,2], "x":2.25, "y":3}, - {"matrix":[3,3], "x":3.25, "y":3}, - {"matrix":[3,4], "x":4.25, "y":3}, - {"matrix":[3,5], "x":5.25, "y":3}, - {"matrix":[3,6], "x":6.25, "y":3}, - {"matrix":[3,7], "x":7.25, "y":3}, - {"matrix":[3,8], "x":8.25, "y":3}, - {"matrix":[3,9], "x":9.25, "y":3}, - {"matrix":[3,10], "x":10.25, "y":3}, - {"matrix":[3,11], "x":11.25, "y":3}, - {"matrix":[3,13], "x":12.25, "y":3, "w":2.75}, - - {"matrix":[4,0], "x":0, "y":4, "w":1.25}, - {"matrix":[4,1], "x":1.25, "y":4, "w":1.25}, - {"matrix":[4,2], "x":2.5, "y":4, "w":1.25}, - {"matrix":[4,6], "x":3.75, "y":4, "w":6.25}, - {"matrix":[4,10], "x":10, "y":4, "w":1.25}, - {"matrix":[4,11], "x":11.25, "y":4, "w":1.25}, - {"matrix":[4,12], "x":12.5, "y":4, "w":1.25}, - {"matrix":[4,13], "x":13.75, "y":4, "w":1.25} - ] - } - }, "rgb_matrix": { "driver": "CKLED2001", "animations": { diff --git a/keyboards/keychron/k12_pro/ansi/white/info.json b/keyboards/keychron/k12_pro/ansi/white/info.json index a5924349fd..3193ebb0f8 100755 --- a/keyboards/keychron/k12_pro/ansi/white/info.json +++ b/keyboards/keychron/k12_pro/ansi/white/info.json @@ -6,77 +6,6 @@ "features": { "led_matrix": true }, - "layouts": { - "LAYOUT_61_ansi": { - "layout": [ - {"matrix":[0,0], "x":0, "y":0}, - {"matrix":[0,1], "x":1, "y":0}, - {"matrix":[0,2], "x":2, "y":0}, - {"matrix":[0,3], "x":3, "y":0}, - {"matrix":[0,4], "x":4, "y":0}, - {"matrix":[0,5], "x":5, "y":0}, - {"matrix":[0,6], "x":6, "y":0}, - {"matrix":[0,7], "x":7, "y":0}, - {"matrix":[0,8], "x":8, "y":0}, - {"matrix":[0,9], "x":9, "y":0}, - {"matrix":[0,10], "x":10, "y":0}, - {"matrix":[0,11], "x":11, "y":0}, - {"matrix":[0,12], "x":12, "y":0}, - {"matrix":[0,13], "x":13, "y":0, "w":2}, - - {"matrix":[1,0], "x":0, "y":1, "w":1.5}, - {"matrix":[1,1], "x":1.5, "y":1}, - {"matrix":[1,2], "x":2.5, "y":1}, - {"matrix":[1,3], "x":3.5, "y":1}, - {"matrix":[1,4], "x":4.5, "y":1}, - {"matrix":[1,5], "x":5.5, "y":1}, - {"matrix":[1,6], "x":6.5, "y":1}, - {"matrix":[1,7], "x":7.5, "y":1}, - {"matrix":[1,8], "x":8.5, "y":1}, - {"matrix":[1,9], "x":9.5, "y":1}, - {"matrix":[1,10], "x":10.5, "y":1}, - {"matrix":[1,11], "x":11.5, "y":1}, - {"matrix":[1,12], "x":12.5, "y":1}, - {"matrix":[1,13], "x":13.5, "y":1, "w":1.5}, - - {"matrix":[2,0], "x":0, "y":2, "w":1.75}, - {"matrix":[2,1], "x":1.75, "y":2}, - {"matrix":[2,2], "x":2.75, "y":2}, - {"matrix":[2,3], "x":3.75, "y":2}, - {"matrix":[2,4], "x":4.75, "y":2}, - {"matrix":[2,5], "x":5.75, "y":2}, - {"matrix":[2,6], "x":6.75, "y":2}, - {"matrix":[2,7], "x":7.75, "y":2}, - {"matrix":[2,8], "x":8.75, "y":2}, - {"matrix":[2,9], "x":9.75, "y":2}, - {"matrix":[2,10], "x":10.75, "y":2}, - {"matrix":[2,11], "x":11.75, "y":2}, - {"matrix":[2,13], "x":12.75, "y":2, "w":2.25}, - - {"matrix":[3,0], "x":0, "y":3, "w":2.25}, - {"matrix":[3,2], "x":2.25, "y":3}, - {"matrix":[3,3], "x":3.25, "y":3}, - {"matrix":[3,4], "x":4.25, "y":3}, - {"matrix":[3,5], "x":5.25, "y":3}, - {"matrix":[3,6], "x":6.25, "y":3}, - {"matrix":[3,7], "x":7.25, "y":3}, - {"matrix":[3,8], "x":8.25, "y":3}, - {"matrix":[3,9], "x":9.25, "y":3}, - {"matrix":[3,10], "x":10.25, "y":3}, - {"matrix":[3,11], "x":11.25, "y":3}, - {"matrix":[3,13], "x":12.25, "y":3, "w":2.75}, - - {"matrix":[4,0], "x":0, "y":4, "w":1.25}, - {"matrix":[4,1], "x":1.25, "y":4, "w":1.25}, - {"matrix":[4,2], "x":2.5, "y":4, "w":1.25}, - {"matrix":[4,6], "x":3.75, "y":4, "w":6.25}, - {"matrix":[4,10], "x":10, "y":4, "w":1.25}, - {"matrix":[4,11], "x":11.25, "y":4, "w":1.25}, - {"matrix":[4,12], "x":12.5, "y":4, "w":1.25}, - {"matrix":[4,13], "x":13.75, "y":4, "w":1.25} - ] - } - }, "led_matrix": { "driver": "CKLED2001", "animations": { diff --git a/keyboards/keychron/k12_pro/info.json b/keyboards/keychron/k12_pro/info.json index 069269ad7c..e743e42efb 100755 --- a/keyboards/keychron/k12_pro/info.json +++ b/keyboards/keychron/k12_pro/info.json @@ -25,5 +25,76 @@ "custom": true, "custom_lite": true }, - "diode_direction": "ROW2COL" + "diode_direction": "ROW2COL", + "layouts": { + "LAYOUT_61_ansi": { + "layout": [ + {"matrix":[0,0], "x":0, "y":0}, + {"matrix":[0,1], "x":1, "y":0}, + {"matrix":[0,2], "x":2, "y":0}, + {"matrix":[0,3], "x":3, "y":0}, + {"matrix":[0,4], "x":4, "y":0}, + {"matrix":[0,5], "x":5, "y":0}, + {"matrix":[0,6], "x":6, "y":0}, + {"matrix":[0,7], "x":7, "y":0}, + {"matrix":[0,8], "x":8, "y":0}, + {"matrix":[0,9], "x":9, "y":0}, + {"matrix":[0,10], "x":10, "y":0}, + {"matrix":[0,11], "x":11, "y":0}, + {"matrix":[0,12], "x":12, "y":0}, + {"matrix":[0,13], "x":13, "y":0, "w":2}, + + {"matrix":[1,0], "x":0, "y":1, "w":1.5}, + {"matrix":[1,1], "x":1.5, "y":1}, + {"matrix":[1,2], "x":2.5, "y":1}, + {"matrix":[1,3], "x":3.5, "y":1}, + {"matrix":[1,4], "x":4.5, "y":1}, + {"matrix":[1,5], "x":5.5, "y":1}, + {"matrix":[1,6], "x":6.5, "y":1}, + {"matrix":[1,7], "x":7.5, "y":1}, + {"matrix":[1,8], "x":8.5, "y":1}, + {"matrix":[1,9], "x":9.5, "y":1}, + {"matrix":[1,10], "x":10.5, "y":1}, + {"matrix":[1,11], "x":11.5, "y":1}, + {"matrix":[1,12], "x":12.5, "y":1}, + {"matrix":[1,13], "x":13.5, "y":1, "w":1.5}, + + {"matrix":[2,0], "x":0, "y":2, "w":1.75}, + {"matrix":[2,1], "x":1.75, "y":2}, + {"matrix":[2,2], "x":2.75, "y":2}, + {"matrix":[2,3], "x":3.75, "y":2}, + {"matrix":[2,4], "x":4.75, "y":2}, + {"matrix":[2,5], "x":5.75, "y":2}, + {"matrix":[2,6], "x":6.75, "y":2}, + {"matrix":[2,7], "x":7.75, "y":2}, + {"matrix":[2,8], "x":8.75, "y":2}, + {"matrix":[2,9], "x":9.75, "y":2}, + {"matrix":[2,10], "x":10.75, "y":2}, + {"matrix":[2,11], "x":11.75, "y":2}, + {"matrix":[2,13], "x":12.75, "y":2, "w":2.25}, + + {"matrix":[3,0], "x":0, "y":3, "w":2.25}, + {"matrix":[3,2], "x":2.25, "y":3}, + {"matrix":[3,3], "x":3.25, "y":3}, + {"matrix":[3,4], "x":4.25, "y":3}, + {"matrix":[3,5], "x":5.25, "y":3}, + {"matrix":[3,6], "x":6.25, "y":3}, + {"matrix":[3,7], "x":7.25, "y":3}, + {"matrix":[3,8], "x":8.25, "y":3}, + {"matrix":[3,9], "x":9.25, "y":3}, + {"matrix":[3,10], "x":10.25, "y":3}, + {"matrix":[3,11], "x":11.25, "y":3}, + {"matrix":[3,13], "x":12.25, "y":3, "w":2.75}, + + {"matrix":[4,0], "x":0, "y":4, "w":1.25}, + {"matrix":[4,1], "x":1.25, "y":4, "w":1.25}, + {"matrix":[4,2], "x":2.5, "y":4, "w":1.25}, + {"matrix":[4,6], "x":3.75, "y":4, "w":6.25}, + {"matrix":[4,10], "x":10, "y":4, "w":1.25}, + {"matrix":[4,11], "x":11.25, "y":4, "w":1.25}, + {"matrix":[4,12], "x":12.5, "y":4, "w":1.25}, + {"matrix":[4,13], "x":13.75, "y":4, "w":1.25} + ] + } + } } From 83b06b907a8d52837557c9e33d50d11bb42935c2 Mon Sep 17 00:00:00 2001 From: lalalademaxiya1 <2831039915@qq.com> Date: Thu, 15 Jun 2023 14:56:33 +0800 Subject: [PATCH 07/15] Update matrix.c --- keyboards/keychron/k12_pro/matrix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/keychron/k12_pro/matrix.c b/keyboards/keychron/k12_pro/matrix.c index 06c9baec3f..b08a906263 100755 --- a/keyboards/keychron/k12_pro/matrix.c +++ b/keyboards/keychron/k12_pro/matrix.c @@ -71,7 +71,7 @@ static void HC595_output(uint16_t data) { writePinHigh(HC595_STCP); } -static void HC595_output_bit(uint16_t data) { +static void HC595_output_bit(uint8_t data) { uint8_t n = 1; writePinLow(HC595_SHCP); From c63da449cebd26c86e5229b2544681da51bbd65e Mon Sep 17 00:00:00 2001 From: lalalademaxiya1 <2831039915@qq.com> Date: Thu, 15 Jun 2023 17:05:11 +0800 Subject: [PATCH 08/15] Increase brightness and version num add one. --- keyboards/keychron/k12_pro/ansi/rgb/config.h | 2 +- keyboards/keychron/k12_pro/ansi/rgb/info.json | 2 +- keyboards/keychron/k12_pro/ansi/white/config.h | 2 +- keyboards/keychron/k12_pro/ansi/white/info.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/keychron/k12_pro/ansi/rgb/config.h b/keyboards/keychron/k12_pro/ansi/rgb/config.h index 29bf4ecbb8..f78149200e 100755 --- a/keyboards/keychron/k12_pro/ansi/rgb/config.h +++ b/keyboards/keychron/k12_pro/ansi/rgb/config.h @@ -46,5 +46,5 @@ /* Set LED driver current */ # define CKLED2001_CURRENT_TUNE \ - { 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28 } + { 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50 } #endif diff --git a/keyboards/keychron/k12_pro/ansi/rgb/info.json b/keyboards/keychron/k12_pro/ansi/rgb/info.json index 19a90487a9..97c29fb006 100755 --- a/keyboards/keychron/k12_pro/ansi/rgb/info.json +++ b/keyboards/keychron/k12_pro/ansi/rgb/info.json @@ -1,7 +1,7 @@ { "usb": { "pid": "0x02C0", - "device_version": "1.0.0" + "device_version": "1.0.1" }, "features": { "rgb_matrix": true diff --git a/keyboards/keychron/k12_pro/ansi/white/config.h b/keyboards/keychron/k12_pro/ansi/white/config.h index 6d384f56fb..c3e5736c86 100755 --- a/keyboards/keychron/k12_pro/ansi/white/config.h +++ b/keyboards/keychron/k12_pro/ansi/white/config.h @@ -48,5 +48,5 @@ /* Set LED driver current */ # define CKLED2001_CURRENT_TUNE \ - { 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28 } + { 0x70, 0x70, 0x70, 0x70, 0x70, 0x70, 0x70, 0x70, 0x70, 0x70, 0x70, 0x70 } #endif diff --git a/keyboards/keychron/k12_pro/ansi/white/info.json b/keyboards/keychron/k12_pro/ansi/white/info.json index 3193ebb0f8..d62e80e419 100755 --- a/keyboards/keychron/k12_pro/ansi/white/info.json +++ b/keyboards/keychron/k12_pro/ansi/white/info.json @@ -1,7 +1,7 @@ { "usb": { "pid": "0x02C3", - "device_version": "1.0.0" + "device_version": "1.0.1" }, "features": { "led_matrix": true From d9e50ca004247fba2c8707cdb8bba853158c33a8 Mon Sep 17 00:00:00 2001 From: lokher Date: Mon, 10 Jul 2023 14:26:43 +0800 Subject: [PATCH 09/15] Update keyboards/keychron/k12_pro/ansi/rgb/config.h --- keyboards/keychron/k12_pro/ansi/rgb/config.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/keychron/k12_pro/ansi/rgb/config.h b/keyboards/keychron/k12_pro/ansi/rgb/config.h index f78149200e..d821ba4e78 100755 --- a/keyboards/keychron/k12_pro/ansi/rgb/config.h +++ b/keyboards/keychron/k12_pro/ansi/rgb/config.h @@ -20,8 +20,7 @@ /* RGB Matrix driver configuration */ # define DRIVER_COUNT 1 # define DRIVER_ADDR_1 0b1110100 -# define DRIVER_1_LED_COUNT 61 -# define RGB_MATRIX_LED_COUNT DRIVER_1_LED_COUNT +# define RGB_MATRIX_LED_COUNT 61 /* Set to infinit, which is use in USB mode by default */ From f5bd7daa0fd2aac4d02e7f9b5510a66eb98d6683 Mon Sep 17 00:00:00 2001 From: lokher Date: Mon, 10 Jul 2023 14:26:51 +0800 Subject: [PATCH 10/15] Update keyboards/keychron/k12_pro/ansi/rgb/config.h --- keyboards/keychron/k12_pro/ansi/rgb/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/keychron/k12_pro/ansi/rgb/config.h b/keyboards/keychron/k12_pro/ansi/rgb/config.h index d821ba4e78..a7b8089165 100755 --- a/keyboards/keychron/k12_pro/ansi/rgb/config.h +++ b/keyboards/keychron/k12_pro/ansi/rgb/config.h @@ -1,4 +1,4 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.com) +/* 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 From 45341b6f63222b66b061c031a3b35d1c97210497 Mon Sep 17 00:00:00 2001 From: lokher Date: Mon, 10 Jul 2023 14:28:27 +0800 Subject: [PATCH 11/15] Update keyboards/keychron/k12_pro/ansi/white/config.h --- keyboards/keychron/k12_pro/ansi/white/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/keychron/k12_pro/ansi/white/config.h b/keyboards/keychron/k12_pro/ansi/white/config.h index c3e5736c86..139dfcfd5b 100755 --- a/keyboards/keychron/k12_pro/ansi/white/config.h +++ b/keyboards/keychron/k12_pro/ansi/white/config.h @@ -1,4 +1,4 @@ -/* Copyright 2021 @ Keychron (https://www.keychron.com) +/* 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 From 03752c710a94fbfda983042aa9a42a518d67c82a Mon Sep 17 00:00:00 2001 From: lokher Date: Mon, 10 Jul 2023 14:28:47 +0800 Subject: [PATCH 12/15] Update keyboards/keychron/k12_pro/info.json --- keyboards/keychron/k12_pro/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/keychron/k12_pro/info.json b/keyboards/keychron/k12_pro/info.json index e743e42efb..fae987b4a1 100755 --- a/keyboards/keychron/k12_pro/info.json +++ b/keyboards/keychron/k12_pro/info.json @@ -16,7 +16,6 @@ "extrakey": true, "mousekey": true, "nkro": true, - "bluetooth": false, "raw": true }, "matrix_pins": { From c311f482b76b34d77dc87ba145d1b6aac918c03a Mon Sep 17 00:00:00 2001 From: lokher Date: Mon, 10 Jul 2023 14:28:56 +0800 Subject: [PATCH 13/15] Update keyboards/keychron/k12_pro/k12_pro.h --- keyboards/keychron/k12_pro/k12_pro.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/keychron/k12_pro/k12_pro.h b/keyboards/keychron/k12_pro/k12_pro.h index cd0954d579..9cc6693d4d 100755 --- a/keyboards/keychron/k12_pro/k12_pro.h +++ b/keyboards/keychron/k12_pro/k12_pro.h @@ -51,5 +51,5 @@ enum { BT_HST3 = KC_TRNS, BAT_LVL = KC_TRNS, #endif - NEW_SAFE_RANGE + NEW_SAFE_RANGE }; From 2f5382a49caf5bf2cf1e1dbe2022337940803d4b Mon Sep 17 00:00:00 2001 From: lokher Date: Mon, 10 Jul 2023 14:29:05 +0800 Subject: [PATCH 14/15] Update keyboards/keychron/k12_pro/ansi/rgb/config.h --- keyboards/keychron/k12_pro/ansi/rgb/config.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/keychron/k12_pro/ansi/rgb/config.h b/keyboards/keychron/k12_pro/ansi/rgb/config.h index a7b8089165..29a8b9f7f5 100755 --- a/keyboards/keychron/k12_pro/ansi/rgb/config.h +++ b/keyboards/keychron/k12_pro/ansi/rgb/config.h @@ -22,8 +22,7 @@ # define DRIVER_ADDR_1 0b1110100 # define RGB_MATRIX_LED_COUNT 61 -/* Set to infinit, which is use in USB mode by default - */ +/* Set to infinit, which is use in USB mode by default */ # define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE /* Allow shutdown of led driver to save power */ From a955f76e1c9dcb7b4768b83dcc6ca7ada4742e00 Mon Sep 17 00:00:00 2001 From: lokher Date: Mon, 10 Jul 2023 14:29:14 +0800 Subject: [PATCH 15/15] Update keyboards/keychron/k12_pro/ansi/white/config.h --- keyboards/keychron/k12_pro/ansi/white/config.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/keyboards/keychron/k12_pro/ansi/white/config.h b/keyboards/keychron/k12_pro/ansi/white/config.h index 139dfcfd5b..09878c4824 100755 --- a/keyboards/keychron/k12_pro/ansi/white/config.h +++ b/keyboards/keychron/k12_pro/ansi/white/config.h @@ -36,10 +36,7 @@ # define CAPS_LOCK_INDEX 28 # define LOW_BAT_IND_INDEX 56 -// LED Matrix Animation modes. Explicitly enabled -// For full list of effects, see: -// https://docs.qmk.fm/#/feature_led_matrix?id=led-matrix-effects -// #if defined(LED_MATRIX_KEYPRESSES) || defined(LED_MATRIX_KEYRELEASES) +/* Enable Reactive Animation */ # define LED_MATRIX_KEYPRESSES # define LED_MATRIX_KEYRELEASES