Separate RGBLight/RGB Matrix keycode handling (#23679)
* Separate RGBLight/RGB Matrix keycode handling * Remove `_DISABLE_KEYCODES` handling * Update RGB Matrix keycode docs * Update underglow keycodes for previously migrated boards * Update keycodes for boards with custom handling * Fix typos * Fix bad merge
This commit is contained in:
		
							parent
							
								
									5c97a78ce6
								
							
						
					
					
						commit
						6fa11bf219
					
				
					 267 changed files with 1228 additions and 2276 deletions
				
			
		| 
						 | 
				
			
			@ -30,31 +30,31 @@ enum layers{
 | 
			
		|||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
    [MAC_BASE] = LAYOUT_ansi_103(
 | 
			
		||||
        KC_MUTE,  KC_F13,   KC_F14,   KC_F15,    KC_ESC,   KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_DEL,            RGB_MOD,
 | 
			
		||||
        KC_MUTE,  KC_F13,   KC_F14,   KC_F15,    KC_ESC,   KC_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RM_VALD,  RM_VALU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_DEL,            RM_NEXT,
 | 
			
		||||
        KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,   KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,           KC_PGUP,
 | 
			
		||||
        KC_P7,    KC_P8,    KC_P9,    KC_PPLS,   KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,  KC_BSLS,           KC_PGDN,
 | 
			
		||||
        KC_P4,    KC_P5,    KC_P6,               KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,            KC_HOME,
 | 
			
		||||
        KC_P1,    KC_P2,    KC_P3,    KC_PENT,   KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
 | 
			
		||||
        KC_P0,              KC_PDOT,             KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN, KC_RGHT),
 | 
			
		||||
    [MAC_FN] = LAYOUT_ansi_103(
 | 
			
		||||
        RGB_TOG,  _______,  _______,  _______,   _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,           RGB_TOG,
 | 
			
		||||
        RM_TOGG,  _______,  _______,  _______,   _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,           RM_TOGG,
 | 
			
		||||
        _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,           _______,
 | 
			
		||||
        _______,  _______,  _______,  _______,   RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,           _______,
 | 
			
		||||
        _______,  _______,  _______,             _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,           _______,
 | 
			
		||||
        _______,  _______,  _______,  _______,   RM_TOGG,  RM_NEXT,  RM_VALU,  RM_HUEU,  RM_SATU,  RM_SPDU,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,           _______,
 | 
			
		||||
        _______,  _______,  _______,             _______,  RM_PREV,  RM_VALD,  RM_HUED,  RM_SATD,  RM_SPDD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,           _______,
 | 
			
		||||
        _______,  _______,  _______,  _______,   _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
 | 
			
		||||
        _______,            _______,             _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______, _______),
 | 
			
		||||
    [WIN_BASE] = LAYOUT_ansi_103(
 | 
			
		||||
        KC_MUTE,  _______,  _______,  _______,   KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,     KC_F6,    KC_F7,    KC_F8,    KC_F9,   KC_F10,   KC_F11,     KC_F12,   KC_DEL,            RGB_MOD,
 | 
			
		||||
        KC_MUTE,  _______,  _______,  _______,   KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,     KC_F6,    KC_F7,    KC_F8,    KC_F9,   KC_F10,   KC_F11,     KC_F12,   KC_DEL,            RM_NEXT,
 | 
			
		||||
        KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,   KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,      KC_6,     KC_7,     KC_8,     KC_9,    KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,           KC_PGUP,
 | 
			
		||||
        KC_P7,    KC_P8,    KC_P9,    KC_PPLS,   KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,      KC_Y,     KC_U,     KC_I,     KC_O,    KC_P,     KC_LBRC,    KC_RBRC,  KC_BSLS,           KC_PGDN,
 | 
			
		||||
        KC_P4,    KC_P5,    KC_P6,               KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,      KC_H,     KC_J,     KC_K,     KC_L,    KC_SCLN,  KC_QUOT,              KC_ENT,            KC_HOME,
 | 
			
		||||
        KC_P1,    KC_P2,    KC_P3,    KC_PENT,   KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,      KC_B,     KC_N,     KC_M,     KC_COMM, KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
 | 
			
		||||
        KC_P0,              KC_PDOT,             KC_LCTL,  KC_LWIN,  KC_LALT,                                 KC_SPC,                                KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN, KC_RGHT),
 | 
			
		||||
    [WIN_FN] = LAYOUT_ansi_103(
 | 
			
		||||
        RGB_TOG,  _______,  _______,  _______,   _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,   RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT, KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,           RGB_TOG,
 | 
			
		||||
        RM_TOGG,  _______,  _______,  _______,   _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RM_VALD,   RM_VALU,  KC_MPRV,  KC_MPLY,  KC_MNXT, KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,           RM_TOGG,
 | 
			
		||||
        _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______, _______,  _______,    _______,  _______,           _______,
 | 
			
		||||
        _______,  _______,  _______,  _______,   RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,   _______,  _______,  _______,  _______, _______,  _______,    _______,  _______,           _______,
 | 
			
		||||
        _______,  _______,  _______,             _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,   _______,  _______,  _______,  _______, _______,  _______,              _______,           _______,
 | 
			
		||||
        _______,  _______,  _______,  _______,   RM_TOGG,  RM_NEXT,  RM_VALU,  RM_HUEU,  RM_SATU,  RM_SPDU,   _______,  _______,  _______,  _______, _______,  _______,    _______,  _______,           _______,
 | 
			
		||||
        _______,  _______,  _______,             _______,  RM_PREV, RM_VALD,  RM_HUED,  RM_SATD,  RM_SPDD,   _______,  _______,  _______,  _______, _______,  _______,              _______,           _______,
 | 
			
		||||
        _______,  _______,  _______,  _______,   _______,            _______,  _______,  _______,  _______,   _______,  NK_TOGG,  _______,  _______, _______,  _______,              _______,  _______,
 | 
			
		||||
        _______,            _______,             _______,  _______,  _______,                                 _______,                               _______,  _______,    _______,  _______,  _______, _______),
 | 
			
		||||
};
 | 
			
		||||
| 
						 | 
				
			
			@ -62,8 +62,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		|||
#if defined(ENCODER_MAP_ENABLE)
 | 
			
		||||
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
 | 
			
		||||
    [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
 | 
			
		||||
    [MAC_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
 | 
			
		||||
    [MAC_FN]   = {ENCODER_CCW_CW(RM_VALD, RM_VALU) },
 | 
			
		||||
    [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
 | 
			
		||||
    [WIN_FN]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }
 | 
			
		||||
    [WIN_FN]   = {ENCODER_CCW_CW(RM_VALD, RM_VALU) }
 | 
			
		||||
};
 | 
			
		||||
#endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue