1
0
Fork 0

Merge pull request #1986 from ideasman42/code-friendly-qwerty

qwerty_code_friendly: Expose caps-lock & fix typo
This commit is contained in:
Erez Zukerman 2017-11-09 08:29:10 -05:00 committed by GitHub
commit 7044dafe59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 10 deletions

View File

@ -15,32 +15,36 @@
#define CFQ_USE_DYNAMIC_MACRO #define CFQ_USE_DYNAMIC_MACRO
#if !defined(CFQ_USER_KEY1) #if !defined(CFQ_USER_KEY1)
#define CFQ_USER_KEY1 CFQ_KC_FN1 # define CFQ_USER_KEY1 CFQ_KC_FN1
#endif #endif
#if !defined(CFQ_USER_KEY2) #if !defined(CFQ_USER_KEY2)
#define CFQ_USER_KEY2 KC_INS # define CFQ_USER_KEY2 KC_INS
#endif #endif
#if !defined(CFQ_USER_KEY3) #if !defined(CFQ_USER_KEY3)
#define CFQ_USER_KEY3 CFQ_KC_FN3 # ifdef CFQ_USE_EXPEREMENTAL_LAYER
# define CFQ_USER_KEY3 CFQ_KC_FN3
# else
# define CFQ_USER_KEY3 KC_CAPS
# endif
#endif #endif
#if !defined(CFQ_USER_KEY4) #if !defined(CFQ_USER_KEY4)
#define CFQ_USER_KEY4 KC_SPC # define CFQ_USER_KEY4 KC_SPC
#endif #endif
#if !defined(CFQ_USER_KEY5) #if !defined(CFQ_USER_KEY5)
#define CFQ_USER_KEY5 KC_ENT # define CFQ_USER_KEY5 KC_ENT
#endif #endif
#if !defined(CFQ_USER_KEY6) #if !defined(CFQ_USER_KEY6)
#define CFQ_USER_KEY5 CFQ_KC_FN2 # define CFQ_USER_KEY6 CFQ_KC_FN2
#endif #endif
#if !defined(CFQ_USER_KEY7) #if !defined(CFQ_USER_KEY7)
#define CFQ_USER_KEY5 CFQ_KC_FN1 # define CFQ_USER_KEY7 CFQ_KC_FN1
#endif #endif
#define BASE 0 // default layer #define BASE 0 // default layer
#define SYMB 1 // symbols #define SYMB 1 // symbols
#define MDIA 2 // media keys #define MDIA 2 // media keys
#ifdef CFQ_USE_EXPEREMENTAL_LAYER #ifdef CFQ_USE_EXPEREMENTAL_LAYER
#define EXPR 3 // experimental keys # define EXPR 3 // experimental keys
#endif #endif
enum custom_keycodes { enum custom_keycodes {
@ -105,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | LCtl |Super | Alt | ~L1 |Space | | Left | Down | Up |Right | Del | * | LCtl |Super | Alt | ~L1 |Space | | Left | Down | Up |Right | Del |
* `----------------------------------' `----------------------------------' * `----------------------------------' `----------------------------------'
* ,-------------. ,-------------. * ,-------------. ,-------------.
* | Ins | ~L3 | | Home | End | * | Ins |CapsLk| | Home | End |
* ,------|------|------| |------+------+------. * ,------|------|------| |------+------+------.
* | | | ~L2 | | PgUp | | | * | | | ~L2 | | PgUp | | |
* |Space |Enter |------| |------|Enter |Space | * |Space |Enter |------| |------|Enter |Space |

View File

@ -32,6 +32,7 @@ using `CFQ_` prefixed defines which can be set by passing `EXTRAFLAGS` to make.
- `CFQ_USE_SWAP_RIGHT_SPACE_ENTER` swap Enter and Space on the right hand thumb cluster. - `CFQ_USE_SWAP_RIGHT_SPACE_ENTER` swap Enter and Space on the right hand thumb cluster.
While asymmetric, it makes Enter more easily accessible. While asymmetric, it makes Enter more easily accessible.
- `CFQ_USE_EXPEREMENTAL_LAYER` defines an extra layer for misc extra keys/macros. - `CFQ_USE_EXPEREMENTAL_LAYER` defines an extra layer for misc extra keys/macros.
When set, Caps-Lock is replace by Layer3.
Currently it's mostly empty. Currently it's mostly empty.
@ -52,7 +53,7 @@ Keymap 0: Basic layer
| LCtl |Super | Alt | ~L1 |Space | | Left | Down | Up |Right | Del | | LCtl |Super | Alt | ~L1 |Space | | Left | Down | Up |Right | Del |
`----------------------------------' `----------------------------------' `----------------------------------' `----------------------------------'
,-------------. ,-------------. ,-------------. ,-------------.
| Ins | ~L3 | | Home | End | | Ins |CapsLk| | Home | End |
,------|------|------| |------+------+------. ,------|------|------| |------+------+------.
| | | ~L2 | | PgUp | | | | | | ~L2 | | PgUp | | |
|Space |Enter |------| |------|Enter |Space | |Space |Enter |------| |------|Enter |Space |
@ -127,6 +128,9 @@ Notes:
## Changelog ## Changelog
- 2017/11/09
Use Caps-Lock when `CFQ_USE_EXPEREMENTAL_LAYER` isn't defined.
- 2017/11/07 - 2017/11/07
Make thumb left thumb cluster completely configurable with defines. Make thumb left thumb cluster completely configurable with defines.
Add mouse wheel to mouse layer. Add mouse wheel to mouse layer.