diff options
| author | Daniel Shields <1530706+shieldsd@users.noreply.github.com> | 2019-11-08 18:31:36 +0000 |
|---|---|---|
| committer | James Young <18669334+noroadsleft@users.noreply.github.com> | 2019-11-08 10:31:36 -0800 |
| commit | 6fd88c15565f88ce1e595358ea98ecc1121fa26b (patch) | |
| tree | 733b9acde694083bbed0b5ae7dc1c01cd3c53db8 /users/dshields | |
| parent | 0483327fa66396879155f3e9c10247ce54dfe18e (diff) | |
| download | qmk_firmware-6fd88c15565f88ce1e595358ea98ecc1121fa26b.tar.gz qmk_firmware-6fd88c15565f88ce1e595358ea98ecc1121fa26b.zip | |
[Keymap] Remove dynamic macro customization now it's a core feature. (#7301)
Diffstat (limited to 'users/dshields')
| -rw-r--r-- | users/dshields/config.h | 1 | ||||
| -rw-r--r-- | users/dshields/dshields.c | 5 | ||||
| -rw-r--r-- | users/dshields/dshields.h | 6 | ||||
| -rw-r--r-- | users/dshields/rules.mk | 1 |
4 files changed, 2 insertions, 11 deletions
diff --git a/users/dshields/config.h b/users/dshields/config.h index d92f787e4..aa1081476 100644 --- a/users/dshields/config.h +++ b/users/dshields/config.h | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | #define ONESHOT_TIMEOUT 3000 | 6 | #define ONESHOT_TIMEOUT 3000 |
| 7 | #define RETRO_TAPPING | 7 | #define RETRO_TAPPING |
| 8 | #define BACKLIGHT_BREATHING | 8 | #define BACKLIGHT_BREATHING |
| 9 | #define DYNAMIC_MACRO_NO_NESTING | ||
| 9 | 10 | ||
| 10 | #define MOUSEKEY_INTERVAL 20 | 11 | #define MOUSEKEY_INTERVAL 20 |
| 11 | #define MOUSEKEY_DELAY 0 | 12 | #define MOUSEKEY_DELAY 0 |
diff --git a/users/dshields/dshields.c b/users/dshields/dshields.c index bc88cae56..8f432a317 100644 --- a/users/dshields/dshields.c +++ b/users/dshields/dshields.c | |||
| @@ -1,12 +1,7 @@ | |||
| 1 | #include "quantum.h" | 1 | #include "quantum.h" |
| 2 | #include "dshields.h" | 2 | #include "dshields.h" |
| 3 | 3 | ||
| 4 | extern bool process_record_dynamic_macro(uint16_t keycode, keyrecord_t *record); | ||
| 5 | |||
| 6 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { | 4 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
| 7 | if (!process_record_dynamic_macro(keycode, record)) { | ||
| 8 | return false; | ||
| 9 | } | ||
| 10 | if (keycode == KC_ESC && record->event.pressed) { | 5 | if (keycode == KC_ESC && record->event.pressed) { |
| 11 | bool rc = true; | 6 | bool rc = true; |
| 12 | uint8_t mods = 0; | 7 | uint8_t mods = 0; |
diff --git a/users/dshields/dshields.h b/users/dshields/dshields.h index d8f76e8c0..e1aa07a5d 100644 --- a/users/dshields/dshields.h +++ b/users/dshields/dshields.h | |||
| @@ -1,10 +1,5 @@ | |||
| 1 | #pragma once | 1 | #pragma once |
| 2 | 2 | ||
| 3 | // dynamic macro keys | ||
| 4 | #define DM_PLAY DYN_MACRO_PLAY1 | ||
| 5 | #define DM_STRT DYN_REC_START1 | ||
| 6 | #define DM_STOP DYN_REC_STOP | ||
| 7 | |||
| 8 | // one-shot layer keys | 3 | // one-shot layer keys |
| 9 | #define OSL_RSE OSL(RSE) | 4 | #define OSL_RSE OSL(RSE) |
| 10 | #define OSL_LWR OSL(LWR) | 5 | #define OSL_LWR OSL(LWR) |
| @@ -45,4 +40,3 @@ | |||
| 45 | #endif | 40 | #endif |
| 46 | 41 | ||
| 47 | enum layers { DEF, LWR, RSE, FUN }; | 42 | enum layers { DEF, LWR, RSE, FUN }; |
| 48 | enum keycodes { DYNAMIC_MACRO_RANGE = SAFE_RANGE }; | ||
diff --git a/users/dshields/rules.mk b/users/dshields/rules.mk index 8a7c82cd4..abfbe5e40 100644 --- a/users/dshields/rules.mk +++ b/users/dshields/rules.mk | |||
| @@ -8,6 +8,7 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | |||
| 8 | API_SYSEX_ENABLE = no | 8 | API_SYSEX_ENABLE = no |
| 9 | SPACE_CADET_ENABLE = no | 9 | SPACE_CADET_ENABLE = no |
| 10 | LEADER_ENABLE = no | 10 | LEADER_ENABLE = no |
| 11 | DYNAMIC_MACRO_ENABLE = yes | ||
| 11 | 12 | ||
| 12 | LINK_TIME_OPTIMIZATION_ENABLE = yes | 13 | LINK_TIME_OPTIMIZATION_ENABLE = yes |
| 13 | 14 | ||
