aboutsummaryrefslogtreecommitdiffstats
path: root/users
diff options
context:
space:
mode:
authorDaniel Shields <1530706+shieldsd@users.noreply.github.com>2019-11-08 18:31:36 +0000
committerJames Young <18669334+noroadsleft@users.noreply.github.com>2019-11-08 10:31:36 -0800
commit6fd88c15565f88ce1e595358ea98ecc1121fa26b (patch)
tree733b9acde694083bbed0b5ae7dc1c01cd3c53db8 /users
parent0483327fa66396879155f3e9c10247ce54dfe18e (diff)
downloadfirmware-6fd88c15565f88ce1e595358ea98ecc1121fa26b.tar.gz
firmware-6fd88c15565f88ce1e595358ea98ecc1121fa26b.tar.bz2
firmware-6fd88c15565f88ce1e595358ea98ecc1121fa26b.zip
[Keymap] Remove dynamic macro customization now it's a core feature. (#7301)
Diffstat (limited to 'users')
-rw-r--r--users/dshields/config.h1
-rw-r--r--users/dshields/dshields.c5
-rw-r--r--users/dshields/dshields.h6
-rw-r--r--users/dshields/rules.mk1
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 @@
#define ONESHOT_TIMEOUT 3000
#define RETRO_TAPPING
#define BACKLIGHT_BREATHING
+#define DYNAMIC_MACRO_NO_NESTING
#define MOUSEKEY_INTERVAL 20
#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 @@
#include "quantum.h"
#include "dshields.h"
-extern bool process_record_dynamic_macro(uint16_t keycode, keyrecord_t *record);
-
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- if (!process_record_dynamic_macro(keycode, record)) {
- return false;
- }
if (keycode == KC_ESC && record->event.pressed) {
bool rc = true;
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 @@
#pragma once
-// dynamic macro keys
-#define DM_PLAY DYN_MACRO_PLAY1
-#define DM_STRT DYN_REC_START1
-#define DM_STOP DYN_REC_STOP
-
// one-shot layer keys
#define OSL_RSE OSL(RSE)
#define OSL_LWR OSL(LWR)
@@ -45,4 +40,3 @@
#endif
enum layers { DEF, LWR, RSE, FUN };
-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
API_SYSEX_ENABLE = no
SPACE_CADET_ENABLE = no
LEADER_ENABLE = no
+DYNAMIC_MACRO_ENABLE = yes
LINK_TIME_OPTIMIZATION_ENABLE = yes