Updated keymaps to allow base layer alternation for QWERTY, Colemak & Dvorak (#1962)
* First commit of the Terminus_Mini firmware and the DivergeJM version of the Nyquist firmware * Fix terminus_mini & nyquist/DivergeJM readme files Previously an outdated copy of the default readme. Updated to match the Nyquist/DivergeJM format (DivergeJM is a split 5x12 implementation of the terminus_mini layout) * Update makefiles to rules.mk Renamed both Makefiles to rules.mk, removed references to makefiles * Updated rules.mk Inadvertantly removed important code from the rules.mk in previous commit. This has been restored. Also disabled Tap_Dance in both rules.mk files * Moved terminus_mini to handwired Realised that existing directory was not appropriate for the terminus_mini project, moved to handwired. * New Frosty Flake layout for QFR TKL Added a TKL layout for the Frosty Flake with a navigation cluster on LOWER under the left hand and a similarly functioning MOUSE layer that includes mouse navigation functionality. * README fix & keymap update for 3 keyboards Fixed the markdown for the handwired/terminus_mini:default, Nyqyist:DivergeJM & frosty_flake:QFR_JM. Added TAPPING_TERM = 150 to config.h for all keyboards Switched LT(LOWER) and LAlt on the mod row for ortholinear boards. * Update readme for QFR_JM to include make instructions * Revert "Merge branch 'master' of https://github.com/mogranjm/qmk_firmware" This reverts commit a45f264ada09acc14fb85390407bc7ff5bb021e3, reversing changes made to 62349c33410671a33d4041d50cf27de1d6bdd9cf. * Revert "Revert "Merge branch 'master' of https://github.com/mogranjm/qmk_firmware"" This reverts commit eae54fb3be2c60dffd704261f84bab98c9e06f93. * Added QWERTY support to the QFR_JM Implemented variable default base layer from the Planck default keymap. * Update README to reflect QWERTY support * Nyquist:DivergeJM - Update RESET location Add a reset button to both hands, accessible when halves are disconnected. * Typo fix * Update DivergeJM Switched master to Left hand, Moved Reset key to a different location * Added macros to send R pointer & dplyr pipe Macros added as a string of keypresses, couldn't figure out how to get SEND_STRING to work. * Added ADJUST -> QWERTY, DVORAK, COLEMAK Re-implemented update_tri_layer fuctionality to reset base layer for Terminus_Mini & DivergeJM Nyquist keymaps to QWERTY, DVORAK or COLEMAK via the ADJUST layer. Updated ReadMe files accordingly. * Fix base layout diagram for Terminus_Mini Remove split from diagram * Changed the R operators to SEND_STRING, rather than keypress macros * Added Dvorak to the QFR_JM keymap * fixed duplicate row in Nyquist keymap * Fix readme - LAlt location on mouse layer * Set EE_HANDS to allow either Nyquist hand to work as master. * Update R operator strings, clean up layering for terminus_mini, QFR_JM and DivergeJM "<-" to " <- " "%>%" to " %>% " Also played around with the layering, removed unnecessary TAP_TOGGLE for LOWER and shuffled FUNCTION and MOUSE momentary actions to reflect layer order. * Update bottom alpha row to output symbols on LOWER This row now outputs the following (z -> /) when in the LOWER layer: <- %>% { [ ` | ] } . / * Updated readme files for QFR_JM, terminus_mini & DivergeJM QFR_JM readme reflects correct LOWER bottom row symbol output, terminus_mini & DivergeJM reflect correct command line make instructions. * Add media keys to QFR_JM LOWER - Replicate QFR default functionality * Fix issue with Mouse layering Stuck on mouse layer because the wrong macro was assigned to the 'exit layer' key. Reassigned that key. * Changed " <- " to "<- " for QFR_JM, terminus_mini & DivergeJM
This commit is contained in:
James Morgan
Jack Humbert
parent
5cdf47a79e
commit
49d8f1c5ed
8 changed files with 475 additions and 140 deletions
|
|
@ -8,6 +8,7 @@
|
|||
enum QFR_layers {
|
||||
_COLEMAK,
|
||||
_QWERTY,
|
||||
_DVORAK,
|
||||
_LOWER,
|
||||
_MOUSE
|
||||
};
|
||||
|
|
@ -15,18 +16,26 @@ enum QFR_layers {
|
|||
enum QFR_keycodes {
|
||||
COLEMAK = SAFE_RANGE,
|
||||
QWERTY,
|
||||
DVORAK,
|
||||
LOWER,
|
||||
MOUSE
|
||||
};
|
||||
|
||||
enum custom_macros {
|
||||
R_PIPE,
|
||||
R_POINT
|
||||
};
|
||||
|
||||
const uint16_t PROGMEM fn_actions[] = { //ACTION_LAYER_TAP_TOGGLE requires that number of taps be defined in *config.h* - default set to 5
|
||||
[0] = ACTION_LAYER_TAP_KEY(_LOWER, KC_SPC), //Hold for momentary Lower layer, Tap for Space,
|
||||
[1] = ACTION_LAYER_TAP_TOGGLE(_LOWER), //Hold for momentary Mouse, Tap for toggle Mouse
|
||||
[2] = ACTION_LAYER_TAP_TOGGLE(_MOUSE), //Hold for momentary Lower, Tap for toggle Lower
|
||||
[1] = ACTION_LAYER_MOMENTARY(_MOUSE) //Hold for momentary MOUSE
|
||||
|
||||
};
|
||||
|
||||
#define SPC_LW FUNC(0)
|
||||
#define LWR FUNC(1)
|
||||
#define MSE FUNC(2)
|
||||
#define MSE FUNC(1)
|
||||
#define PIPE M(R_PIPE)
|
||||
#define POINT M(R_POINT)
|
||||
|
||||
// Fillers to make layering more clear
|
||||
#define _______ KC_TRNS
|
||||
|
|
@ -48,33 +57,60 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, \
|
||||
KC_CAPS,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT, KC_ENT, \
|
||||
KC_LSFT,KC_NUBS,KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \
|
||||
KC_LCTL,KC_LGUI,KC_LALT, SPC_LW, MSE, KC_RGUI , KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
|
||||
),
|
||||
|
||||
[_DVORAK] = KEYMAP_TKL(\
|
||||
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, \
|
||||
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, \
|
||||
KC_TAB, KC_QUOT,KC_COMM,KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, \
|
||||
KC_BSPC,KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_QUOT, KC_ENT, \
|
||||
KC_LSFT,KC_NUBS,KC_SCLN,KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, KC_UP, \
|
||||
KC_LCTL,KC_LGUI,KC_LALT, SPC_LW, MSE, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
|
||||
),
|
||||
|
||||
[_LOWER] = KEYMAP_TKL(\
|
||||
RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QWERTY, COLEMAK,_______, \
|
||||
RESET, _______, _______, _______, _______, KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, _______, KC_MUTE, KC_VOLD, KC_VOLU, QWERTY, COLEMAK,DVORAK, \
|
||||
KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LBRC, KC_RBRC, KC_UNDS, KC_PLUS, KC_BSPC, _______,_______,_______, \
|
||||
KC_TAB, KC_PGUP, KC_HOME, KC_UP, KC_END, XXXXXXX, XXXXXXX, KC_BTN3, KC_BTN4, KC_BTN5, XXXXXXX, KC_LCBR, KC_RCBR, KC_PIPE, _______,_______,_______, \
|
||||
KC_CAPS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, KC_BTN1, KC_BTN2, XXXXXXX, XXXXXXX, _______, _______, \
|
||||
_______,XXXXXXX,_______,_______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, \
|
||||
KC_TAB, KC_PGUP, KC_HOME, KC_UP, KC_END, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LCBR, KC_RCBR, KC_PIPE, _______,_______,_______, \
|
||||
KC_CAPS, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, \
|
||||
_______,XXXXXXX,POINT,PIPE, KC_LCBR, KC_LBRC, KC_GRV, KC_PIPE, KC_RBRC, KC_RCBR, _______, _______, _______, _______, \
|
||||
_______, _______, _______, _______, KC_RALT, _______, _______, _______, _______,_______,_______ \
|
||||
),
|
||||
|
||||
[_MOUSE] = KEYMAP_TKL(\
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,_______,_______, \
|
||||
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, _______,_______,_______, \
|
||||
KC_TAB, KC_WH_U, KC_WH_L, KC_MS_U, KC_WH_R, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, KC_BSLS, _______,_______,_______, \
|
||||
KC_BSPC, KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, \
|
||||
_______,XXXXXXX,KC_Z,KC_X, KC_C, KC_V, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, \
|
||||
KC_TAB, KC_WH_U, KC_WH_L, KC_MS_U, KC_WH_R, XXXXXXX, XXXXXXX, KC_BTN3, KC_BTN4, KC_BTN5, XXXXXXX, KC_LBRC, KC_RBRC, KC_BSLS, _______,_______,_______, \
|
||||
KC_BSPC, KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, XXXXXXX, KC_BTN1, KC_BTN2, XXXXXXX, XXXXXXX, XXXXXXX, _______, \
|
||||
_______,XXXXXXX,PIPE,POINT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, \
|
||||
_______, _______, _______, KC_ACL2, MSE, _______, _______, _______, _______,_______,_______ \
|
||||
)
|
||||
};
|
||||
|
||||
// Macros to send R pointer & dplyr pipe
|
||||
const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
|
||||
switch(id) {
|
||||
case R_POINT:
|
||||
if (record->event.pressed) { // pointer
|
||||
SEND_STRING("<- ");
|
||||
// return MACRO(D(LSFT), T(COMM), U(LSFT), T(MINS), END);
|
||||
}
|
||||
break;
|
||||
case R_PIPE:
|
||||
if (record->event.pressed) { // dplyr pipe
|
||||
SEND_STRING("%>% ");
|
||||
// return MACRO(D(LSFT), T(5), T(DOT), T(5), U(LSFT), END);
|
||||
}
|
||||
break;
|
||||
}
|
||||
return MACRO_NONE;
|
||||
}
|
||||
|
||||
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||
switch (keycode) {
|
||||
case QWERTY:
|
||||
if (record->event.pressed) {
|
||||
//print("mode just switched to qwerty and this is a huge string\n");
|
||||
set_single_persistent_default_layer(_QWERTY);
|
||||
}
|
||||
return false;
|
||||
|
|
@ -85,6 +121,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
|||
}
|
||||
return false;
|
||||
break;
|
||||
case DVORAK:
|
||||
if (record->event.pressed) {
|
||||
set_single_persistent_default_layer(_DVORAK);
|
||||
}
|
||||
return false;
|
||||
break;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
|
@ -39,7 +39,7 @@ The base layout is Colemak by default, but this can be changed to QWERTY via the
|
|||
### LOWER
|
||||
```
|
||||
,----. ,-------------------. ,-------------------. ,-------------------. ,--------------.
|
||||
|ESC | | F1 | F2 | F3 | F4 | | F5 | F6 | F7 | F8 | | F9 |F10 |F11 |F12 | |QWTY|CLMK|PsBk|
|
||||
|ESC | | F1 | F2 | F3 | F4 | |>/|||Stop| << | >> | | F9 |MUTE|Vol-|Vol+| |QWTY|CLMK|PsBk|
|
||||
'----' '-------------------' '-------------------' '-------------------' '--------------'
|
||||
,-------------------------------------------------------------------------. ,--------------.
|
||||
| ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | _ | + | Bspc | | Ins|Home|PgUp|
|
||||
|
|
@ -48,7 +48,7 @@ The base layout is Colemak by default, but this can be changed to QWERTY via the
|
|||
|-------------------------------------------------------------------------| '--------------'
|
||||
| Bckspc|PgDn|Left|Down|Rght| | | | | | | ' | Enter |
|
||||
|-------------------------------------------------------------------------| ,----.
|
||||
| LSPO | Z | X | C | V | | | | , | . | / | RSPC | | Up |
|
||||
| LSPO | <- |%>% | { | [ | ` | | | ] | } | . | / | RSPC | | Up |
|
||||
|-------------------------------------------------------------------------| ,--------------.
|
||||
|Ctrl|LGUI|LAlt| |RAlt|RGUI|Menu|Ctrl| |Left|Down|Rght|
|
||||
'-------------------------------------------------------------------------' '--------------'
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# the appropriate keymap folder that will get included automatically
|
||||
#
|
||||
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
|
||||
MOUSEKEY_ENABLE = no # Mouse keys(+4700)
|
||||
MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
|
||||
EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
|
||||
CONSOLE_ENABLE = yes # Console for debug(+400)
|
||||
COMMAND_ENABLE = yes # Commands for debug and configuration
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue