diff --git a/ergodox_ez/asci-keymap.txt b/ergodox_ez/asci-keymap.txt index 22c4c6e..a4b1c6b 100644 --- a/ergodox_ez/asci-keymap.txt +++ b/ergodox_ez/asci-keymap.txt @@ -65,7 +65,7 @@ |--------+-----+-----+-----+-----+-----| | | |-----+-----+-----+-----+-----+--------| | Lshift | Z | X | C | V |Grave| | | | | | | | | | `--------+-----+-----+-----+-----+-----------' `-----------+-----+-----+-----+-----+--------' - |Ctrl | F9 |Pscre| H | R | | | | | | | + |Ctrl | F9 |Pscre| H | R | |OwGr | | | | | `-----------------------------' ,-----------. ,-----------. `-----------------------------' | | | | | | ,-----|-----|-----| |-----+-----+-----. diff --git a/ergodox_ez/keymap.c b/ergodox_ez/keymap.c index b0649ce..5af5c57 100644 --- a/ergodox_ez/keymap.c +++ b/ergodox_ez/keymap.c @@ -89,7 +89,7 @@ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, -_______, _______, _______, _______, _______, +OW_GR, _______, _______, _______, _______, _______, _______, _______, @@ -122,6 +122,7 @@ _______, _______, KC_LGUI ), }; +#define OW_MACRO(str) SEND_STRING(SS_TAP(X_ENTER)(str)SS_TAP(X_ENTER)); // called by QMK during key processing before the actual key event is handled. Useful for macros. bool process_record_user(uint16_t keycode, keyrecord_t *record) { @@ -146,6 +147,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { tap_tog_layer_other_key_pressed = true; // Add flag so layer resets } break; + case OW_GR: + if (record->event.pressed) { + OW_MACRO("gr") + } + break; default: tap_tog_count = 0; // reset counter. tap_tog_layer_other_key_pressed = true; // always set this to true, TAP_TOG_LAYER handlers will handle interpreting this diff --git a/levinson/asci-keymap.txt b/levinson/asci-keymap.txt index b31a97b..770816b 100644 --- a/levinson/asci-keymap.txt +++ b/levinson/asci-keymap.txt @@ -33,13 +33,13 @@ Overwatch ,-----------------------------------. ,-----------------------------------. -| Tab | Q | W | E | R | T | |To(0)| | | | |Clear| +| Tab | Q | W | E | R | T | |To(0)| | | | | | |-----+-----+-----+-----+-----+-----| |-----+-----+-----+-----+-----+-----| -|Ctrl | A | S | D | F | P | |RgbMo|RgbMo|RgbVa|RgbVa| |RgbTo| +|Ctrl | A | S | D | F | P | |OwPu |OwHg |OwSul| | | | |-----+-----+-----+-----+-----+-----| |-----+-----+-----+-----+-----+-----| -|Lshif| Z | X | C | V |Grave| |RgbMo|RgbMo|RgbMo|RgbMo|RgbMo|RgbMo| +|Lshif| Z | X | C | V |Grave| |OwYes|OwNo |OwHlv|OwHlz| | | |-----+-----+-----+-----+-----+-----| |-----+-----+-----+-----+-----+-----| -|Ctrl | F9 |Pscre| H | R | ⎵ | |RgbHu|RgbHu|RgbSa|RgbSa|RgbMo|RgbMo| +|Ctrl | F9 |Pscre| H | R | ⎵ | |OwGr |OwGg |OwLgg|OwWda|OwLw |OwVio| `-----------------------------------' ------------------------------------' Navi diff --git a/levinson/keymap.c b/levinson/keymap.c index 33f2476..85a2b2c 100644 --- a/levinson/keymap.c +++ b/levinson/keymap.c @@ -46,10 +46,10 @@ _______ , ___________________BLANK___________________ , _______ , _______ , ____ // Run `./qmk show levinson` from parent dir to see this layer. [_OVERWATCH] = LAYOUT_ortho_4x12_wrapper( -______________OVERWATCH_L1_________________ , TO(0) , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , CLEAR_EEPROM , -______________OVERWATCH_L2_________________ , RGB_MODE_FORWARD , RGB_MODE_REVERSE , RGB_VAI , RGB_VAD , XXXXXXX , RGB_TOG , -______________OVERWATCH_L3_________________ , RGB_MODE_PLAIN , RGB_MODE_BREATHE , RGB_MODE_RAINBOW , RGB_MODE_SWIRL , RGB_MODE_SNAKE , RGB_MODE_XMAS , -______________OVERWATCH_L4_________________ , KC_SPACE, RGB_HUI , RGB_HUD , RGB_SAI , RGB_SAD , RGB_MODE_RGBTEST , RGB_MODE_GRADIENT +______________OVERWATCH_L1_________________ , TO(0) , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , +______________OVERWATCH_L2_________________ , OW_PU , OW_HG , OW_SULT , XXXXXXX , XXXXXXX , XXXXXXX , +______________OVERWATCH_L3_________________ , OW_YES , OW_NO , OW_HLV , OW_HLZ , XXXXXXX , XXXXXXX , +______________OVERWATCH_L4_________________ , KC_SPACE, OW_GR , OW_GG , OW_LGG , OW_WDA , OW_LW , OW_VIO ), // Note: visualizer expects this closing parens to be right at the start of the line. // Run `./qmk show levinson` from parent dir to see this layer. @@ -62,6 +62,8 @@ XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , APPS , KC_LGUI , MODSFT , }; +#define OW_MACRO(str) SEND_STRING(SS_TAP(X_ENTER)(str)SS_TAP(X_ENTER)); + // called by QMK during key processing before the actual key event is handled. Useful for macros. bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { @@ -91,6 +93,21 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { process_tap_tog(_SYMB,record); return false; break; + case OW_GR: + if (record->event.pressed) { + SEND_STRING(SS_TAP(X_ENTER)"gr"SS_TAP(X_ENTER)); + } + break; + case OW_GG: + if (record->event.pressed) { + SEND_STRING(SS_TAP(X_ENTER)"gr"SS_TAP(X_ENTER)); + } + break; + case OW_LGG: + if (record->event.pressed) { + OW_MACRO("LOL, gg") + } + break; default: tap_tog_count = 0; // reset counter. tap_tog_layer_other_key_pressed = true; // always set this to true, TAP_TOG_LAYER handlers will handle interpreting this diff --git a/user/issmirnov.h b/user/issmirnov.h index 0829783..a1cb3a4 100644 --- a/user/issmirnov.h +++ b/user/issmirnov.h @@ -22,6 +22,20 @@ enum custom_keycodes { CLEAR_EEPROM, WKSP_LEFT, // Smart key that only activates when we are momentarily in a layer WKSP_RIGHT, // Smart key that only activates when we are momentarily in a layer + // Overwatch salt macros. + OW_GR, + OW_GG, + OW_LGG, + OW_WDA, + OW_LW, + OW_VIO, + OW_YES, + OW_NO, + OW_HLV, + OW_HLZ, + OW_PU, + OW_HG, + OW_SULT, };