diff options
| author | Drashna Jaelre <drashna@live.com> | 2019-07-22 20:22:33 -0700 |
|---|---|---|
| committer | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2019-07-22 20:22:33 -0700 |
| commit | d41961c9eddb78591d3b55ea65e6e0baff4bdd69 (patch) | |
| tree | a2e03c31b93dc35fbdb539c59de0d2f7c655f02f /users/drashna/wrappers.h | |
| parent | 840b9090a0fd4faf070d9bbb9039337ecdb82de4 (diff) | |
| download | qmk_firmware-d41961c9eddb78591d3b55ea65e6e0baff4bdd69.tar.gz qmk_firmware-d41961c9eddb78591d3b55ea65e6e0baff4bdd69.zip | |
[Keymap] Drashna's Feature madness (#6128)
* Fix my Tap Dance issues after I broke them
* Cleanup and organization of userspace documentation
As well as some additional cleanup of functions due to review of documentation.
* Enable Tapdance on Glow and remove more animations
* Revert to Eager PR debouncing
* Add better check for startup animation
* Move where RGB Matrix defines are listed
* Limit RGB Matrix max val
* Update keyboard for Iris Rev 3 conflicts
* Enable encoder support on planck ez
* Remove is_master check from corne\'s OLED code
* Overhaul OLED screens for my Corne
* One last removal
* Show RGB valu On both sides
* Updates for OLED display info
* Fix compile issues for rgb config
* Disabled Space Cadet for all drashna keymaps
* Fix OLED Screen configs
* Minor OLED Tweaks
* Revert some Iris changes
* Fix song include
* Handle MAKE macro for the Corne boards better
* Add super hacky-hack for eeconfig initialization
* Add audio support for Fractal since Elite Cs support it
* Add defines for keycode steps
* Add White layout
* Update Corne RGB info
* Add fun effects to layer indication for RGB Matrix enabled boards
* Use proper define for product name detection
* Update formatting
* Use custom timeout mechanism for OLED timeout
* Fix up OLED screen HSV code for new HSV structure
* Better handle turning off RGB Matrix when sleeping
* Disable MultiSplash Animation
* Change Iris back to using serial
* Why was RGB disabled?!?!?!
* Limit val in rgb_matrix_layer_helper function
* Remove EECONFIG setting for RGB matrix
Diffstat (limited to 'users/drashna/wrappers.h')
| -rw-r--r-- | users/drashna/wrappers.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/users/drashna/wrappers.h b/users/drashna/wrappers.h index 93f842f4b..a87247071 100644 --- a/users/drashna/wrappers.h +++ b/users/drashna/wrappers.h | |||
| @@ -6,9 +6,10 @@ arguments, we need a wrapper in order for these definitions to be | |||
| 6 | expanded before being used as arguments to the LAYOUT_xxx macro. | 6 | expanded before being used as arguments to the LAYOUT_xxx macro. |
| 7 | */ | 7 | */ |
| 8 | #if (!defined(LAYOUT) && defined(KEYMAP)) | 8 | #if (!defined(LAYOUT) && defined(KEYMAP)) |
| 9 | # define LAYOUT KEYMAP | 9 | # define LAYOUT KEYMAP |
| 10 | #endif | 10 | #endif |
| 11 | 11 | ||
| 12 | // clang-format off | ||
| 12 | #define LAYOUT_ergodox_wrapper(...) LAYOUT_ergodox(__VA_ARGS__) | 13 | #define LAYOUT_ergodox_wrapper(...) LAYOUT_ergodox(__VA_ARGS__) |
| 13 | #define LAYOUT_ergodox_pretty_wrapper(...) LAYOUT_ergodox_pretty(__VA_ARGS__) | 14 | #define LAYOUT_ergodox_pretty_wrapper(...) LAYOUT_ergodox_pretty(__VA_ARGS__) |
| 14 | #define KEYMAP_wrapper(...) LAYOUT(__VA_ARGS__) | 15 | #define KEYMAP_wrapper(...) LAYOUT(__VA_ARGS__) |
| @@ -135,6 +136,15 @@ NOTE: These are all the same length. If you do a search/replace | |||
| 135 | #define _____________CARPLAX_QGMLWY_R3_____________ KC_K, KC_P, KC_COMM, KC_DOT, KC_SLSH | 136 | #define _____________CARPLAX_QGMLWY_R3_____________ KC_K, KC_P, KC_COMM, KC_DOT, KC_SLSH |
| 136 | 137 | ||
| 137 | 138 | ||
| 139 | #define _________________WHITE_R1__________________ KC_V, KC_Y, KC_D, KC_COMM, KC_QUOT | ||
| 140 | #define _________________WHITE_R2__________________ KC_A, KC_T, KC_H, KC_E, KC_B | ||
| 141 | #define _________________WHITE_R3__________________ KC_P, KC_K, KC_G, KC_W, KC_Q | ||
| 142 | |||
| 143 | #define _________________WHITE_L1__________________ KC_INT1, KC_J, KC_M, KC_L, KC_U | ||
| 144 | #define _________________WHITE_L2__________________ KC_MINS, KC_C, KC_S, KC_N, KC_O // KC_I | ||
| 145 | #define _________________WHITE_L3__________________ KC_X, KC_R, KC_F, KC_DOT, KC_Z | ||
| 146 | |||
| 147 | |||
| 138 | #define ________________NUMBER_LEFT________________ KC_1, KC_2, KC_3, KC_4, KC_5 | 148 | #define ________________NUMBER_LEFT________________ KC_1, KC_2, KC_3, KC_4, KC_5 |
| 139 | #define ________________NUMBER_RIGHT_______________ KC_6, KC_7, KC_8, KC_9, KC_0 | 149 | #define ________________NUMBER_RIGHT_______________ KC_6, KC_7, KC_8, KC_9, KC_0 |
| 140 | #define _________________FUNC_LEFT_________________ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5 | 150 | #define _________________FUNC_LEFT_________________ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5 |
| @@ -170,3 +180,5 @@ NOTE: These are all the same length. If you do a search/replace | |||
| 170 | #define _________________ADJUST_R1_________________ KC_SEC1, KC_SEC2, KC_SEC3, KC_SEC4, KC_SEC5 | 180 | #define _________________ADJUST_R1_________________ KC_SEC1, KC_SEC2, KC_SEC3, KC_SEC4, KC_SEC5 |
| 171 | #define _________________ADJUST_R2_________________ AG_SWAP, QWERTY, COLEMAK, DVORAK, WORKMAN | 181 | #define _________________ADJUST_R2_________________ AG_SWAP, QWERTY, COLEMAK, DVORAK, WORKMAN |
| 172 | #define _________________ADJUST_R3_________________ MG_NKRO, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT | 182 | #define _________________ADJUST_R3_________________ MG_NKRO, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT |
| 183 | |||
| 184 | // clang-format on | ||
