mirror of
https://github.com/Keychron/qmk_firmware.git
synced 2024-11-25 01:47:10 +06:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
ba10b87063
|
@ -2,6 +2,8 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
#pragma once
|
||||
|
||||
#define SPLIT_USB_DETECT // Added for Elite-C to work
|
||||
|
||||
#define QUICK_TAP_TERM 0
|
||||
#define TAPPING_TERM 200
|
||||
|
||||
|
|
|
@ -19,6 +19,6 @@
|
|||
|
||||
/* Macros */
|
||||
enum custom_keycodes {
|
||||
VSCTERM = SAFE_RANGE,
|
||||
VSCTERM = QK_USER,
|
||||
CHNLANG
|
||||
};
|
||||
|
|
|
@ -50,9 +50,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
|
||||
[_ADJUST] = LAYOUT(
|
||||
//,-----------------------------------------------------. ,-----------------------------------------------------.
|
||||
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI,
|
||||
XXXXXXX, XXXXXXX, KC_F13, KC_F14, KC_F15, XXXXXXX, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI,
|
||||
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
|
||||
XXXXXXX, XXXXXXX, VSCTERM, KC_PSCR, CHNLANG, XXXXXXX, XXXXXXX,RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD,
|
||||
XXXXXXX, KC_F16, KC_F17, KC_F18, KC_F19, XXXXXXX, XXXXXXX,RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD,
|
||||
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
|
||||
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
|
||||
|
|
|
@ -1,21 +1,29 @@
|
|||
# **COLEMAD**
|
||||
|
||||
Compiled and tested: `July 12, 2023`
|
||||
|
||||
## Corne Keyboard (CRKBD) **Colemak** layout by [ACortesDev](https://github.com/ACortesDev)
|
||||
|
||||
1. **Fast navigation**.
|
||||
2. **Fast symbols**.
|
||||
3. **Fast numbers**.
|
||||
1. **Ergonomic navigation keys**.
|
||||
2. **Symbols where expected to be**.
|
||||
3. **Numbers (numpad)**.
|
||||
Using the Telephone/ATM numpad layout. Easier to memorize/visualize as numbers follow *left-to-right, top-to-bottom* order.
|
||||
4. **Fast capital letters**.
|
||||
4. **Easy Capital letters**.
|
||||
Added a *CAPS Lock* key because... [There is no *CAPS Lock* key in the Colemak Layout](https://colemak.com/FAQ#Where_is_the_Caps_Lock_key.3F).
|
||||
|
||||
---
|
||||
|
||||
### **Flashing**
|
||||
|
||||
For *Pro Micro* execute: `sudo make crkbd:colemad:avrdude`
|
||||
~~For *Pro Micro* execute: `sudo make crkbd:colemad:avrdude`~~
|
||||
|
||||
For *Elite-C* execute: `sudo make crkbd:colemad:dfu`
|
||||
~~For *Elite-C* execute: `sudo make crkbd:colemad:dfu`~~
|
||||
|
||||
For *Pro Micro* and *Elite-C* run:
|
||||
|
||||
```sh
|
||||
qmk flash -kb crkbd -km colemad -bl dfu
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
|
@ -87,11 +95,15 @@ Notes:
|
|||
|
||||
##### Macros + Settings
|
||||
|
||||
Notes:
|
||||
|
||||
- Function keys (from F13 to F19) to use for Linux/MacOS shortcuts.
|
||||
|
||||
```text
|
||||
,-----------------------------------------------------. ,-----------------------------------------------------.
|
||||
| | | | | | | |RGB_TOG |RGB_MOD |RGB_VAI |RGB_HUI |RGB_SAI |RGB_SPI |
|
||||
| | | F13 | F14 | F15 | | |RGB_TOG |RGB_MOD |RGB_VAI |RGB_HUI |RGB_SAI |RGB_SPI |
|
||||
|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
|
||||
| | |VSCTERM | PSCR |CHNLANG | | | |RGB_RMOD|RGB_VAD |RGB_HUD |RGB_SAD |RGB_SPD |
|
||||
| | F16 | F17 | F18 | F19 | | | |RGB_RMOD|RGB_VAD |RGB_HUD |RGB_SAD |RGB_SPD |
|
||||
|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
|
||||
| | | | | | | | | | | | | |
|
||||
`--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------'
|
||||
|
@ -102,5 +114,9 @@ Notes:
|
|||
`--------+--------+--------' `--------+--------+--------'
|
||||
```
|
||||
|
||||
##### Ready to use Macro examples
|
||||
|
||||
Checkout `keycodes.h` and `process_records.c/h` files.
|
||||
|
||||
- Macro **VSCTERM**: Toggles the vscode terminal (Ctrl + `)
|
||||
- Macro **CHNLANG**: Changes the OS keyboard layout (Ctrl + Shift + N)
|
||||
|
|
Loading…
Reference in New Issue
Block a user