Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP: Overwatch macros #4

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

WIP: Overwatch macros #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
750b039
WIP: Overwatch macros
issmirnov Oct 3, 2019
b64dfc9
Foundations for salt macros.
issmirnov Oct 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ergodox_ez/asci-keymap.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
|--------+-----+-----+-----+-----+-----| | | |-----+-----+-----+-----+-----+--------|
| Lshift | Z | X | C | V |Grave| | | | | | | | | |
`--------+-----+-----+-----+-----+-----------' `-----------+-----+-----+-----+-----+--------'
|Ctrl | F9 |Pscre| H | R | | | | | | |
|Ctrl | F9 |Pscre| H | R | |OwGr | | | | |
`-----------------------------' ,-----------. ,-----------. `-----------------------------'
| | | | | |
,-----|-----|-----| |-----+-----+-----.
Expand Down
8 changes: 7 additions & 1 deletion ergodox_ez/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______,
OW_GR, _______, _______, _______, _______,

_______, _______,
_______,
Expand Down Expand Up @@ -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) {
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions levinson/asci-keymap.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
25 changes: 21 additions & 4 deletions levinson/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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) {
Expand Down Expand Up @@ -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
Expand Down
14 changes: 14 additions & 0 deletions user/issmirnov.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};


Expand Down