Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
f9abecda3f
|
@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||||
|
|
||||||
[_ADJUST] = LAYOUT_ortho_4x12(
|
[_ADJUST] = LAYOUT_ortho_4x12(
|
||||||
_______, RESET, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
|
_______, RESET, DEBUG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
|
||||||
_______, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, PLOVER, _______,
|
_______, _______, MU_MOD, AU_ON, AU_OFF, CG_NORM, CG_SWAP, QWERTY, COLEMAK, DVORAK, PLOVER, _______,
|
||||||
_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, TERM_ON, TERM_OFF, _______, _______, _______,
|
_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, TERM_ON, TERM_OFF, _______, _______, _______,
|
||||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
|
||||||
),
|
),
|
||||||
|
|
|
@ -11,6 +11,7 @@ A universal ortholinear 4x12 keymap created by Juno Nguyen
|
||||||
* minimalism (not really).
|
* minimalism (not really).
|
||||||
* DPAD layer for gaming with inverted T-shaped direction keys.
|
* DPAD layer for gaming with inverted T-shaped direction keys.
|
||||||
* DPADNUM secondary layer tailored for StarCraft group control and FPS weapon switching.
|
* DPADNUM secondary layer tailored for StarCraft group control and FPS weapon switching.
|
||||||
* New: homerow mods for even less movement
|
* Homerow mods for even less movement
|
||||||
|
* Toggle Control and GUI swap instead of default Alt and GUI to better accommodate switching between Windows/Linux and Mac
|
||||||
|
|
||||||
Refined since Oct 2019
|
Refined since Oct 2019
|
Loading…
Reference in New Issue