summary refs log tree commit diff
path: root/layouts
diff options
context:
space:
mode:
Diffstat (limited to 'layouts')
-rw-r--r--layouts/community/ergodox/colemak_code_friendly/keymap.c26
-rw-r--r--layouts/community/ergodox/qwerty_code_friendly/keymap.c16
-rw-r--r--layouts/community/ortho_4x12/ajp10304/keymap.c6
3 files changed, 24 insertions, 24 deletions
diff --git a/layouts/community/ergodox/colemak_code_friendly/keymap.c b/layouts/community/ergodox/colemak_code_friendly/keymap.c
index 1d537b331f..ae5bdcc5b8 100644
--- a/layouts/community/ergodox/colemak_code_friendly/keymap.c
+++ b/layouts/community/ergodox/colemak_code_friendly/keymap.c
@@ -103,17 +103,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_MUTE, KC_VOLD,    KC_VOLU, KC_TRNS,  KC_TRNS,
 
                                                        KC_TRNS,   KC_TRNS,
-                                                           DYN_REC_START1,
-                                        KC_TRNS, KC_TRNS, DYN_MACRO_PLAY1,
+                                                           DM_REC1,
+                                        KC_TRNS, KC_TRNS, DM_PLY1,
   /* right hand */
   KC_TRNS, KC_TRNS,    KC_ASTR, KC_LPRN,  KC_RPRN,  KC_MINS,  KC_TRNS,
   KC_EQL,  M_LAMBDA,   KC_7,    KC_8,     KC_9,     KC_PLUS,  KC_TRNS,
            M_POINER,   KC_4,    KC_5,     KC_6,     KC_0,     KC_TRNS,
   KC_ENT,  M_NOT_EQL,  KC_1,    KC_2,     KC_3,     KC_TRNS,  KC_TRNS,
                        KC_0,    KC_COMM,  KC_DOT,   KC_TRNS,  KC_TRNS,
-  KC_TRNS, DYN_REC_STOP,
-  DYN_REC_START2,
-  DYN_MACRO_PLAY2, KC_TRNS, KC_TRNS
+  KC_TRNS, DM_RSTP,
+  DM_REC2,
+  DM_PLY2, KC_TRNS, KC_TRNS
 ),
 /* Keymap 2: Left side -> LAYER_NUM,                             Right side -> Shift + LAYER_BASE
  *
@@ -145,8 +145,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_MUTE, KC_VOLD,    KC_VOLU, KC_TRNS,  KC_TRNS,
 
                                                        KC_TRNS,   KC_TRNS,
-                                                           DYN_REC_START1,
-                                        KC_TRNS, KC_TRNS, DYN_MACRO_PLAY1,
+                                                           DM_REC1,
+                                        KC_TRNS, KC_TRNS, DM_PLY1,
   /* right hand */
   TG(1),          KC_AMPR,       KC_ASTR,       KC_LPRN,    KC_RPRN,    S(KC_MINS),  S(KC_BSPC),
   KC_UNDS,        S(KC_J),       S(KC_L),       S(KC_U),    S(KC_Y),    S(KC_SCLN),  S(KC_BSLS),
@@ -195,9 +195,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            M_POINER,    KC_4,    KC_5,     KC_6,     KC_0,     KC_TRNS,
   KC_ENT,  M_NOT_EQL,   KC_1,    KC_2,     KC_3,     KC_TRNS,  KC_TRNS,
                         KC_0,    KC_COMM,  KC_DOT,   KC_TRNS,  KC_TRNS,
-  KC_TRNS, DYN_REC_STOP,
-  DYN_REC_START2,
-  DYN_MACRO_PLAY2, KC_TRNS, KC_TRNS
+  KC_TRNS, DM_RSTP,
+  DM_REC2,
+  DM_PLY2, KC_TRNS, KC_TRNS
 ),
 };
 
