Normalise Dynamic Macro keycodes (#18939)
* `DYN_REC_START1` -> `QK_DYNAMIC_MACRO_RECORD_START_1` * `DYN_REC_START2` -> `QK_DYNAMIC_MACRO_RECORD_START_2` * `DYN_MACRO_PLAY1` -> `QK_DYNAMIC_MACRO_PLAY_1` * `DYN_MACRO_PLAY2` -> `QK_DYNAMIC_MACRO_PLAY_2` * `DYN_REC_STOP` -> `QK_DYNAMIC_MACRO_RECORD_STOP` * Update docs
This commit is contained in:
		
							parent
							
								
									3de296f420
								
							
						
					
					
						commit
						fe18df9d41
					
				
					 44 changed files with 216 additions and 210 deletions
				
			
		| 
						 | 
				
			
			@ -201,13 +201,13 @@ void macro_tapdance_fn(qk_tap_dance_state_t *state, void *user_data) {
 | 
			
		|||
  keyrecord_t record;
 | 
			
		||||
  dprintf("macro_tap_dance_fn %d\n", state->count);
 | 
			
		||||
  if (is_macro1_recording) {
 | 
			
		||||
    keycode = DYN_REC_STOP;
 | 
			
		||||
    keycode = DM_RSTP;
 | 
			
		||||
    is_macro1_recording = false;
 | 
			
		||||
    layer_state_set_user(current_layer_state);
 | 
			
		||||
  } else if (state->count == 1) {
 | 
			
		||||
    keycode = DYN_MACRO_PLAY1;
 | 
			
		||||
    keycode = DM_PLY1;
 | 
			
		||||
  } else {
 | 
			
		||||
    keycode = DYN_REC_START1;
 | 
			
		||||
    keycode = DM_REC1;
 | 
			
		||||
    is_macro1_recording = true;
 | 
			
		||||
    layer_state_set_user(current_layer_state);
 | 
			
		||||
  }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -109,13 +109,13 @@ void macro_tapdance_fn(qk_tap_dance_state_t *state, void *user_data) {
 | 
			
		|||
  keyrecord_t record;
 | 
			
		||||
  dprintf("macro_tap_dance_fn %d\n", state->count);
 | 
			
		||||
  if (is_macro1_recording) {
 | 
			
		||||
    keycode = DYN_REC_STOP;
 | 
			
		||||
    keycode = DM_RSTP;
 | 
			
		||||
    is_macro1_recording = false;
 | 
			
		||||
    layer_state_set_user(current_layer_state);
 | 
			
		||||
  } else if (state->count == 1) {
 | 
			
		||||
    keycode = DYN_MACRO_PLAY1;
 | 
			
		||||
    keycode = DM_PLY1;
 | 
			
		||||
  } else {
 | 
			
		||||
    keycode = DYN_REC_START1;
 | 
			
		||||
    keycode = DM_REC1;
 | 
			
		||||
    is_macro1_recording = true;
 | 
			
		||||
    layer_state_set_user(current_layer_state);
 | 
			
		||||
  }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -7,13 +7,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
         //------------------------+-------------------------+-------------------------+-------------------------+-------------------------+-------------------------+------------------------//
 | 
			
		||||
        //  ESCAPE                 |                         |                         |                         |                         |                         |     START RECORDING     //
 | 
			
		||||
        //                         |                         |                         |                         |                         |                         |                         //
 | 
			
		||||
                   KC_ESC,                 TD(GRV_TILD),             TD(AT_DLR),              TD(LCBR_LABK),            TD(LPRN_LBRC),            TD(EXLM_QUES),           DYN_REC_START1,     //
 | 
			
		||||
                   KC_ESC,                 TD(GRV_TILD),             TD(AT_DLR),              TD(LCBR_LABK),            TD(LPRN_LBRC),            TD(EXLM_QUES),           DM_REC1,            //
 | 
			
		||||
        //                         |                       ~ |                       $ |                       < |                       [ |                       ? |                         //
 | 
			
		||||
        //                         |            TAP DANCE: ` |            TAP DANCE: @              TAP DANCE: { |            TAP DANCE: ( |            TAP DANCE: ! |     DYNAMIC MARCO 1     //
 | 
			
		||||
         //------------------------+-------------------------+-------------------------+-------------------------+-------------------------+-------------------------+------------------------//
 | 
			
		||||
        //  TAB                    |      MOD TAP: ALT+SHIFT |       MOD TAP: CTRL+ALT |     MOD TAP: CTRL+SHIFT | P                       | Y                       |                         //
 | 
			
		||||
        //                         |                         |                         |                         |                         |                         |                         //
 | 
			
		||||
                   KC_TAB,                TD(NONE_LEAD),            TD(QUOT_DQUO),           TD(DOT_COMM),               LCG_T(KC_P),              LAG_T(KC_Y),            DYN_MACRO_PLAY1,    //
 | 
			
		||||
                   KC_TAB,                TD(NONE_LEAD),            TD(QUOT_DQUO),           TD(DOT_COMM),               LCG_T(KC_P),              LAG_T(KC_Y),            DM_PLY1,            //
 | 
			
		||||
        //                         |                    LEAD |                       " |                       , |                         |                         |                         //
 | 
			
		||||
        //                         |         TAP DANCE: NONE |            TAP DANCE: ' |            TAP DANCE: . |       MOD TAP: CTRL+GUI |        MOD TAP: ALT+GUI |                         //
 | 
			
		||||
         //------------------------+-------------------------+-------------------------+-------------------------+-------------------------+-------------------------|   PLAY DYNAMIC MACRO 1  //
 | 
			
		||||
| 
						 | 
				
			
			@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
         //------------------------+-------------------------+-------------------------+-------------------------+-------------------------+-------------------------|  META                   //
 | 
			
		||||
        //          STOP RECORDING |  MOD TAP: GUI+SHIFT+ALT | Q                       | J                       | K                       | X                       |                         //
 | 
			
		||||
        //                         |                         |                         |                         |                         |                         |                         //
 | 
			
		||||
                DYN_REC_STOP,             TD(SCLN_COLN),            LCAG_T(KC_Q),             TD(J_MED_MEH),            TD(K_NUM_HYP),            LCSG_T(KC_X),                KC_LGUI,        //
 | 
			
		||||
                DM_RSTP,                  TD(SCLN_COLN),            LCAG_T(KC_Q),             TD(J_MED_MEH),            TD(K_NUM_HYP),            LCSG_T(KC_X),                KC_LGUI,        //
 | 
			
		||||
        //                         |                       : |                         |                         |                         |                         |                         //
 | 
			
		||||
        //           DYNAMIC MACRO |            TAP DANCE: ; |      MOD TAP: SHIFT+GUI |  M TAP DANCE: MEDIA/MEH |  M TAP DANCE: ATM/HYPER |  MOD TAP: CTL+SHIFT+GUI |                         //
 | 
			
		||||
         //------------------------+-------------------------+-------------------------+-------------------------+-------------------------+-------------------------+------------------------//
 | 
			
		||||
| 
						 | 
				
			
			@ -63,13 +63,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
         //------------------------+-------------------------+-------------------------+-------------------------+-------------------------+-------------------------+------------------------//
 | 
			
		||||
        //                         |                         |                         |                         |                         |                         |                         //
 | 
			
		||||
        //                         |                         |                         |                         |                         |                         |                         //
 | 
			
		||||
                DYN_REC_START2,           TD(APMR_PIPE),            TD(RPRN_RBRC),            TD(RCBR_RABK),            TD(HASH_PERC),            TD(ASTR_CIRC),               XXXXXXX,        //
 | 
			
		||||
                DM_REC2,                   TD(APMR_PIPE),            TD(RPRN_RBRC),            TD(RCBR_RABK),            TD(HASH_PERC),            TD(ASTR_CIRC),               XXXXXXX,        //
 | 
			
		||||
        //                         |                         |                         |                         |                         |                         |                         //
 | 
			
		||||
        //                         |                         |                         |                         |                         |                         |                         //
 | 
			
		||||
         //------------------------+-------------------------+-------------------------+-------------------------+-------------------------+-------------------------+------------------------//
 | 
			
		||||
        //                         |                         |                         |                         |                         |                         |                         //
 | 
			
		||||
        //                         |                         |                         |                         |                         |                         |                         //
 | 
			
		||||
                DYN_MACRO_PLAY2,           LAG_T(KC_F),              LCG_T(KC_G),             C_S_T(KC_C),                LCA_T(KC_R),             LAS_T(KC_L),             TD(SLSH_BSLS),     //
 | 
			
		||||
                DM_PLY2,                   LAG_T(KC_F),              LCG_T(KC_G),             C_S_T(KC_C),                LCA_T(KC_R),             LAS_T(KC_L),             TD(SLSH_BSLS),     //
 | 
			
		||||
        //                         |                         |                         |                         |                         |                         |                         //
 | 
			
		||||
        //                         |                         |                         |                         |                         |                         |                         //
 | 
			
		||||
        //                         |-------------------------+-------------------------+-------------------------+-------------------------+-------------------------+------------------------//
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue