diff --git a/q8/config.h b/q8/config.h index fe66f07..8533576 100644 --- a/q8/config.h +++ b/q8/config.h @@ -1,23 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + #pragma once -/* Don't autoshift numbers or tab */ -#define NO_AUTO_SHIFT_NUMERIC -#define NO_AUTO_SHIFT_TAB +#define VIAL_KEYBOARD_UID {0x77, 0x4C, 0xB1, 0xD7, 0xDD, 0xBE, 0xF6, 0xD2} +#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } +#define VIAL_UNLOCK_COMBO_COLS { 0, 13 } -#define SPLIT_LAYER_STATE_ENABLE - -#define MOUSEKEY_DELAY 20 -#define MOUSEKEY_INTERVAL 20 -#define MOUSEKEY_MAX_SPEED 5 -#define MOUSEKEY_TIME_TO_MAX 40 -#define MOUSEKEY_WHEEL_MAX_SPEED 10 - -// Tapping Term -#define TAPPING_TERM 200 -#define TAPPING_TERM_PER_KEY - - -#define COMBO_TERM 25 // how quickly all combo keys must be pressed in succession to trigger -#define COMBO_MUST_HOLD_MODS // if a combo triggers a modifier, only trigger when the combo is held -#define COMBO_HOLD_TERM 175 // how long at least one of the combo keys must be held to trigger +#define DYNAMIC_KEYMAP_LAYER_COUNT 8 diff --git a/q8/keymap.c b/q8/keymap.c index 9c56de5..be70711 100644 --- a/q8/keymap.c +++ b/q8/keymap.c @@ -1,72 +1,80 @@ +/* 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 #include "keychron_common.h" -#include "dgvigil.h" -enum combos { - FA_GUI, - FS_ALT, - FD_CTL, - JQUOT_GUI, - JL_ALT, - JK_CTL +// clang-format off + +enum layers{ + MAC_BASE, + WIN_BASE, + _NAV, + _NUM, + _SYM, + _FUN, + _MUS, + _MOUSE }; -const uint16_t PROGMEM fa_combo[] = {KC_F, KC_A, COMBO_END}; -const uint16_t PROGMEM fs_combo[] = {KC_F, KC_S, COMBO_END}; -const uint16_t PROGMEM fd_combo[] = {KC_F, KC_D, COMBO_END}; -const uint16_t PROGMEM jquote_combo[] = {KC_J, KC_QUOT, COMBO_END}; -const uint16_t PROGMEM jl_combo[] = {KC_J, KC_L, COMBO_END}; -const uint16_t PROGMEM jk_combo[] = {KC_J, KC_K, COMBO_END}; - -combo_t key_combos[] = { - [FA_GUI] = COMBO(fa_combo, KC_LGUI), - [FS_ALT] = COMBO(fs_combo, KC_LALT), - [FD_CTL] = COMBO(fd_combo, KC_LCTL), - [JQUOT_GUI] = COMBO(jquote_combo, KC_RGUI), - [JL_ALT] = COMBO(jl_combo, KC_RALT), - [JK_CTL] = COMBO(jk_combo, KC_RCTL), -}; - - - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT_ansi_69( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_MUTE, - KC_LPAD, __________________BASE_L1____________________, __________________BASE_R1____________________, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, - KC_CAPS, __________________BASE_L2____________________, __________________BASE_R2____________________, KC_QUOT, KC_ENT, KC_HOME, - KC_LSFT, __________________BASE_L3____________________, SPOTLI, __________________BASE_R3____________________, KC_RSFT, KC_UP, - KC_LCTL, KC_LOPT, ___________THUMB_L3________, ___________THUMB_R3________, KC_LEFT, KC_DOWN, KC_RGHT), + [MAC_BASE] = LAYOUT_ansi_69( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_MUTE, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, + KC_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_HOME, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, MO(_NAV), MO(_MOUSE), KC_SPC, KC_RCMMD, KC_LEFT, KC_DOWN, KC_RGHT), + + [WIN_BASE] = LAYOUT_ansi_69( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_MUTE, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, + KC_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_HOME, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(_NUM), MO(_MOUSE), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT), [_NAV] = LAYOUT_ansi_69( - QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, - KC_TAB, __________________EMPTY_____________________, __________________NAV_R1____________________, KC_UNDO, KC_RBRC, KC_BSLS, KC_DEL, - KC_CAPS, __________________NAV_L2____________________, __________________NAV_R2____________________, KC_QUOT, KC_ENT, KC_HOME, - KC_LSFT, __________________NAV_L3____________________, LINUX, __________________NAV_R3____________________, KC_RSFT, KC_UP, - KC_LCTL, KC_LOPT, ___________THUMB_L3________, ___________THUMB_R3________, KC_LEFT, KC_DOWN, KC_RGHT), - - [_NUM] = LAYOUT_ansi_69( - QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, - KC_TAB, __________________NUM_L1____________________, _________________BOOT_R1____________________, KC_UNDO, KC_RBRC, KC_BSLS, KC_DEL, - KC_CAPS, __________________NUM_L2____________________, __________________EMPTY_____________________, KC_QUOT, KC_ENT, KC_HOME, - KC_LSFT, __________________NUM_L3____________________, LINUX, __________________EMPTY_____________________, KC_RSFT, KC_UP, - KC_LCTL, KC_LOPT, _________NUM_TH_L3________, ___________THUMB_3__BLANK__, KC_LEFT, KC_DOWN, KC_RGHT), - - [_SYM] = LAYOUT_ansi_69( - 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_TOG, - RGB_TOG, __________________SYM_L1____________________, __________________EMPTY_____________________, _______, _______, _______, _______, - _______, __________________SYM_L2____________________, __________________EMPTY_____________________, _______, _______, _______, - _______, __________________SYM_L3____________________, _______, __________________EMPTY_____________________, _______, _______, - _______, _______, _________SYM_TH_L3________, ___________THUMB_3__BLANK__, _______, _______, _______), - - [_FUN] = LAYOUT_ansi_69( 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_TOG, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + [_NUM] = LAYOUT_ansi_69( + KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_TOG, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + + [_SYM] = LAYOUT_ansi_69( + KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_TOG, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + + [_FUN] = LAYOUT_ansi_69( + KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_TOG, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + [_MUS] = LAYOUT_ansi_69( - 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_TOG, + KC_GRV, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_TOG, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, @@ -80,107 +88,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______) }; +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, + [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, + [_NAV] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, + [_NUM] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, + [_FUN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, + [_MUS] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, + [_MOUSE] = {ENCODER_CCW_CW(_______, _______)} +}; +#endif // ENCODER_MAP_ENABLE -uint8_t mod_state; -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - static bool isLinux = false; - mod_state = get_mods(); - switch (keycode) { +// clang-format on - case LINUX: - if (record->event.pressed) { - isLinux = !isLinux; - } - return false; - case COPY: - if (record->event.pressed) { - if (isLinux) { - tap_code16(LCTL(KC_C)); - } else { - tap_code16(LGUI(KC_C)); - } - return false; - } - case PASTE: - if (record->event.pressed) { - if (isLinux) { - tap_code16(LCTL(KC_V)); - } else { - tap_code16(LGUI(KC_V)); - } - return false; - } - case CUT: - if (record->event.pressed) { - if (isLinux) { - tap_code16(LCTL(KC_X)); - } else { - tap_code16(LGUI(KC_X)); - } - return false; - } - case UNDO: - if (record->event.pressed) { - if (isLinux) { - tap_code16(LCTL(KC_Z)); - } else { - tap_code16(LGUI(KC_Z)); - } - return false; - } - case REDO: - if (record->event.pressed) { - if (isLinux) { - tap_code16(LCTL(KC_Y)); - } else { - tap_code16(LSG(KC_Z)); - } - return false; - } - case SALL: - if (record->event.pressed) { - if (isLinux) { - tap_code16(LCTL(KC_A)); - } else { - tap_code16(LGUI(KC_A)); - } - return false; - } - case M_PASS1: - if (record->event.pressed) { - SEND_STRING("P0plarLake!2023"); - } - return false; - case M_PASS2: - if (record->event.pressed) { - SEND_STRING("CindieVerano!2024"); - } - return false; - case M_PASS3: - if (record->event.pressed) { - SEND_STRING("1290"); - } - return false; - case M_PASS4: - if (record->event.pressed) { - SEND_STRING("Thel0ve0fchrist!"); - } - return false; - case SPOTLI: - if (record->event.pressed) { - tap_code16(LGUI(KC_SPACE)); - } - return false; - } - return true; +void housekeeping_task_user(void) { + housekeeping_task_keychron(); } -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [_QWERTY] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [_NUM] = {ENCODER_CCW_CW(RGB_MOD, RGB_RMOD)}, - [_NAV] = {ENCODER_CCW_CW(RGB_MOD, RGB_RMOD)}, - [_SYM] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, - [_FUN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, - [_MUS] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, - [_MOUSE] = {ENCODER_CCW_CW(_______, _______)} -}; +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + if (!process_record_keychron(keycode, record)) { + return false; + } + return true; +} diff --git a/q8/rules.mk b/q8/rules.mk index 82a903f..c4ca639 100644 --- a/q8/rules.mk +++ b/q8/rules.mk @@ -1,6 +1,6 @@ -AUTO_SHIFT_ENABLE = yes - -ENCODER_ENABLE = yes +VIA_ENABLE = yes +VIAL_ENABLE = yes +VIALRGB_ENABLE = yes ENCODER_MAP_ENABLE = yes VPATH += keyboards/keychron/common diff --git a/q8/vial.json b/q8/vial.json new file mode 100644 index 0000000..6875793 --- /dev/null +++ b/q8/vial.json @@ -0,0 +1,297 @@ +{ + "name": "Keychron Q8", + "vendorId": "0x3434", + "productId": "0x0181", + "lighting": "vialrgb", + "customKeycodes": [ + {"name": "Mission Control", "title": "Mission Control in macOS", "shortName": "MCtrl"}, + {"name": "Launch Pad", "title": "Launch Pad in macOS", "shortName": "LPad"}, + {"name": "Left Option", "title": "Left Option in macOS", "shortName": "LOpt"}, + {"name": "Right Option", "title": "Right Option in macOS", "shortName": "ROpt"}, + {"name": "Left Cmd", "title": "Left Command in macOS", "shortName": "LCmd"}, + {"name": "Right Cmd", "title": "Right Command in macOS", "shortName": "RCmd"}, + {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"}, + {"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"} + ], + "matrix": {"rows": 5, "cols": 15}, + "layouts": { + "keymap": [ + [ + { + "x": 2.75 + }, + "0,2", + { + "x": 8.85 + }, + "0,11", + { + "x": 3.5000000000000018, + "c": "#aaaaaa" + }, + "0,14" + ], + [ + { + "y": -0.8500000000000001, + "x": 13.6, + "c": "#cccccc" + }, + "0,12", + { + "c": "#aaaaaa", + "w": 2 + }, + "0,13" + ], + [ + { + "y": -0.9999999999999999, + "x": 18.25 + }, + "0,0\n\n\n\n\n\n\n\n\ne" + ], + [ + { + "y": -0.9999999999999999, + "x": 19.25 + }, + "0,1\n\n\n\n\n\n\n\n\ne", + { + "x": -19.5, + "c": "#777777" + }, + "0,0\nESC", + { + "c": "#cccccc" + }, + "0,1" + ], + [ + { + "x": 0.5, + "c": "#aaaaaa", + "w": 1.5 + }, + "1,0", + { + "c": "#cccccc" + }, + "1,1", + { + "x": 10.3 + }, + "1,11", + "1,12", + { + "w": 1.5 + }, + "1,13" + ], + [ + { + "y": -0.8999999999999999, + "x": 17.3, + "c": "#aaaaaa" + }, + "1,14" + ], + [ + { + "y": -0.10000000000000009, + "x": 0.25, + "w": 1.75 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + { + "x": 9.75 + }, + "2,11", + "2,12", + { + "c": "#777777", + "w": 2.25 + }, + "2,13" + ], + [ + { + "y": -0.8999999999999999, + "x": 17.5, + "c": "#aaaaaa" + }, + "2,14" + ], + [ + { + "y": -0.10000000000000009, + "w": 2.25 + }, + "3,0", + { + "c": "#cccccc" + }, + "3,2", + { + "x": 10.15 + }, + "3,12", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "3,13" + ], + [ + { + "y": -0.75, + "x": 16.4, + "c": "#777777" + }, + "3,14" + ], + [ + { + "y": -0.25, + "c": "#aaaaaa", + "w": 1.25 + }, + "4,0", + { + "w": 1.25 + }, + "4,1" + ], + [ + { + "y": -0.75, + "x": 15.4, + "c": "#777777" + }, + "4,12", + "4,13", + "4,14" + ], + [ + { + "r": 6, + "y": -5.7, + "x": 3.85, + "c": "#cccccc" + }, + "0,3", + "0,4", + "0,5", + "0,6" + ], + [ + { + "x": 3.35 + }, + "1,2", + "1,3", + "1,4", + "1,5" + ], + [ + { + "x": 3.55 + }, + "2,2", + "2,3", + "2,4", + "2,5" + ], + [ + { + "x": 3.9 + }, + "3,3", + "3,4", + "3,5", + "3,6" + ], + [ + { + "x": 4, + "c": "#aaaaaa", + "w": 1.25 + }, + "4,2", + { + "c": "#cccccc", + "w": 2.25 + }, + "4,3", + { + "c": "#aaaaaa" + }, + "4,6" + ], + [ + { + "r": -6, + "y": -3.2, + "x": 8.35, + "c": "#cccccc" + }, + "0,7", + "0,8", + "0,9", + "0,10" + ], + [ + { + "x": 7.9 + }, + "1,6", + "1,7", + "1,8", + "1,9", + "1,10" + ], + [ + { + "x": 8.25 + }, + "2,7", + "2,8", + "2,9", + "2,10" + ], + [ + { + "x": 7.8 + }, + "3,7", + "3,8", + "3,9", + "3,10", + "3,11" + ], + [ + { + "x": 7.8, + "c": "#aaaaaa" + }, + "4,7", + { + "c": "#cccccc", + "w": 2.75 + }, + "4,8", + { + "c": "#aaaaaa" + }, + "4,9" + ] + ] + } +}