@@ -206,13 +206,13 @@ static bool recording_dynamic_macro;
 static bool process_record_dynamic_macro_wrapper(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
     /* detect dynamic macro recording state */
-    case DYN_REC_START1:
-    case DYN_REC_START2:
+    case QK_DYNAMIC_MACRO_RECORD_START_1:
+    case QK_DYNAMIC_MACRO_RECORD_START_2:
       if (record->event.pressed) {
         recording_dynamic_macro = true;
       }
       break;
-    case DYN_REC_STOP:
+    case QK_DYNAMIC_MACRO_RECORD_STOP:
       if (record->event.pressed) {
         recording_dynamic_macro = false;
       }
diff --git a/layouts/community/ergodox/qwerty_code_friendly/keymap.c b/layouts/community/ergodox/qwerty_code_friendly/keymap.c
index 19c00e1b03..b07bc42aca 100644
--- a/layouts/community/ergodox/qwerty_code_friendly/keymap.c
+++ b/layouts/community/ergodox/qwerty_code_friendly/keymap.c
@@ -282,11 +282,11 @@ enum custom_keycodes {
 #  include "dynamic_macro.h"
 #else
    /* avoid ifdef's in keymap */
-#  define DYN_REC_START1 KC_TRNS
-#  define DYN_REC_START2 KC_TRNS
-#  define DYN_MACRO_PLAY1 KC_TRNS
-#  define DYN_MACRO_PLAY2 KC_TRNS
-#  define DYN_REC_STOP KC_TRNS
+#  define DM_REC1 KC_TRNS
+#  define DM_REC2 KC_TRNS
+#  define DM_PLY1 KC_TRNS
+#  define DM_PLY2 KC_TRNS
+#  define DM_RSTP KC_TRNS
 #endif
 
 #ifdef CFQ_USE_MOMENTARY_LAYER_KEYS
@@ -391,9 +391,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, M_ARROW_RMINUS,
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, M_BRACKET_IN_ANG, M_BRACKET_IN_BRC,
   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                                               DYN_REC_START1,   DYN_REC_START2,
-                              K80(L1K0),       K80(L1K1),        DYN_MACRO_PLAY1,
-                              DYN_REC_STOP,    KC_TRNS,          DYN_MACRO_PLAY2,
+                                               DM_REC1,          DM_REC2,
+                              K80(L1K0),       K80(L1K1),        DM_PLY1,
+                              DM_RSTP,         KC_TRNS,          DM_PLY2,
   /* right hand */
   M_BRACKET_OUT_CBR, KC_TRNS,           KC_NUM,  KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS,  KC_TRNS,
   M_BRACKET_OUT_PRN, M_ARROW_LEQL,      KC_KP_7, KC_KP_8,     KC_KP_9,        KC_KP_PLUS,  KC_TRNS,
diff --git a/layouts/community/ortho_4x12/ajp10304/keymap.c b/layouts/community/ortho_4x12/ajp10304/keymap.c
index d1c3d08e91..9e9096c33e 100644
--- a/layouts/community/ortho_4x12/ajp10304/keymap.c
+++ b/layouts/community/ortho_4x12/ajp10304/keymap.c
@@ -121,9 +121,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `------------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_4x12(
-  M_CUSTOM, QK_BOOT, QWERTY,  BL_ON,   BL_OFF,  DYN_REC_START1,  DYN_REC_START2,  _______,             _______,           _______,              _______,  KC_DEL  ,
-  KC_CAPS,  RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, KC_AUDIO_MUTE,       KC_AUDIO_VOL_UP,   KC_MEDIA_PLAY_PAUSE,  _______,  QWERTY  ,
-  TG(_MAC), RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, DYN_REC_STOP,    DYN_REC_STOP,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK,  _______,  COLEMAK ,
+  M_CUSTOM, QK_BOOT, QWERTY,  BL_ON,   BL_OFF,  DM_REC1,         DM_REC2,         _______,             _______,           _______,              _______,  KC_DEL  ,
+  KC_CAPS,  RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, DM_PLY1,         DM_PLY2,         KC_AUDIO_MUTE,       KC_AUDIO_VOL_UP,   KC_MEDIA_PLAY_PAUSE,  _______,  QWERTY  ,
+  TG(_MAC), RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, DM_RSTP,         DM_RSTP,         KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK,  _______,  COLEMAK ,
   _______,  _______, _______, _______, _______, _______,         _______,         _______,             _______,           _______,              _______,  _______
 ),