diff options
| author | Daniel RodrÃguez Rivero <rdanielo@gmail.com> | 2020-03-12 03:50:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-12 02:50:19 +0000 |
| commit | 32d03eef902a1ac9cec53804dcb72ace5c585960 (patch) | |
| tree | 579d91a2063fd5f6e64c1fc0de7ab5a0b7d34e0b /keyboards/ergodox_ez | |
| parent | f2f2afe13ba3ae1da8a546ad85eb9e69ddc70a8a (diff) | |
| download | qmk_firmware-32d03eef902a1ac9cec53804dcb72ace5c585960.tar.gz qmk_firmware-32d03eef902a1ac9cec53804dcb72ace5c585960.zip | |
Danielo515/redox (#8232)
* feat(build): added script for compiling with docker easily
* chore: bring my own build with docker to master
* chore: delete a file that does not make sense anymore
* feat: first redox for danielo
* chore: basic compatibility between redox and my space
* refactor: removed some old stuff
* feat: added go coding symbols
* feat: name control_k and alt_j
* chore: reduce combo term
* feat: improved first layer of redox
* feat: add configurations to the redox
* feat: make alt tab more portable
* feat: small improvements to redox layout
* feat: added leader
* refactor: move leader defs to my userspace config
* chore: movement modified
* feat: more predefined keys and a a new combo
* feat: redox alt tab functionality
* refactor: move alt_tab processing to a separate file
* refactor: early return
* refactor: move process record to a separate file
* format leader function
* chore: backspace on digits layer
* feat: add extra combo
* feat: added more combos
* implement guard proposed by @drashna
Co-Authored-By: Drashna Jaelre <drashna@live.com>
* chore: include @drashna placeholder suggestion
Co-Authored-By: Drashna Jaelre <drashna@live.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Diffstat (limited to 'keyboards/ergodox_ez')
| -rw-r--r-- | keyboards/ergodox_ez/keymaps/danielo515/config.h | 4 | ||||
| -rw-r--r-- | keyboards/ergodox_ez/keymaps/danielo515/keymap.c | 16 |
2 files changed, 12 insertions, 8 deletions
diff --git a/keyboards/ergodox_ez/keymaps/danielo515/config.h b/keyboards/ergodox_ez/keymaps/danielo515/config.h index 6a3d37f1c..8982e7653 100644 --- a/keyboards/ergodox_ez/keymaps/danielo515/config.h +++ b/keyboards/ergodox_ez/keymaps/danielo515/config.h | |||
| @@ -16,10 +16,6 @@ | |||
| 16 | 16 | ||
| 17 | #undef MOUSEKEY_WHEEL_TIME_TO_MAX | 17 | #undef MOUSEKEY_WHEEL_TIME_TO_MAX |
| 18 | #define MOUSEKEY_WHEEL_TIME_TO_MAX 60 | 18 | #define MOUSEKEY_WHEEL_TIME_TO_MAX 60 |
| 19 | // Timeout settings for leader key | ||
| 20 | #undef LEADER_TIMEOUT | ||
| 21 | #define LEADER_TIMEOUT 350 | ||
| 22 | #define LEADER_PER_KEY_TIMING | ||
| 23 | 19 | ||
| 24 | #undef DEBOUNCE | 20 | #undef DEBOUNCE |
| 25 | #define DEBOUNCE 45 | 21 | #define DEBOUNCE 45 |
diff --git a/keyboards/ergodox_ez/keymaps/danielo515/keymap.c b/keyboards/ergodox_ez/keymaps/danielo515/keymap.c index 538eab016..ee8c32135 100644 --- a/keyboards/ergodox_ez/keymaps/danielo515/keymap.c +++ b/keyboards/ergodox_ez/keymaps/danielo515/keymap.c | |||
| @@ -36,9 +36,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 36 | OSM(MOD_LSFT) ,LT(2,KC_BSPACE) ,OSM(MOD_LGUI) , | 36 | OSM(MOD_LSFT) ,LT(2,KC_BSPACE) ,OSM(MOD_LGUI) , |
| 37 | 37 | ||
| 38 | 38 | ||
| 39 | TO(1) ,KC_6 ,KC_7 ,KC_8 ,TD_F9 ,LT(3,KC_0) ,KC_DQUO , | 39 | TO(1) ,KC_6 ,KC_7 ,KC_8 ,KC_9 ,LT(3,KC_0) ,KC_DQUO , |
| 40 | KC_UNDS ,KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,RSFT_T(KC_MINUS) , | 40 | KC_UNDS ,KC_Y ,KC_U ,KC_I ,KC_O ,KC_P ,RSFT_T(KC_MINUS) , |
| 41 | HYPR_T(KC_H) ,ALT_T(KC_J) ,RCTL_T(KC_K) ,LT(6,KC_L) ,TD_CLN ,GUI_T(KC_QUOTE) , | 41 | HYPR_H ,ALT_J ,CTL_K ,LT(6,KC_L) ,TD_CLN ,CMD_QUOT , |
| 42 | ALT_TAB ,KC_N ,MEH_T(KC_M) ,KC_COMMA ,KC_DOT ,KC_SLASH ,LT(4,KC_KP_ASTERISK), | 42 | ALT_TAB ,KC_N ,MEH_T(KC_M) ,KC_COMMA ,KC_DOT ,KC_SLASH ,LT(4,KC_KP_ASTERISK), |
| 43 | LT(4,KC_ENTER) ,KC_DOWN ,KC_LBRACKET ,KC_RBRACKET ,OSL(2) , | 43 | LT(4,KC_ENTER) ,KC_DOWN ,KC_LBRACKET ,KC_RBRACKET ,OSL(2) , |
| 44 | KC_AUDIO_MUTE ,KC_ESCAPE , | 44 | KC_AUDIO_MUTE ,KC_ESCAPE , |
| @@ -88,14 +88,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 88 | KC_TRANSPARENT ,KC_TRANSPARENT ,KC_TRANSPARENT ,KC_LABK ,KC_RABK ,KC_TRANSPARENT ,KC_TRANSPARENT , | 88 | KC_TRANSPARENT ,KC_TRANSPARENT ,KC_TRANSPARENT ,KC_LABK ,KC_RABK ,KC_TRANSPARENT ,KC_TRANSPARENT , |
| 89 | KC_TRANSPARENT ,KC_AT ,KC_TRANSPARENT ,KC_EQL ,F_ARROW ,KC_GRAVE , | 89 | KC_TRANSPARENT ,KC_AT ,KC_TRANSPARENT ,KC_EQL ,F_ARROW ,KC_GRAVE , |
| 90 | KC_TRANSPARENT ,KC_TRANSPARENT ,KC_TRANSPARENT ,KC_LBRACKET ,KC_RBRACKET ,KC_TRANSPARENT ,KC_TRANSPARENT , | 90 | KC_TRANSPARENT ,KC_TRANSPARENT ,KC_TRANSPARENT ,KC_LBRACKET ,KC_RBRACKET ,KC_TRANSPARENT ,KC_TRANSPARENT , |
| 91 | KC_TRANSPARENT ,KC_TRANSPARENT ,KC_TRANSPARENT ,KC_TRANSPARENT ,KC_TRANSPARENT , | 91 | KC_TRANSPARENT ,KC_TRANSPARENT ,KC_TRANSPARENT ,IARROW ,ARROW , |
| 92 | KC_TRANSPARENT ,KC_TRANSPARENT , | 92 | KC_TRANSPARENT ,KC_TRANSPARENT , |
| 93 | KC_TRANSPARENT , | 93 | KC_TRANSPARENT , |
| 94 | // Right hand | 94 | // Right hand |
| 95 | KC_TRANSPARENT ,KC_TRANSPARENT ,KC_TRANSPARENT , | 95 | KC_TRANSPARENT ,KC_TRANSPARENT ,KC_TRANSPARENT , |
| 96 | KC_TRANSPARENT ,KC_TRANSPARENT ,KC_TRANSPARENT ,KC_TRANSPARENT ,KC_TRANSPARENT ,KC_TRANSPARENT ,KC_TRANSPARENT , | 96 | KC_TRANSPARENT ,KC_TRANSPARENT ,KC_TRANSPARENT ,KC_TRANSPARENT ,KC_TRANSPARENT ,KC_TRANSPARENT ,KC_TRANSPARENT , |
| 97 | LALT(LSFT(KC_UP)) ,KC_HASH ,KC_LCBR ,KC_RCBR ,KC_KP_ASTERISK ,KC_PERC ,KC_DLR , | 97 | LALT(LSFT(KC_UP)) ,KC_HASH ,KC_LCBR ,KC_RCBR ,KC_KP_ASTERISK ,KC_PERC ,KC_DLR , |
| 98 | KC_AMPR ,KC_LPRN ,KC_RPRN ,KC_CIRC ,KC_KP_PLUS ,KC_PIPE , | 98 | KC_AMPR ,KC_LPRN ,KC_RPRN ,CLN_EQ ,KC_KP_PLUS ,KC_PIPE , |
| 99 | LALT(LSFT(KC_DOWN)),KC_EXLM ,KC_TILD ,KC_CIRC ,ARROW ,KC_BSLASH ,KC_BSLASH , | 99 | LALT(LSFT(KC_DOWN)),KC_EXLM ,KC_TILD ,KC_CIRC ,ARROW ,KC_BSLASH ,KC_BSLASH , |
| 100 | KC_TRANSPARENT ,KC_TRANSPARENT ,KC_TRANSPARENT ,KC_TRANSPARENT ,KC_TRANSPARENT , | 100 | KC_TRANSPARENT ,KC_TRANSPARENT ,KC_TRANSPARENT ,KC_TRANSPARENT ,KC_TRANSPARENT , |
| 101 | RESET ,KC_TRANSPARENT , | 101 | RESET ,KC_TRANSPARENT , |
| @@ -316,3 +316,11 @@ void oneshot_mods_changed_user(uint8_t mods) { | |||
| 316 | void oneshot_locked_mods_changed_user(uint8_t mods) { | 316 | void oneshot_locked_mods_changed_user(uint8_t mods) { |
| 317 | oneshot_mods_changed_user(mods); | 317 | oneshot_mods_changed_user(mods); |
| 318 | } | 318 | } |
| 319 | |||
| 320 | //=============== alt_tab callbacks | ||
| 321 | void alt_tab_activated(void){ | ||
| 322 | layer_on(7); // activate motion layer | ||
| 323 | } | ||
| 324 | void alt_tab_deactivated(void){ | ||
| 325 | layer_off(7); // activate motion layer | ||
| 326 | } | ||
