g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

master
QMK Bot 2023-07-28 06:45:33 +00:00
parent 103199dd81 191b98990c
commit ba10b87063
4 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keyboards/crkbd/keymaps/colemad/config.h
View File

@ -2,6 +2,8 @@
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#pragma once #pragma once
#define SPLIT_USB_DETECT // Added for Elite-C to work
#define QUICK_TAP_TERM 0 #define QUICK_TAP_TERM 0
#define TAPPING_TERM 200 #define TAPPING_TERM 200

2
keyboards/crkbd/keymaps/colemad/keycodes.h
View File

@ -19,6 +19,6 @@
/* Macros */ /* Macros */
enum custom_keycodes { enum custom_keycodes {
VSCTERM = SAFE_RANGE, VSCTERM = QK_USER,
CHNLANG CHNLANG
}; };

4
keyboards/crkbd/keymaps/colemad/keymap.c
View File

@ -50,9 +50,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ADJUST] = LAYOUT( [_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, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|

32
keyboards/crkbd/keymaps/colemad/readme.md
View File

@ -1,21 +1,29 @@
# **COLEMAD** # **COLEMAD**
Compiled and tested: `July 12, 2023`
## Corne Keyboard (CRKBD) **Colemak** layout by [ACortesDev](https://github.com/ACortesDev) ## Corne Keyboard (CRKBD) **Colemak** layout by [ACortesDev](https://github.com/ACortesDev)
1. **Fast navigation**. 1. **Ergonomic navigation keys**.
2. **Fast symbols**. 2. **Symbols where expected to be**.
3. **Fast numbers**. 3. **Numbers (numpad)**.
Using the Telephone/ATM numpad layout. Easier to memorize/visualize as numbers follow *left-to-right, top-to-bottom* order. 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). 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** ### **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 ##### Macros + Settings
Notes:
- Function keys (from F13 to F19) to use for Linux/MacOS shortcuts.
```text ```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 **VSCTERM**: Toggles the vscode terminal (Ctrl + `)
- Macro **CHNLANG**: Changes the OS keyboard layout (Ctrl + Shift + N) - Macro **CHNLANG**: Changes the OS keyboard layout (Ctrl + Shift + N)