darkkirb/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
QMK Bot 2022-05-30 18:29:09 +00:00
commit 6b640db4bb
3 changed files with 27 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
layouts/community/ortho_4x12/junonum/config.h
View file

@ -38,3 +38,6 @@
// Short tap threshold // Short tap threshold
#define TAPPING_TERM 250 #define TAPPING_TERM 250
// For homerow mods
#define IGNORE_MOD_TAP_INTERRUPT

34
layouts/community/ortho_4x12/junonum/keymap.c
View file

@ -27,34 +27,44 @@ enum planck_keycodes {
DP_OFF DP_OFF
}; };
#define SHIFTEN RSFT_T(KC_ENT)
#define LOWER MO(_LOWER) #define LOWER MO(_LOWER)
#define RAISE MO(_RAISE) #define RAISE MO(_RAISE)
#define SPACEFN LT(_FN1, KC_SPC) #define SPACEFN LT(_FN1, KC_SPC)
#define DPADNUM MO(_DPADNUM) #define DPADNUM MO(_DPADNUM)
#define CTRLTAB CTL_T(KC_TAB)
// Homerow mods
#define MD_A LALT_T(KC_A)
#define MD_S LGUI_T(KC_S)
#define MD_D LCTL_T(KC_D)
#define MD_F LSFT_T(KC_F)
#define MD_J RSFT_T(KC_J)
#define MD_K RCTL_T(KC_K)
#define MD_L RGUI_T(KC_L)
#define MD_SCLN RALT_T(KC_SCLN)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT_ortho_4x12( [_QWERTY] = LAYOUT_ortho_4x12(
KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
CTRLTAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_TAB, MD_A, MD_S, MD_D, MD_F, KC_G, KC_H, MD_J, MD_K, MD_L, MD_SCLN, KC_QUOT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SHIFTEN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
_______, KC_LCTL, KC_LALT, KC_LGUI, LOWER, SPACEFN, SPACEFN, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT _______, KC_LCTL, KC_LGUI, KC_LALT, LOWER, SPACEFN, SPACEFN, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT
), ),
[_COLEMAK] = LAYOUT_ortho_4x12( [_COLEMAK] = LAYOUT_ortho_4x12(
KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC,
CTRLTAB, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_TAB, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, SHIFTEN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
_______, KC_LCTL, KC_LALT, KC_LGUI, LOWER, SPACEFN, SPACEFN, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT _______, KC_LCTL, KC_LGUI, KC_LALT, LOWER, SPACEFN, SPACEFN, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT
), ),
[_DVORAK] = LAYOUT_ortho_4x12( [_DVORAK] = LAYOUT_ortho_4x12(
KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC,
CTRLTAB, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_QUOT, KC_TAB, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_QUOT,
KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, SHIFTEN, KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT ,
_______, KC_LCTL, KC_LALT, KC_LGUI, LOWER, SPACEFN, SPACEFN, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT _______, KC_LCTL, KC_LGUI, KC_LALT, LOWER, SPACEFN, SPACEFN, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT
), ),
[_LOWER] = LAYOUT_ortho_4x12( [_LOWER] = LAYOUT_ortho_4x12(
@ -97,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_ENT , KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_ENT ,
XXXXXXX, KC_LCTL, KC_LALT, KC_LGUI, DPADNUM, KC_SPC, KC_SPC, DPADNUM, DP_OFF, KC_LEFT, KC_DOWN, KC_RGHT XXXXXXX, KC_LCTL, KC_LGUI, KC_LALT, DPADNUM, KC_SPC, KC_SPC, DPADNUM, DP_OFF, KC_LEFT, KC_DOWN, KC_RGHT
), ),
// Extended numeric layer for FPS weapon switching and StarCraft group control // Extended numeric layer for FPS weapon switching and StarCraft group control

3
layouts/community/ortho_4x12/junonum/readme.md
View file

@ -5,11 +5,12 @@ A universal ortholinear 4x12 keymap created by Juno Nguyen
* Successor to *juno*. * Successor to *juno*.
* Numpad-like cluster for numerics. * Numpad-like cluster for numerics.
* ESDF and IJKL arrow cluster from SpaceFn for navigation. * ESDF and IJKL arrow cluster from SpaceFn for navigation.
* CtrlTab for even more HHKB-ness. * ~~CtrlTab for even more HHKB-ness.~~
* Audio indicator for Caps Lock. * Audio indicator for Caps Lock.
* Huge amount of omissions of redundant keys. * Huge amount of omissions of redundant keys.
* 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
Refined since Oct 2019 Refined since Oct 2019