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
					
				| @ -306,11 +306,11 @@ ifeq ($(strip $(RGBLIGHT_ENABLE)), yes) | ||||
|         POST_CONFIG_H += $(QUANTUM_DIR)/rgblight/rgblight_post_config.h | ||||
|         OPT_DEFS += -DRGBLIGHT_ENABLE | ||||
|         OPT_DEFS += -DRGBLIGHT_$(strip $(shell echo $(RGBLIGHT_DRIVER) | tr '[:lower:]' '[:upper:]')) | ||||
|         SRC += $(QUANTUM_DIR)/process_keycode/process_underglow.c | ||||
|         SRC += $(QUANTUM_DIR)/color.c | ||||
|         SRC += $(QUANTUM_DIR)/rgblight/rgblight.c | ||||
|         SRC += $(QUANTUM_DIR)/rgblight/rgblight_drivers.c | ||||
|         CIE1931_CURVE := yes | ||||
|         RGB_KEYCODES_ENABLE := yes | ||||
|     endif | ||||
| 
 | ||||
|     ifeq ($(strip $(RGBLIGHT_DRIVER)), ws2812) | ||||
| @ -456,12 +456,12 @@ ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes) | ||||
|     COMMON_VPATH += $(QUANTUM_DIR)/rgb_matrix/animations | ||||
|     COMMON_VPATH += $(QUANTUM_DIR)/rgb_matrix/animations/runners | ||||
|     POST_CONFIG_H += $(QUANTUM_DIR)/rgb_matrix/post_config.h | ||||
|     SRC += $(QUANTUM_DIR)/process_keycode/process_rgb_matrix.c | ||||
|     SRC += $(QUANTUM_DIR)/color.c | ||||
|     SRC += $(QUANTUM_DIR)/rgb_matrix/rgb_matrix.c | ||||
|     SRC += $(QUANTUM_DIR)/rgb_matrix/rgb_matrix_drivers.c | ||||
|     LIB8TION_ENABLE := yes | ||||
|     CIE1931_CURVE := yes | ||||
|     RGB_KEYCODES_ENABLE := yes | ||||
| 
 | ||||
|     ifeq ($(strip $(RGB_MATRIX_DRIVER)), aw20216s) | ||||
|         SPI_DRIVER_REQUIRED = yes | ||||
| @ -564,10 +564,6 @@ ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes) | ||||
|     endif | ||||
| endif | ||||
| 
 | ||||
| ifeq ($(strip $(RGB_KEYCODES_ENABLE)), yes) | ||||
|     SRC += $(QUANTUM_DIR)/process_keycode/process_rgb.c | ||||
| endif | ||||
| 
 | ||||
| VARIABLE_TRACE ?= no | ||||
| ifneq ($(strip $(VARIABLE_TRACE)),no) | ||||
|     SRC += $(QUANTUM_DIR)/variable_trace.c | ||||
|  | ||||
| @ -81,38 +81,21 @@ As mentioned earlier, the center of the keyboard by default is expected to be `{ | ||||
| 
 | ||||
| ## Keycodes {#keycodes} | ||||
| 
 | ||||
| All RGB keycodes are currently shared with the RGBLIGHT system: | ||||
| 
 | ||||
| |Key                            |Aliases  |Description                        | | ||||
| |-------------------|----------|--------------------------------------------------------------------------------------| | ||||
| |`RGB_TOG`          |          |Toggle RGB lighting on or off                                                         | | ||||
| |`RGB_MODE_FORWARD` |`RGB_MOD` |Cycle through modes, reverse direction when Shift is held                             | | ||||
| |`RGB_MODE_REVERSE` |`RGB_RMOD`|Cycle through modes in reverse, forward direction when Shift is held                  | | ||||
| |`RGB_HUI`          |          |Increase hue, decrease hue when Shift is held                                         | | ||||
| |`RGB_HUD`          |          |Decrease hue, increase hue when Shift is held                                         | | ||||
| |`RGB_SAI`          |          |Increase saturation, decrease saturation when Shift is held                           | | ||||
| |`RGB_SAD`          |          |Decrease saturation, increase saturation when Shift is held                           | | ||||
| |`RGB_VAI`          |          |Increase value (brightness), decrease value when Shift is held                        | | ||||
| |`RGB_VAD`          |          |Decrease value (brightness), increase value when Shift is held                        | | ||||
| |`RGB_SPI`          |          |Increase effect speed (does not support eeprom yet), decrease speed when Shift is held| | ||||
| |`RGB_SPD`          |          |Decrease effect speed (does not support eeprom yet), increase speed when Shift is held| | ||||
| |`RGB_MODE_PLAIN`   |`RGB_M_P` |Static (no animation) mode                                                            | | ||||
| |`RGB_MODE_BREATHE` |`RGB_M_B` |Breathing animation mode                                                              | | ||||
| |`RGB_MODE_RAINBOW` |`RGB_M_R` |Full gradient scrolling left to right (uses the `RGB_MATRIX_CYCLE_LEFT_RIGHT` mode)   | | ||||
| |`RGB_MODE_SWIRL`   |`RGB_M_SW`|Full gradient spinning pinwheel around center of keyboard (uses `RGB_MATRIX_CYCLE_PINWHEEL` mode) | | ||||
| 
 | ||||
| * `RGB_MODE_*` keycodes will generally work, but not all of the modes are currently mapped to the correct effects for the RGB Matrix system. | ||||
| 
 | ||||
| `RGB_MODE_PLAIN`, `RGB_MODE_BREATHE`, `RGB_MODE_RAINBOW`, and `RGB_MODE_SWIRL` are the only ones that are mapped properly. The rest don't have a direct equivalent, and are not mapped. | ||||
| 
 | ||||
| ::: tip | ||||
| `RGB_*` keycodes cannot be used with functions like `tap_code16(RGB_HUD)` as they're not USB HID keycodes. If you wish to replicate similar behaviour in custom code within your firmware (e.g. inside `encoder_update_user()` or `process_record_user()`), the equivalent [RGB functions](#functions) should be used instead. | ||||
| ::: | ||||
| 
 | ||||
| 
 | ||||
| ::: warning | ||||
| By default, if you have both the [RGB Light](rgblight) and the RGB Matrix feature enabled, these keycodes will work for both features, at the same time. You can disable the keycode functionality by defining the `*_DISABLE_KEYCODES` option for the specific feature. | ||||
| ::: | ||||
| |-------------------------------|---------|-----------------------------------| | ||||
| |`QK_RGB_MATRIX_ON`             |`RM_ON`  |Turn on RGB Matrix                 | | ||||
| |`QK_RGB_MATRIX_OFF`            |`RM_OFF` |Turn off RGB Matrix                | | ||||
| |`QK_RGB_MATRIX_TOGGLE`         |`RM_TOGG`|Toggle RGB Matrix on or off        | | ||||
| |`QK_RGB_MATRIX_MODE_NEXT`      |`RM_NEXT`|Cycle through animations           | | ||||
| |`QK_RGB_MATRIX_MODE_PREVIOUS`  |`RM_PREV`|Cycle through animations in reverse| | ||||
| |`QK_RGB_MATRIX_HUE_UP`         |`RM_HUEU`|Cycle through hue                  | | ||||
| |`QK_RGB_MATRIX_HUE_DOWN`       |`RM_HUED`|Cycle through hue in reverse       | | ||||
| |`QK_RGB_MATRIX_SATURATION_UP`  |`RM_SATU`|Increase the saturation            | | ||||
| |`QK_RGB_MATRIX_SATURATION_DOWN`|`RM_SATD`|Decrease the saturation            | | ||||
| |`QK_RGB_MATRIX_VALUE_UP`       |`RM_VALU`|Increase the brightness level      | | ||||
| |`QK_RGB_MATRIX_VALUE_DOWN`     |`RM_VALD`|Decrease the brightness level      | | ||||
| |`QK_RGB_MATRIX_SPEED_UP`       |`RM_SPDU`|Increase the animation speed       | | ||||
| |`QK_RGB_MATRIX_SPEED_DOWN`     |`RM_SPDD`|Decrease the animation speed       | | ||||
| 
 | ||||
| ## RGB Matrix Effects {#rgb-matrix-effects} | ||||
| 
 | ||||
| @ -289,7 +272,7 @@ Solid reactive effects will pulse RGB light on key presses with user configurabl | ||||
| #define RGB_MATRIX_SOLID_REACTIVE_GRADIENT_MODE | ||||
| ``` | ||||
| 
 | ||||
| Gradient mode will loop through the color wheel hues over time and its duration can be controlled with the effect speed keycodes (`RGB_SPI`/`RGB_SPD`). | ||||
| Gradient mode will loop through the color wheel hues over time and its duration can be controlled with the effect speed keycodes (`RM_SPDU`/`RM_SPDD`). | ||||
| 
 | ||||
| ## Custom RGB Matrix Effects {#custom-rgb-matrix-effects} | ||||
| 
 | ||||
| @ -396,7 +379,6 @@ These are defined in [`color.h`](https://github.com/qmk/qmk_firmware/blob/master | ||||
| #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set | ||||
| #define RGB_MATRIX_DEFAULT_SPD 127 // Sets the default animation speed, if none has been set | ||||
| #define RGB_MATRIX_DEFAULT_FLAGS LED_FLAG_ALL // Sets the default LED flags, if none has been set | ||||
| #define RGB_MATRIX_DISABLE_KEYCODES // disables control of rgb matrix by keycodes (must use code functions to control the feature) | ||||
| #define RGB_MATRIX_SPLIT { X, Y } 	// (Optional) For split keyboards, the number of LEDs connected on each half. X = left, Y = Right. | ||||
|                               		// If reactive effects are enabled, you also will want to enable SPLIT_TRANSPORT_MIRROR | ||||
| #define RGB_TRIGGER_ON_KEYDOWN      // Triggers RGB keypress events on key down. This makes RGB control feel more responsive. This may cause RGB to not function properly on some boards | ||||
|  | ||||
| @ -87,11 +87,6 @@ Changing the **Value** sets the overall brightness.<br> | ||||
| These keycodes cannot be used with functions like `tap_code16()` as they are not USB HID keycodes. If you wish to replicate similar behaviour in custom code within your firmware (e.g. inside `encoder_update_user()` or `process_record_user()`), the equivalent [RGB functions](#functions) should be used instead. | ||||
| ::: | ||||
| 
 | ||||
| 
 | ||||
| ::: warning | ||||
| By default, if you have both the RGB Light and the [RGB Matrix](rgb_matrix) feature enabled, these keycodes will work for both features, at the same time. You can disable the keycode functionality by defining the `*_DISABLE_KEYCODES` option for the specific feature. | ||||
| ::: | ||||
| 
 | ||||
| ## Configuration | ||||
| 
 | ||||
| Your RGB lighting can be configured by placing these `#define`s in your `config.h`: | ||||
| @ -104,7 +99,6 @@ Your RGB lighting can be configured by placing these `#define`s in your `config. | ||||
| |`RGBLIGHT_LIMIT_VAL`       |`255`                       |The maximum brightness level                                                                                               | | ||||
| |`RGBLIGHT_SLEEP`           |*Not defined*               |If defined, the RGB lighting will be switched off when the host goes to sleep                                              | | ||||
| |`RGBLIGHT_SPLIT`           |*Not defined*               |If defined, synchronization functionality for split keyboards is added                                                     | | ||||
| |`RGBLIGHT_DISABLE_KEYCODES`|*Not defined*               |If defined, disables the ability to control RGB Light from the keycodes. You must use code functions to control the feature| | ||||
| |`RGBLIGHT_DEFAULT_MODE`    |`RGBLIGHT_MODE_STATIC_LIGHT`|The default mode to use upon clearing the EEPROM                                                                           | | ||||
| |`RGBLIGHT_DEFAULT_HUE`     |`0` (red)                   |The default hue to use upon clearing the EEPROM                                                                            | | ||||
| |`RGBLIGHT_DEFAULT_SAT`     |`UINT8_MAX` (255)           |The default saturation to use upon clearing the EEPROM                                                                     | | ||||
|  | ||||
| @ -728,23 +728,25 @@ See also: [RGB Lighting](features/rgblight) | ||||
| |`RGB_MODE_RGBTEST`            |`RGB_M_T` |Red, Green, Blue test animation mode (deprecated)                    | | ||||
| |`RGB_MODE_TWINKLE`            |`RGB_M_TW`|Twinkle animation mode (deprecated)                                  | | ||||
| 
 | ||||
| ## RGB Matrix Lighting {#rgb-matrix-lighting} | ||||
| ## RGB Matrix {#rgb-matrix} | ||||
| 
 | ||||
| See also: [RGB Matrix Lighting](features/rgb_matrix) | ||||
| See also: [RGB Matrix](features/rgb_matrix) | ||||
| 
 | ||||
| |Key                            |Aliases  |Description                        | | ||||
| |-------------------|----------|--------------------------------------------------------------------------------------| | ||||
| |`RGB_TOG`          |          |Toggle RGB lighting on or off                                                         | | ||||
| |`RGB_MODE_FORWARD` |`RGB_MOD` |Cycle through modes, reverse direction when Shift is held                             | | ||||
| |`RGB_MODE_REVERSE` |`RGB_RMOD`|Cycle through modes in reverse, forward direction when Shift is held                  | | ||||
| |`RGB_HUI`          |          |Increase hue, decrease hue when Shift is held                                         | | ||||
| |`RGB_HUD`          |          |Decrease hue, increase hue when Shift is held                                         | | ||||
| |`RGB_SAI`          |          |Increase saturation, decrease saturation when Shift is held                           | | ||||
| |`RGB_SAD`          |          |Decrease saturation, increase saturation when Shift is held                           | | ||||
| |`RGB_VAI`          |          |Increase value (brightness), decrease value when Shift is held                        | | ||||
| |`RGB_VAD`          |          |Decrease value (brightness), increase value when Shift is held                        | | ||||
| |`RGB_SPI`          |          |Increase effect speed (does not support eeprom yet), decrease speed when Shift is held| | ||||
| |`RGB_SPD`          |          |Decrease effect speed (does not support eeprom yet), increase speed when Shift is held| | ||||
| |-------------------------------|---------|-----------------------------------| | ||||
| |`QK_RGB_MATRIX_ON`             |`RM_ON`  |Turn on RGB Matrix                 | | ||||
| |`QK_RGB_MATRIX_OFF`            |`RM_OFF` |Turn off RGB Matrix                | | ||||
| |`QK_RGB_MATRIX_TOGGLE`         |`RM_TOGG`|Toggle RGB Matrix on or off        | | ||||
| |`QK_RGB_MATRIX_MODE_NEXT`      |`RM_NEXT`|Cycle through animations           | | ||||
| |`QK_RGB_MATRIX_MODE_PREVIOUS`  |`RM_PREV`|Cycle through animations in reverse| | ||||
| |`QK_RGB_MATRIX_HUE_UP`         |`RM_HUEU`|Cycle through hue                  | | ||||
| |`QK_RGB_MATRIX_HUE_DOWN`       |`RM_HUED`|Cycle through hue in reverse       | | ||||
| |`QK_RGB_MATRIX_SATURATION_UP`  |`RM_SATU`|Increase the saturation            | | ||||
| |`QK_RGB_MATRIX_SATURATION_DOWN`|`RM_SATD`|Decrease the saturation            | | ||||
| |`QK_RGB_MATRIX_VALUE_UP`       |`RM_VALU`|Increase the brightness level      | | ||||
| |`QK_RGB_MATRIX_VALUE_DOWN`     |`RM_VALD`|Decrease the brightness level      | | ||||
| |`QK_RGB_MATRIX_SPEED_UP`       |`RM_SPDU`|Increase the animation speed       | | ||||
| |`QK_RGB_MATRIX_SPEED_DOWN`     |`RM_SPDD`|Decrease the animation speed       | | ||||
| 
 | ||||
| ## US ANSI Shifted Symbols {#us-ansi-shifted-symbols} | ||||
| 
 | ||||
|  | ||||
| @ -6,13 +6,13 @@ | ||||
| 
 | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|   [0] = LAYOUT_ortho_1x1( | ||||
|     RGB_HUI | ||||
|     UG_HUEU | ||||
|   ) | ||||
| }; | ||||
| bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||||
|   if (record->event.pressed) { | ||||
|     switch (keycode) { | ||||
|       case RGB_HUI: | ||||
|       case QK_UNDERGLOW_HUE_UP: | ||||
|         rgblite_increase_hue(); | ||||
|         break; | ||||
|     } | ||||
|  | ||||
| @ -146,8 +146,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|    */ | ||||
|     [_ADJUST] =  LAYOUT_ortho_4x12( | ||||
|       _______, QK_BOOT, RGBRST,  _______, _______, _______,                   _______, QWERTY,  COLEMAK, DVORAK,  _______, KC_INS, | ||||
|       _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, AG_NORM,                   AG_SWAP, KC_MINS, KC_EQL,  KC_PSCR, KC_SCRL, KC_PAUS, | ||||
|       RGB_RMOD,RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______,                   _______, _______, _______, _______, KC_PGUP, _______, | ||||
|       _______, UG_TOGG, UG_HUEU, UG_SATU, UG_VALU, AG_NORM,                   AG_SWAP, KC_MINS, KC_EQL,  KC_PSCR, KC_SCRL, KC_PAUS, | ||||
|       UG_PREV, UG_NEXT, UG_HUED, UG_SATD, UG_VALD, _______,                   _______, _______, _______, _______, KC_PGUP, _______, | ||||
|       _______, _______, _______, EISU,    EISU,    EISU,                      KANA,    KANA,    KANA,    KC_HOME, KC_PGDN, KC_END | ||||
|       ) | ||||
| }; | ||||
| @ -246,7 +246,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||||
|         break; | ||||
| 
 | ||||
|       //led operations - RGB mode change now updates the RGB_current_mode to allow the right RGB mode to be set after reactive keys are released
 | ||||
|     case RGB_RMOD: | ||||
|     case QK_UNDERGLOW_MODE_PREVIOUS: | ||||
|       #if defined(RGBLIGHT_ENABLE) | ||||
|         if (record->event.pressed) { | ||||
|           rgblight_mode_noeeprom(RGB_current_config.mode); | ||||
| @ -257,7 +257,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||||
|       #endif | ||||
|       break; | ||||
| 
 | ||||
|     case RGB_MOD: | ||||
|     case QK_UNDERGLOW_MODE_NEXT: | ||||
|       #if defined(RGBLIGHT_ENABLE) | ||||
|         if (record->event.pressed) { | ||||
|           rgblight_mode_noeeprom(RGB_current_config.mode); | ||||
|  | ||||
| @ -167,7 +167,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) { | ||||
|                 eeconfig_update_keymap(keymap_config.raw); | ||||
|             } | ||||
|             return false; | ||||
|         case RGB_TOG: | ||||
|         case QK_RGB_MATRIX_TOGGLE: | ||||
|             if (record->event.pressed) { | ||||
|                 switch (rgb_matrix_get_flags()) { | ||||
|                     case LED_FLAG_ALL: { | ||||
|  | ||||
| @ -47,11 +47,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
| 
 | ||||
|     [WIN_FN] = LAYOUT_tkl_ansi( /* FN */ | ||||
|         _______, KC_MYCM, KC_MAIL, KC_WSCH, KC_WHOM, KC_MSEL, KC_MPLY, KC_MPRV, KC_MNXT, _______,_______,  _______, _______,          _______, _______, _______, | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______, _______, | ||||
|         _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, _______, DF(MAC_B),_______,_______, _______, RGB_MOD, _______, _______, _______, | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______,          RGB_HUI, | ||||
|         _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,                   _______,          RGB_VAI, | ||||
|         _______, GU_TOGG, _______,                   _______,                            _______, _______, _______,          _______, RGB_SAD, RGB_VAD, RGB_SAI), | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_SPDD, RM_SPDU, _______, _______, _______, _______, | ||||
|         _______, _______,TG(WIN_W),_______, _______, _______, _______, _______, _______, DF(MAC_B),_______,_______, _______, RM_NEXT, _______, _______, _______, | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_TOGG, _______, _______,          RM_HUEU, | ||||
|         _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,                   _______,          RM_VALU, | ||||
|         _______, GU_TOGG, _______,                   _______,                            _______, _______, _______,          _______, RM_SATD, RM_VALD, RM_SATU), | ||||
| 
 | ||||
|     [MAC_B] = LAYOUT_tkl_ansi( /* Base */ | ||||
|         KC_ESC,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_F5,   KC_F6,   KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU,          KC_PSCR, KC_SCRL, KC_PAUS, | ||||
| @ -70,10 +70,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         _______, _______, _______,                   _______,                            _______, _______, MO(MAC_FN),       _______, KC_A,    KC_S,    KC_D), | ||||
|     [MAC_FN] = LAYOUT_tkl_ansi( /* FN */ | ||||
|         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,  _______,  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           _______, _______, _______, | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______, _______, | ||||
|         _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, _______, DF(WIN_B),_______,_______, _______, RGB_MOD, _______, _______, _______, | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______,          RGB_HUI, | ||||
|         _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,                   _______,          RGB_VAI, | ||||
|         _______, _______, _______,                   _______,                            _______, _______, _______,          _______, RGB_SAD, RGB_VAD, RGB_SAI) | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_SPDD, RM_SPDU, _______, _______, _______, _______, | ||||
|         _______, _______,TG(MAC_W),_______, _______, _______, _______, _______, _______, DF(WIN_B),_______,_______, _______, RM_NEXT, _______, _______, _______, | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_TOGG, _______, _______,          RM_HUEU, | ||||
|         _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,                   _______,          RM_VALU, | ||||
|         _______, _______, _______,                   _______,                            _______, _______, _______,          _______, RM_SATD, RM_VALD, RM_SATU) | ||||
| }; | ||||
| // clang-format on
 | ||||
|  | ||||
| @ -211,7 +211,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||||
|                 ap2_led_reset_foreground_color(); | ||||
|                 return false; | ||||
|             #ifdef RGB_MATRIX_ENABLE | ||||
|             case RGB_TOG: | ||||
|             case QK_RGB_MATRIX_TOGGLE: | ||||
|                 if(rgb_matrix_is_enabled()) ap2_led_disable(); | ||||
|                 else ap2_led_enable(); | ||||
|                 return true; | ||||
|  | ||||
| @ -61,11 +61,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|  ), | ||||
|  [_ADJUST] = LAYOUT( | ||||
|  //,-----------------------------------------------.          ,-----------------------------------------------.
 | ||||
|     KC_TRNS, RGBRST,RGB_TOG,  KC_NO,  KC_NO,  KC_NO,             KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO, | ||||
|     KC_TRNS, RGBRST,UG_TOGG,  KC_NO,  KC_NO,  KC_NO,             KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO, | ||||
|  //|-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------|
 | ||||
|     KC_TRNS,RGB_HUI,RGB_SAI,RGB_VAI,AG_SWAP,  KC_NO,             KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO, | ||||
|     KC_TRNS,UG_HUEU,UG_SATU,UG_VALU,AG_SWAP,  KC_NO,             KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO, | ||||
|  //|-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------|
 | ||||
|     KC_TRNS,RGB_HUD,RGB_SAD,RGB_VAD,AG_NORM,  KC_NO,             KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO, | ||||
|     KC_TRNS,UG_HUED,UG_SATD,UG_VALD,AG_NORM,  KC_NO,             KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO, | ||||
|  //|-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------|
 | ||||
|     KC_TRNS,                        KC_TRNS,KC_TRNS,           KC_TRNS,KC_TRNS,                        KC_TRNS, | ||||
|  //|-------+-------+-------+-------+-------+-------|          |-------+-------+-------+-------+-------+-------|
 | ||||
| @ -116,7 +116,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||||
|         } | ||||
|         return false; | ||||
|         break; | ||||
|     case RGB_MOD: | ||||
|     case QK_UNDERGLOW_TOGGLE: | ||||
|       #ifdef RGBLIGHT_ENABLE | ||||
|         if (record->event.pressed) { | ||||
|           rgblight_mode(RGB_current_mode); | ||||
|  | ||||
| @ -34,13 +34,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|   //,------------------------------------------------------------------------|   |---------------------------------------------------------------------------.
 | ||||
|        KC_ESC, KC_GRAVE,    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, | ||||
|   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
 | ||||
|        RGB_MOD,  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, | ||||
|        UG_NEXT,  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, | ||||
|   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
 | ||||
|       RGB_M_G, 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, | ||||
|   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
 | ||||
|           RGB_M_X, KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,   KC_RSFT,   KC_RSFT, | ||||
|   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
 | ||||
|                 RGB_TOG, KC_LCTL, KC_LALT, KC_LALT,           KC_SPC,               KC_SPC,  KC_SPC,                            KC_RALT,   KC_RCTL,   MO(_FN) | ||||
|                 UG_TOGG, KC_LCTL, KC_LALT, KC_LALT,           KC_SPC,               KC_SPC,  KC_SPC,                            KC_RALT,   KC_RCTL,   MO(_FN) | ||||
|   //`------------------------------------------------------------------------|   |---------------------------------------------------------------------------'
 | ||||
|   ), | ||||
| 
 | ||||
| @ -64,9 +64,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
 | ||||
|       XXXXXXX,            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX,  XXXXXXX, | ||||
|   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
 | ||||
|       XXXXXXX,            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_TOG, RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,       XXXXXXX, | ||||
|       XXXXXXX,            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     UG_TOGG, UG_NEXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,       XXXXXXX, | ||||
|   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
 | ||||
|       XXXXXXX,            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI,   XXXXXXX,   XXXXXXX, | ||||
|       XXXXXXX,            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     UG_VALD, UG_VALU, UG_HUED, UG_HUEU, UG_SATD, UG_SATU,   XXXXXXX,   XXXXXXX, | ||||
|   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
 | ||||
|       XXXXXXX,            XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,              XXXXXXX, XXXXXXX,                            XXXXXXX,   XXXXXXX,   XXXXXXX | ||||
|           //`-----------------------------------------------------------------|   |---------------------------------------------------------------------------'
 | ||||
| @ -80,7 +80,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||||
|   bool result = false; | ||||
|   switch (keycode) { | ||||
|     #ifdef RGBLIGHT_ENABLE | ||||
|       case RGB_MOD: | ||||
|       case QK_UNDERGLOW_TOGGLE: | ||||
|           if (record->event.pressed) { | ||||
|             rgblight_mode(RGB_current_mode); | ||||
|             rgblight_step(); | ||||
|  | ||||
| @ -34,13 +34,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|   //,------------------------------------------------------------------------|   |---------------------------------------------------------------------------.
 | ||||
|        KC_ESC, KC_GRAVE,    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, | ||||
|   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
 | ||||
|       RGB_MOD,   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, | ||||
|       UG_NEXT,   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, | ||||
|   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
 | ||||
|       RGB_M_G,  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, | ||||
|   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
 | ||||
|       RGB_M_X,      KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,   KC_RSFT,   KC_RSFT, | ||||
|   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
 | ||||
|       RGB_TOG,            KC_LCTL,KC_LALT, KC_LALT,  KC_SPC,           KC_SPC,      KC_SPC,  KC_SPC,                            KC_RALT,   KC_RCTL,   MO(_FN) | ||||
|       UG_TOGG,            KC_LCTL,KC_LALT, KC_LALT,  KC_SPC,           KC_SPC,      KC_SPC,  KC_SPC,                            KC_RALT,   KC_RCTL,   MO(_FN) | ||||
|   //`------------------------------------------------------------------------|   |---------------------------------------------------------------------------'
 | ||||
|   ), | ||||
| 
 | ||||
| @ -64,9 +64,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
 | ||||
|      XXXXXXX,             XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX,   XXXXXXX, | ||||
|   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
 | ||||
|       XXXXXXX,            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_TOG, RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,       XXXXXXX, | ||||
|       XXXXXXX,            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     UG_TOGG, UG_NEXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,       XXXXXXX, | ||||
|   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
 | ||||
|       XXXXXXX,            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI,   XXXXXXX,   XXXXXXX, | ||||
|       XXXXXXX,            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     UG_VALD, UG_VALU, UG_HUED, UG_HUEU, UG_SATD, UG_SATU,   XXXXXXX,   XXXXXXX, | ||||
|   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
 | ||||
|       XXXXXXX,            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,     XXXXXXX, XXXXXXX,                            XXXXXXX,   XXXXXXX,   XXXXXXX | ||||
|   //`-------------------------------------------------------------------------|   |---------------------------------------------------------------------------'
 | ||||
| @ -80,7 +80,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||||
|   bool result = false; | ||||
|   switch (keycode) { | ||||
|     #ifdef RGBLIGHT_ENABLE | ||||
|       case RGB_MOD: | ||||
|       case QK_UNDERGLOW_MODE_NEXT: | ||||
|           if (record->event.pressed) { | ||||
|             rgblight_mode(RGB_current_mode); | ||||
|             rgblight_step(); | ||||
|  | ||||
| @ -48,13 +48,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|   //,------------------------------------------------------------------------|   |---------------------------------------------------------------------------.
 | ||||
|        KC_ESC, KC_GRAVE,    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, | ||||
|   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
 | ||||
|        RGB_MOD,  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, | ||||
|        UG_NEXT,  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, | ||||
|   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
 | ||||
|       RGB_M_G, 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, | ||||
|   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
 | ||||
|           RGB_M_X, KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,   KC_RSFT,   KC_RSFT, | ||||
|   //|------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
 | ||||
|                 RGB_TOG, KC_LCTL, KC_LALT, KC_LALT,           KC_SPC,               KC_SPC,  KC_SPC,                            KC_RALT,   KC_RCTL,   MO(_FN) | ||||
|                 UG_TOGG, KC_LCTL, KC_LALT, KC_LALT,           KC_SPC,               KC_SPC,  KC_SPC,                            KC_RALT,   KC_RCTL,   MO(_FN) | ||||
|   //`------------------------------------------------------------------------|   |---------------------------------------------------------------------------'
 | ||||
|   ), | ||||
| 
 | ||||
| @ -90,13 +90,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|   //,-------------------------------------------------------------------------|   |---------------------------------------------------------------------------.
 | ||||
|        KC_ESC,  KC_GRAVE,    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, | ||||
|   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
 | ||||
|       RGB_MOD,    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, | ||||
|       UG_NEXT,    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, | ||||
|   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
 | ||||
|       RGB_M_G,  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, | ||||
|   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
 | ||||
|       RGB_M_X,      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_B,  KC_N,    KC_M,   KC_COMM,  KC_DOT, KC_SLSH,   KC_RSFT,   KC_RSFT, | ||||
|   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
 | ||||
|       RGB_TOG,            KC_LCTL, KC_LALT, KC_LALT,           KC_SPC,               KC_SPC,  KC_SPC,                            KC_RALT,   KC_RCTL,   MO(_FN) | ||||
|       UG_TOGG,            KC_LCTL, KC_LALT, KC_LALT,           KC_SPC,               KC_SPC,  KC_SPC,                            KC_RALT,   KC_RCTL,   MO(_FN) | ||||
|   //`-------------------------------------------------------------------------|   |---------------------------------------------------------------------------'
 | ||||
|   ), | ||||
| 
 | ||||
| @ -104,13 +104,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|   //,-------------------------------------------------------------------------|   |---------------------------------------------------------------------------.
 | ||||
|        KC_ESC, KC_GRAVE,     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, | ||||
|   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
 | ||||
|       RGB_MOD,    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, | ||||
|       UG_NEXT,    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, | ||||
|   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
 | ||||
|       RGB_M_G,  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, | ||||
|   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
 | ||||
|       RGB_M_X,      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,   KC_RSFT,   KC_RSFT, | ||||
|   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
 | ||||
|       RGB_TOG,            KC_LCTL, KC_LALT, KC_LALT,           KC_SPC,               KC_SPC,  KC_SPC,                            KC_RALT,   KC_RCTL,   MO(_FN) | ||||
|       UG_TOGG,            KC_LCTL, KC_LALT, KC_LALT,           KC_SPC,               KC_SPC,  KC_SPC,                            KC_RALT,   KC_RCTL,   MO(_FN) | ||||
|           //`-----------------------------------------------------------------|   |---------------------------------------------------------------------------'
 | ||||
|   ), | ||||
| 
 | ||||
| @ -120,9 +120,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
 | ||||
|       XXXXXXX,            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX,  XXXXXXX, | ||||
|   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
 | ||||
|       XXXXXXX,            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_TOG, RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,       XXXXXXX, | ||||
|       XXXXXXX,            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     UG_TOGG, UG_NEXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,       XXXXXXX, | ||||
|   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
 | ||||
|       XXXXXXX,            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI,   XXXXXXX,   XXXXXXX, | ||||
|       XXXXXXX,            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,     UG_VALD, UG_VALU, UG_HUED, UG_HUEU, UG_SATD, UG_SATU,   XXXXXXX,   XXXXXXX, | ||||
|   //|-------------------+--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+----------+----------|
 | ||||
|       XXXXXXX,            XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,              XXXXXXX, XXXXXXX,                            XXXXXXX,   XXXXXXX,   XXXXXXX | ||||
|           //`-----------------------------------------------------------------|   |---------------------------------------------------------------------------'
 | ||||
| @ -164,7 +164,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||||
|   bool result = false; | ||||
|   switch (keycode) { | ||||
|     #ifdef RGBLIGHT_ENABLE | ||||
|       case RGB_MOD: | ||||
|       case QK_UNDERGLOW_MODE_NEXT: | ||||
|           if (record->event.pressed) { | ||||
|             rgblight_mode(RGB_current_mode); | ||||
|             rgblight_step(); | ||||
|  | ||||
| @ -34,13 +34,6 @@ | ||||
| 
 | ||||
| /* RGB matrix support. */ | ||||
| #ifdef RGB_MATRIX_ENABLE | ||||
| #    ifndef __arm__ | ||||
| // Disable control of RGB matrix by keycodes (must use firmware implementation
 | ||||
| // to control the feature).
 | ||||
| #        define RGB_MATRIX_DISABLE_KEYCODES | ||||
| #    else // __arm__
 | ||||
| // Enable all animations on ARM boards since they have plenty of memory
 | ||||
| // available for it.
 | ||||
| #        define ENABLE_RGB_MATRIX_ALPHAS_MODS | ||||
| #        define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN | ||||
| #        define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT | ||||
| @ -81,5 +74,4 @@ | ||||
| #        define ENABLE_RGB_MATRIX_MULTISPLASH | ||||
| #        define ENABLE_RGB_MATRIX_SOLID_SPLASH | ||||
| #        define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH | ||||
| #    endif // !__arm__
 | ||||
| #endif | ||||
|  | ||||
| @ -87,8 +87,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|    */ | ||||
|   [RGB] = LAYOUT( | ||||
|     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | ||||
|     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, TAP_ANIM,XXXXXXX, | ||||
|     _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD, RGB_HUI, RGB_SAD, RGB_VAD, RGB_RST, XXXXXXX, | ||||
|     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, UG_TOGG, UG_HUEU, UG_SATU, UG_VALU, TAP_ANIM,XXXXXXX, | ||||
|     _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, UG_NEXT, UG_HUED, UG_SATD, UG_VALD, RGB_RST, XXXXXXX, | ||||
|     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX | ||||
|   ) | ||||
| 
 | ||||
| @ -98,7 +98,7 @@ bool isTapAnim = false; | ||||
| 
 | ||||
| bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||||
|   switch (keycode) { | ||||
|     case RGB_MOD: | ||||
|     case QK_UNDERGLOW_MODE_NEXT: | ||||
|       if (record->event.pressed) { | ||||
|         isTapAnim = false; | ||||
|       } | ||||
|  | ||||
| @ -164,7 +164,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||||
|     } | ||||
|     switch (keycode) { | ||||
| #ifdef RGB_MATRIX_ENABLE | ||||
|         case RGB_TOG: | ||||
|         case QK_RGB_MATRIX_TOGGLE: | ||||
|             if (record->event.pressed) { | ||||
|                 switch (rgb_matrix_get_flags()) { | ||||
|                     case LED_FLAG_ALL: { | ||||
|  | ||||
| @ -37,11 +37,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
| 
 | ||||
|     [WIN_FN] = LAYOUT( /* FN */ | ||||
|         _______, KC_MSEL, KC_VOLD, KC_VOLU, KC_MUTE, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MAIL, KC_WHOM, KC_CALC, KC_WSCH, KC_INS,            _______, | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, RGB_TOG,           KC_END, | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, RGB_MOD,           _______, | ||||
|         _______, _______,DF(MAC_B),_______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, _______,           _______, | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,  RGB_VAI, | ||||
|         _______, GU_TOGG, _______,                   EE_CLR,                             _______, _______, _______,          RGB_HUD,  RGB_VAD, RGB_HUD), | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_SPDD, RM_SPDU, RM_TOGG,           KC_END, | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_SATD, RM_SATU, RM_NEXT,           _______, | ||||
|         _______, _______,DF(MAC_B),_______, _______, _______, _______, _______, _______, _______, _______, _______, RM_NEXT, _______,           _______, | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,  RM_VALU, | ||||
|         _______, GU_TOGG, _______,                   EE_CLR,                             _______, _______, _______,          RM_HUED,  RM_VALD, RM_HUEU), | ||||
| 
 | ||||
|     [MAC_B] = LAYOUT( /* Base */ | ||||
|         KC_ESC,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_F5,   KC_F6,   KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,KC_VOLU,  KC_DEL,           KC_MUTE, | ||||
| @ -53,11 +53,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
| 
 | ||||
|     [MAC_FN] = LAYOUT( /* FN */ | ||||
|         _______, 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_INS,            _______, | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, RGB_TOG,           KC_END, | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, RGB_MOD,           _______, | ||||
|         _______,DF(WIN_B),_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, _______,           _______, | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,  RGB_VAI, | ||||
|         _______, _______, _______,                   EE_CLR,                             _______, _______, _______,          RGB_HUD,  RGB_VAD, RGB_HUD) | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_SPDD, RM_SPDU, RM_TOGG,           KC_END, | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_SATD, RM_SATU, RM_NEXT,           _______, | ||||
|         _______,DF(WIN_B),_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_NEXT, _______,           _______, | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,  RM_VALU, | ||||
|         _______, _______, _______,                   EE_CLR,                             _______, _______, _______,          RM_HUED,  RM_VALD, RM_HUEU) | ||||
| }; | ||||
| 
 | ||||
| #if defined(ENCODER_MAP_ENABLE) | ||||
|  | ||||
| @ -35,8 +35,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|   ), | ||||
| 
 | ||||
|   [CONF] = LAYOUT( | ||||
|     _______, RGB_TYPE,RGB_MOD,  RGB_VAI, RGB_HUI, RGB_HUI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | ||||
|     RGB_RST, RGB_TOG, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_HUD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | ||||
|     _______, RGB_TYPE,UG_NEXT,  UG_VALU, UG_SATU, UG_HUEU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | ||||
|     RGB_RST, UG_TOGG, UG_PREV,  UG_VALD, UG_SATD, UG_HUED, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | ||||
|     XXXXXXX,          XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | ||||
|     XXXXXXX,          XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | ||||
|                       XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX | ||||
| @ -55,7 +55,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||||
|         } | ||||
|       #endif | ||||
|       break; | ||||
|     case RGB_MOD: | ||||
|     case QK_UNDERGLOW_MODE_NEXT: | ||||
|       #ifdef RGBLIGHT_ENABLE | ||||
|           if (record->event.pressed) { | ||||
|             enableLEDTypeAnime = false; | ||||
|  | ||||
| @ -43,8 +43,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|   ), | ||||
| 
 | ||||
|   [CONF] = LAYOUT( | ||||
|     _______, RGB_TYPE,RGB_MOD,  RGB_VAI, RGB_HUI, RGB_HUI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | ||||
|     RGB_RST, RGB_TOG, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_HUD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | ||||
|     _______, RGB_TYPE,UG_NEXT,  UG_VALU, UG_SATU, UG_HUEU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | ||||
|     RGB_RST, UG_TOGG, UG_PREV,  UG_VALD, UG_SATD, UG_HUED, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | ||||
|     XXXXXXX,          XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | ||||
|     XXXXXXX,          XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, | ||||
|                       XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX | ||||
| @ -63,7 +63,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||||
|         } | ||||
|       #endif | ||||
|       break; | ||||
|     case RGB_MOD: | ||||
|     case QK_UNDERGLOW_MODE_NEXT: | ||||
|       #ifdef RGBLIGHT_ENABLE | ||||
|           if (record->event.pressed) { | ||||
|             enableLEDTypeAnime = false; | ||||
|  | ||||
| @ -12,8 +12,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     ), | ||||
|     [1] = LAYOUT_65_ansi_blocker( | ||||
|         KC_GRV,  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_MUTE, | ||||
|         _______, RGB_TOG, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,  | ||||
|         _______, RGB_MOD, RGB_VAD, RGB_SPD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______,          _______, KC_VOLU, | ||||
|         _______, RM_TOGG, RM_VALU, RM_SPDU, RM_HUEU, RM_SATU, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,  | ||||
|         _______, RM_NEXT, RM_VALD, RM_SPDD, RM_HUED, RM_SATD, _______, _______, _______, _______, _______, _______,          _______, KC_VOLU, | ||||
|         _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______,          KC_PGUP, KC_VOLD, | ||||
|         _______, _______, _______,                            EE_CLR,                             KC_APP,  _______, KC_HOME, KC_PGDN, KC_END | ||||
|     ) | ||||
|  | ||||
| @ -12,8 +12,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     ), | ||||
|     [1] = LAYOUT_65_ansi_blocker( | ||||
|         KC_GRV,  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_MUTE, | ||||
|         _______, RGB_TOG, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,  | ||||
|         _______, RGB_MOD, RGB_VAD, RGB_SPD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______,          _______, KC_VOLU, | ||||
|         _______, RM_TOGG, RM_VALU, RM_SPDU, RM_HUEU, RM_SATU, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_END,  | ||||
|         _______, RM_NEXT, RM_VALD, RM_SPDD, RM_HUED, RM_SATD, _______, _______, _______, _______, _______, _______,          _______, KC_VOLU, | ||||
|         _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______,          KC_PGUP, KC_VOLD, | ||||
|         _______, _______, _______,                            EE_CLR,                             KC_APP,  _______, KC_HOME, KC_PGDN, KC_END | ||||
|     ) | ||||
|  | ||||
| @ -30,8 +30,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [1] = LAYOUT_tkl_f13_ansi( | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,    _______, _______, _______, | ||||
|         _______, RGB_TOG, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, | ||||
|         _______, RGB_MOD, RGB_VAD, RGB_SPD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______,          _______, | ||||
|         _______, RM_TOGG, RM_VALU, RM_SPDU, RM_HUEU, RM_SATU, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, | ||||
|         _______, RM_NEXT, RM_VALD, RM_SPDD, RM_HUED, RM_SATD, _______, _______, _______, _______, _______, _______,          _______, | ||||
|         _______,          RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,_______, NK_TOGG, _______, _______, _______, _______,          _______,             _______, | ||||
|         _______, _______, _______,                            EE_CLR,                             _______, _______, _______, _______,    _______, _______, _______ | ||||
|     ) | ||||
|  | ||||
| @ -14,8 +14,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [1] = LAYOUT_tkl_ansi( | ||||
|         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    KC_MUTE, _______, _______, | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    KC_MPLY, KC_MSTP, KC_VOLU, | ||||
|         _______, RGB_TOG, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______,    KC_MPRV, KC_MNXT, KC_VOLD, | ||||
|         _______, RGB_MOD, RGB_VAD, RGB_SPD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______,          _______, | ||||
|         _______, RM_TOGG, RM_VALU, RM_SPDU, RM_HUEU, RM_SATU, _______, _______, _______, _______, _______, _______, _______, _______,    KC_MPRV, KC_MNXT, KC_VOLD, | ||||
|         _______, RM_NEXT, RM_VALD, RM_SPDD, RM_HUED, RM_SATD, _______, _______, _______, _______, _______, _______,          _______, | ||||
|         _______,          RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,QK_BOOT, NK_TOGG, _______, _______, _______, _______,          _______,             _______, | ||||
|         _______, _______, _______,                            EE_CLR,                             _______, _______, _______, _______,    _______, _______, _______ | ||||
|     ) | ||||
|  | ||||
| @ -28,7 +28,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||||
| 
 | ||||
|     if (!record->event.pressed) { | ||||
|         switch (keycode) { | ||||
|             case RGB_TOG: | ||||
|             case QK_RGB_MATRIX_TOGGLE: | ||||
|                 switch (rgb_matrix_get_flags()) { | ||||
|                     case LED_FLAG_ALL: | ||||
|                         rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR); | ||||
|  | ||||
| @ -31,8 +31,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [1] = LAYOUT( | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_MPLY, | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______, | ||||
|         _______, RGB_TOG, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______,          KC_HOME, | ||||
|         _______, RGB_MOD, RGB_VAD, RGB_SPD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______,          _______,          KC_END, | ||||
|         _______, RM_TOGG, RM_VALU, RM_SPDU, RM_HUEU, RM_SATU, _______, _______, _______, _______, _______, _______, _______, _______,          KC_HOME, | ||||
|         _______, RM_NEXT, RM_VALD, RM_SPDD, RM_HUED, RM_SATD, _______, _______, _______, _______, _______, _______,          _______,          KC_END, | ||||
|         _______,          RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,_______, NK_TOGG, _______, _______, _______, _______,          _______, _______, | ||||
|         _______, _______, _______,                            EE_CLR,                             KC_APP,  _______, _______, _______, _______, _______ | ||||
|     ) | ||||
|  | ||||
| @ -38,8 +38,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [1] = LAYOUT( | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_MPLY, | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,          _______, | ||||
|         _______, RGB_TOG, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______,          KC_HOME, | ||||
|         _______, RGB_MOD, RGB_VAD, RGB_SPD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______,          _______,          KC_END, | ||||
|         _______, RM_TOGG, RM_VALU, RM_SPDU, RM_HUEU, RM_SATU, _______, _______, _______, _______, _______, _______, _______, _______,          KC_HOME, | ||||
|         _______, RM_NEXT, RM_VALD, RM_SPDD, RM_HUED, RM_SATD, _______, _______, _______, _______, _______, _______,          _______,          KC_END, | ||||
|         _______,          RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,_______, NK_TOGG, _______, _______, _______, _______,          _______, _______, | ||||
|         MO(2),   _______, _______,                            EE_CLR,                             KC_APP,  _______, _______, _______, _______, _______ | ||||
|     ), | ||||
|  | ||||
| @ -14,8 +14,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [1] = LAYOUT_1800_ansi( | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,           KC_MPLY, KC_MSTP, KC_VOLU, KC_MUTE, | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_MPRV, KC_MNXT, KC_VOLD, KC_SCRL, | ||||
|         _______, RGB_TOG, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, | ||||
|         _______, RGB_MOD, RGB_VAD, RGB_SPD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, | ||||
|         _______, RM_TOGG, RM_VALU, RM_SPDU, RM_HUEU, RM_SATU, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, | ||||
|         _______, RM_NEXT, RM_VALD, RM_SPDD, RM_HUED, RM_SATD, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, | ||||
|         _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,QK_BOOT, NK_TOGG, _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______, | ||||
|         _______, _______, _______,                   EE_CLR,                             KC_APP,  _______,          _______, _______, _______,          _______, _______ | ||||
|     ) | ||||
|  | ||||
| @ -26,16 +26,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [0] = LAYOUT(LAYER_SWITCH, G(KC_C), G(KC_V)), | ||||
| 
 | ||||
|     /* RGB Toggle + Mode Change */ | ||||
|     [1] = LAYOUT(LAYER_SWITCH, RGB_TOG, RGB_MOD), | ||||
|     [1] = LAYOUT(LAYER_SWITCH, UG_TOGG, UG_NEXT), | ||||
| 
 | ||||
|     /* RGB Brightness */ | ||||
|     [2] = LAYOUT(LAYER_SWITCH, RGB_VAD, RGB_VAI), | ||||
|     [2] = LAYOUT(LAYER_SWITCH, UG_VALD, UG_VALU), | ||||
| 
 | ||||
|     /* RGB Hue */ | ||||
|     [3] = LAYOUT(LAYER_SWITCH, RGB_HUD, RGB_HUI), | ||||
|     [3] = LAYOUT(LAYER_SWITCH, UG_HUED, UG_HUEU), | ||||
| 
 | ||||
|     /* RGB Saturation */ | ||||
|     [4] = LAYOUT(LAYER_SWITCH, RGB_SAD, RGB_SAI), | ||||
|     [4] = LAYOUT(LAYER_SWITCH, UG_SATD, UG_SATU), | ||||
| 
 | ||||
| }; | ||||
| 
 | ||||
|  | ||||
| @ -26,16 +26,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [0] = LAYOUT(LAYER_SWITCH, C(KC_C), C(KC_V)), | ||||
| 
 | ||||
|     /* RGB Toggle + Mode Change */ | ||||
|     [1] = LAYOUT(LAYER_SWITCH, RGB_TOG, RGB_MOD), | ||||
|     [1] = LAYOUT(LAYER_SWITCH, UG_TOGG, UG_NEXT), | ||||
| 
 | ||||
|     /* RGB Brightness */ | ||||
|     [2] = LAYOUT(LAYER_SWITCH, RGB_VAD, RGB_VAI), | ||||
|     [2] = LAYOUT(LAYER_SWITCH, UG_VALD, UG_VALU), | ||||
| 
 | ||||
|     /* RGB Hue */ | ||||
|     [3] = LAYOUT(LAYER_SWITCH, RGB_HUD, RGB_HUI), | ||||
|     [3] = LAYOUT(LAYER_SWITCH, UG_HUED, UG_HUEU), | ||||
| 
 | ||||
|     /* RGB Saturation */ | ||||
|     [4] = LAYOUT(LAYER_SWITCH, RGB_SAD, RGB_SAI), | ||||
|     [4] = LAYOUT(LAYER_SWITCH, UG_SATD, UG_SATU), | ||||
| 
 | ||||
| }; | ||||
| 
 | ||||
|  | ||||
| @ -343,7 +343,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||||
|                 eeconfig_update_kb(keyboard_config.raw); | ||||
|             } | ||||
|             break; | ||||
|         case RGB_TOG: | ||||
|         case QK_RGB_MATRIX_TOGGLE: | ||||
|             if (record->event.pressed) { | ||||
|                 switch (rgb_matrix_get_flags()) { | ||||
|                     case LED_FLAG_ALL: { | ||||
|  | ||||
| @ -73,9 +73,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|   KC_TRNS, KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_GRV,               KC_DOWN, KC_4,    KC_5,    KC_6,    KC_PLUS, KC_TRNS, | ||||
|   KC_TRNS, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_TRNS,     KC_TRNS, KC_AMPR, KC_1,    KC_2,    KC_3,    KC_BSLS, KC_TRNS, | ||||
|   EE_CLR,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                         KC_TRNS, KC_DOT,  KC_0,    KC_EQL,  KC_TRNS, | ||||
|                                                RGB_MOD, KC_TRNS,     RGB_TOG, RGB_M_P, | ||||
|                                                RM_NEXT, KC_TRNS,     RM_TOGG, RGB_M_P, | ||||
|                                                         KC_TRNS,     KC_TRNS, | ||||
|                                       RGB_VAD, RGB_VAI, KC_TRNS,     KC_TRNS, RGB_HUD, RGB_HUI | ||||
|                                       RM_VALD, RM_VALU, KC_TRNS,     KC_TRNS, RM_HUED, RM_HUEU | ||||
| ), | ||||
| /* Keymap 2: Media and mouse keys
 | ||||
|  * | ||||
|  | ||||
| @ -73,9 +73,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|   KC_TRNS, KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN, KC_GRV,               KC_DOWN, KC_4,    KC_5,    KC_6,    KC_PLUS, KC_TRNS, | ||||
|   KC_TRNS, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_TILD, KC_TRNS,     KC_TRNS, KC_AMPR, KC_1,    KC_2,    KC_3,    KC_BSLS, KC_TRNS, | ||||
|   EE_CLR,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                         KC_TRNS, KC_DOT,  KC_0,    KC_EQL,  KC_TRNS, | ||||
|                                                RGB_MOD, KC_TRNS,     RGB_TOG, RGB_M_P, | ||||
|                                                UG_NEXT, KC_TRNS,     UG_TOGG, RGB_M_P, | ||||
|                                                         KC_TRNS,     KC_TRNS, | ||||
|                                       RGB_VAD, RGB_VAI, KC_TRNS,     KC_TRNS, RGB_HUD, RGB_HUI | ||||
|                                       UG_VALD, UG_VALU, KC_TRNS,     KC_TRNS, UG_HUED, UG_HUEU | ||||
| ), | ||||
| /* Keymap 2: Media and mouse keys
 | ||||
|  * | ||||
|  | ||||
| @ -95,18 +95,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|        KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV, | ||||
|        EPRM,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS, | ||||
|           KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, | ||||
|                                        RGB_MOD,RGB_LYR, | ||||
|                                        UG_NEXT,RGB_LYR, | ||||
|                                                KC_TRNS, | ||||
|                                RGB_VAD,RGB_VAI,KC_TRNS, | ||||
|                                UG_VALD,UG_VALU,KC_TRNS, | ||||
|        // right hand
 | ||||
|        KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11, | ||||
|        KC_TRNS, KC_UP,   KC_7,   KC_8,    KC_9,    KC_ASTR, KC_F12, | ||||
|                 KC_DOWN, KC_4,   KC_5,    KC_6,    KC_PLUS, KC_TRNS, | ||||
|        KC_TRNS, KC_AMPR, KC_1,   KC_2,    KC_3,    KC_BSLS, KC_TRNS, | ||||
|                          KC_TRNS,KC_DOT,  KC_0,    KC_EQL,  KC_TRNS, | ||||
|        RGB_TOG, RGB_SLD, | ||||
|        UG_TOGG, RGB_SLD, | ||||
|        KC_TRNS, | ||||
|        KC_TRNS, RGB_HUD, RGB_HUI | ||||
|        KC_TRNS, UG_HUED, UG_HUEU | ||||
| ), | ||||
| /* Keymap 2: Media and mouse keys
 | ||||
|  * | ||||
| @ -189,7 +189,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||||
|             } | ||||
|         } | ||||
|         return false; | ||||
|     case RGB_MOD ... RGB_M_G: // For any of the RGB codes (see quantum_keycodes.h, L400 for reference)
 | ||||
|     case UNDERGLOW_KEYCODE_RANGE: // For any of the RGB codes (see quantum_keycodes.h, L400 for reference)
 | ||||
|         if (record->event.pressed) { //This disables layer indication, as it's assumed that if you're changing this ... you want that disabled
 | ||||
|             if (user_config.rgb_layer_change) {        // only if this is enabled
 | ||||
|                 user_config.rgb_layer_change = false;  // disable it, and
 | ||||
|  | ||||
| @ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
| 
 | ||||
|   [0] = LAYOUT_ergodox(KC_EQUAL,KC_1,KC_2,KC_3,KC_4,KC_5,LCTL(KC_MINUS),KC_DELETE,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_LBRC,KC_BSPC,KC_A,KC_S,KC_D,KC_F,KC_G,SC_LSPO,CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,ALL_T(KC_NO),LT(1,KC_GRAVE),KC_QUOTE,LALT(KC_LSFT),KC_LEFT,KC_RIGHT,ALT_T(KC_APPLICATION),KC_LGUI,KC_HOME,KC_SPACE,KC_UNDS,KC_END,LCTL(KC_EQUAL),KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINUS,KC_RBRC,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSLS,KC_H,ALT_T(KC_J),KC_K,KC_L,LT(2,KC_SCLN),GUI_T(KC_QUOTE),MEH_T(KC_NO),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),SC_RSPC,KC_UP,KC_DOWN,KC_LBRC,KC_RBRC,TT(1),KC_LALT,CTL_T(KC_ESCAPE),KC_PGUP,KC_PGDN,LT(1,KC_TAB),KC_ENTER), | ||||
| 
 | ||||
|   [1] = LAYOUT_ergodox(KC_TRANSPARENT,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,LCTL(KC_W),KC_LBRC,KC_RBRC,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,LCTL(KC_PGUP),LCTL(KC_PGDN),RGB_MOD,KC_TRANSPARENT,KC_TRANSPARENT,RGB_VAD,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_F12,KC_AMPR,KC_UNDS,KC_MINUS,KC_SCLN,KC_PLUS,KC_TRANSPARENT,KC_TRANSPARENT,KC_PIPE,KC_AT,KC_EQUAL,KC_PERC,KC_BSLS,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,RGB_TOG,RGB_SLD,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,RGB_HUI), | ||||
|   [1] = LAYOUT_ergodox(KC_TRANSPARENT,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,LCTL(KC_W),KC_LBRC,KC_RBRC,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,LCTL(KC_PGUP),LCTL(KC_PGDN),UG_NEXT,KC_TRANSPARENT,KC_TRANSPARENT,UG_VALD,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_F12,KC_AMPR,KC_UNDS,KC_MINUS,KC_SCLN,KC_PLUS,KC_TRANSPARENT,KC_TRANSPARENT,KC_PIPE,KC_AT,KC_EQUAL,KC_PERC,KC_BSLS,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,UG_TOGG,RGB_SLD,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,UG_HUEU), | ||||
| 
 | ||||
|   [2] = LAYOUT_ergodox(KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_UP,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_LEFT,KC_MS_DOWN,KC_MS_RIGHT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_BTN1,KC_MS_BTN2,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MEDIA_PLAY_PAUSE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MEDIA_PREV_TRACK,KC_MEDIA_NEXT_TRACK,KC_TRANSPARENT,KC_TRANSPARENT,KC_AUDIO_VOL_UP,KC_AUDIO_VOL_DOWN,KC_AUDIO_MUTE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_WWW_BACK), | ||||
| 
 | ||||
|  | ||||
| @ -92,18 +92,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
| */ | ||||
|     /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15     */ | ||||
|     [_FN] = LAYOUT( | ||||
|                 QK_BOOT, KC_MYCM, KC_WHOM, KC_CALC, KC_SLCT, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_MAIL, _______,          RGB_TOG, | ||||
|                 NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______,          RGB_MOD, | ||||
|                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______,          RGB_HUI, | ||||
|                 _______, _______, KC_SCRL, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, RGB_SAI, | ||||
|                 _______,          _______, _______, _______, _______, _______, KC_NUM,  _______, _______, _______, _______,          _______, RGB_VAI, RGB_SAD, | ||||
|                 _______, GU_TOGG, _______,                            _______,                   _______, _______,          _______, _______, RGB_VAD, _______ | ||||
|                 QK_BOOT, KC_MYCM, KC_WHOM, KC_CALC, KC_SLCT, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_MAIL, _______,          RM_TOGG, | ||||
|                 NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_SPDD, RM_SPDU, _______,          RM_NEXT, | ||||
|                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______,          RM_HUEU, | ||||
|                 _______, _______, KC_SCRL, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, RM_SATU, | ||||
|                 _______,          _______, _______, _______, _______, _______, KC_NUM,  _______, _______, _______, _______,          _______, RM_VALU, RM_SATD, | ||||
|                 _______, GU_TOGG, _______,                            _______,                   _______, _______,          _______, _______, RM_VALD, _______ | ||||
|             ), | ||||
| }; | ||||
| 
 | ||||
| bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||||
|     switch (keycode) { | ||||
|         case RGB_TOG: | ||||
|         case QK_RGB_MATRIX_TOGGLE: | ||||
|             if (record->event.pressed) { | ||||
|                 switch (rgb_matrix_get_flags()) { | ||||
|                     case LED_FLAG_ALL: { | ||||
|  | ||||
| @ -58,7 +58,7 @@ led_config_t g_led_config = { { | ||||
| 
 | ||||
| bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||||
|     switch (keycode) { | ||||
|         case RGB_TOG: | ||||
|         case QK_RGB_MATRIX_TOGGLE: | ||||
|             if (record->event.pressed) { | ||||
|                 switch (rgb_matrix_get_flags()) { | ||||
|                     case LED_FLAG_ALL: { | ||||
|  | ||||
| @ -89,11 +89,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14        15       16     */ | ||||
| 	[1] = LAYOUT_all( | ||||
|                 KC_SLEP, RGB_M_T, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_WREF, KC_WSTP, _______, _______, _______, _______, EE_CLR,           _______,  KC_VOLD, KC_VOLU, | ||||
|                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI,  RGB_SAI, RGB_SPI, | ||||
|                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD,  RGB_SAD, RGB_SPD, | ||||
|                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_TOG, | ||||
|                 _______, _______, _______, _______, KC_CALC, _______, _______, _______, _______, _______, _______, _______, _______, _______,           RGB_VAI, | ||||
|                 _______, _______, _______,                   _______,                                     _______, _______, _______,          RGB_RMOD, RGB_VAD, RGB_MOD | ||||
|                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_HUEU,  RM_SATU, RM_SPDU, | ||||
|                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_HUED,  RM_SATD, RM_SPDD, | ||||
|                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RM_TOGG, | ||||
|                 _______, _______, _______, _______, KC_CALC, _______, _______, _______, _______, _______, _______, _______, _______, _______,           RM_VALU, | ||||
|                 _______, _______, _______,                   _______,                                     _______, _______, _______,          RM_PREV,  RM_VALD, RM_NEXT | ||||
|     ), | ||||
| 
 | ||||
| /*
 | ||||
| @ -115,11 +115,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14        15       16     */ | ||||
| 	[2] = LAYOUT_all( | ||||
|                 KC_SLEP, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_WREF, KC_WSTP, _______, _______, _______, _______, _______, _______,          _______,  KC_VOLD, KC_VOLU, | ||||
|                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI,  RGB_SAI, RGB_SPI, | ||||
|                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD,  RGB_SAD, RGB_SPD, | ||||
|                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_TOG, | ||||
|                 _______, _______, _______, _______, KC_CALC, _______, _______, _______, _______, _______, _______, _______, _______, _______,           RGB_VAI, | ||||
|                 _______, _______, _______,                   _______,                                     _______, _______, _______,          RGB_RMOD, RGB_VAD, RGB_MOD | ||||
|                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_HUEU,  RM_SATU, RM_SPDU, | ||||
|                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_HUED,  RM_SATD, RM_SPDD, | ||||
|                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RM_TOGG, | ||||
|                 _______, _______, _______, _______, KC_CALC, _______, _______, _______, _______, _______, _______, _______, _______, _______,           RM_VALU, | ||||
|                 _______, _______, _______,                   _______,                                     _______, _______, _______,          RM_PREV,  RM_VALD, RM_NEXT | ||||
|     ), | ||||
| 
 | ||||
| /*
 | ||||
| @ -141,11 +141,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14        15       16     */ | ||||
| 	[3] = LAYOUT_all( | ||||
|                 KC_SLEP, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_WREF, KC_WSTP, _______, _______, _______, _______, _______, _______,          _______,  KC_VOLD, KC_VOLU, | ||||
|                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI,  RGB_SAI, RGB_SPI, | ||||
|                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD,  RGB_SAD, RGB_SPD, | ||||
|                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_TOG, | ||||
|                 _______, _______, _______, _______, KC_CALC, _______, _______, _______, _______, _______, _______, _______, _______, _______,           RGB_VAI, | ||||
|                 _______, _______, _______,                   _______,                                     _______, _______, _______,          RGB_RMOD, RGB_VAD, RGB_MOD | ||||
|                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_HUEU,  RM_SATU, RM_SPDU, | ||||
|                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_HUED,  RM_SATD, RM_SPDD, | ||||
|                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RM_TOGG, | ||||
|                 _______, _______, _______, _______, KC_CALC, _______, _______, _______, _______, _______, _______, _______, _______, _______,           RM_VALU, | ||||
|                 _______, _______, _______,                   _______,                                     _______, _______, _______,          RM_PREV,  RM_VALD, RM_NEXT | ||||
|     ), | ||||
| }; | ||||
| 
 | ||||
|  | ||||
| @ -187,7 +187,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|  */ | ||||
| [_ADJUST] = LAYOUT( | ||||
|   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, | ||||
|   QK_BOOT, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, KC_DEL, | ||||
|   QK_BOOT, UG_TOGG, UG_NEXT, UG_HUEU, UG_HUED, UG_SATU, UG_SATD, UG_VALU, UG_VALD, _______, _______, _______, _______, _______, KC_DEL, | ||||
|   _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, _______, _______, _______, AG_SWAP, QWERTY,  COLEMAK, _______,  _______,  _______, | ||||
|   _______, AU_PREV, AU_NEXT, MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, BL_DOWN, BL_UP,   BL_STEP, BL_TOGG, | ||||
|   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ | ||||
| @ -282,7 +282,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||||
|       } | ||||
|       return false; | ||||
|       break; | ||||
|     case RGB_MOD: | ||||
|     case QK_UNDERGLOW_MODE_NEXT: | ||||
|       //led operations - RGB mode change now updates the RGB_current_mode to allow the right RGB mode to be set after reactive keys are released
 | ||||
|       if (record->event.pressed) { | ||||
|         rgblight_mode(RGB_current_mode); | ||||
|  | ||||
| @ -190,7 +190,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|  */ | ||||
| [_ADJUST] = LAYOUT( | ||||
|   QK_BOOT,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_VOLD, KC_VOLU, KC_MUTE, | ||||
|   _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______,  KC_DEL, _______, _______, _______, | ||||
|   _______, UG_TOGG, UG_NEXT, UG_HUEU, UG_HUED, UG_SATU, UG_SATD, UG_VALU, UG_VALD, _______, _______,  KC_DEL, _______, _______, _______, | ||||
|   _______, _______, _______,   AU_ON,  AU_OFF, AG_NORM, AG_SWAP,  QWERTY, _______, _______, _______, _______, _______, _______, _______, | ||||
|   _______, AU_PREV, AU_NEXT,   MU_ON,  MU_OFF,   MI_ON,  MI_OFF, _______, BL_DOWN, BL_UP,   BL_STEP, BL_TOGG, _______, _______, _______, | ||||
|   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ | ||||
| @ -298,7 +298,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||||
|       } | ||||
|       return false; | ||||
|       break; | ||||
|     case RGB_MOD: | ||||
|     case QK_UNDERGLOW_MODE_NEXT: | ||||
|       //led operations - RGB mode change now updates the RGB_current_mode to allow the right RGB mode to be set after reactive keys are released
 | ||||
|       if (record->event.pressed) { | ||||
|         rgblight_mode(RGB_current_mode); | ||||
|  | ||||
| @ -159,8 +159,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|   [_ADJUST] =  LAYOUT( | ||||
|       _______, QK_BOOT, RGBRST,  _______, _______, _______,                   _______, _______, _______, _______, _______, _______, | ||||
|       _______, AU_ON,   AU_OFF,  MU_TOGG, MU_NEXT, AG_NORM,                   AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, | ||||
|       _______, CK_TOGG, CK_RST,  CK_UP,   CK_DOWN, _______,                   _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, | ||||
|       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD | ||||
|       _______, CK_TOGG, CK_RST,  CK_UP,   CK_DOWN, _______,                   _______, _______, UG_TOGG, UG_HUEU, UG_SATU, UG_VALU, | ||||
|       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, UG_NEXT, UG_HUED, UG_SATD, UG_VALD | ||||
|       ) | ||||
| }; | ||||
| 
 | ||||
| @ -275,7 +275,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||||
|         return false; | ||||
|         break; | ||||
|       //led operations - RGB mode change now updates the RGB_current_mode to allow the right RGB mode to be set after reactive keys are released
 | ||||
|     case RGB_MOD: | ||||
|     case QK_UNDERGLOW_MODE_NEXT: | ||||
|       #ifdef RGBLIGHT_ENABLE | ||||
|         if (record->event.pressed) { | ||||
|           rgblight_mode(RGB_current_mode); | ||||
|  | ||||
| @ -173,8 +173,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|       KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                     KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, | ||||
|       _______, QK_BOOT, RGBRST,  _______, _______, _______,                   _______, _______, _______, _______, _______, KC_DEL, | ||||
|       _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM,                   AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, | ||||
|       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, | ||||
|       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD | ||||
|       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, UG_TOGG, UG_HUEU, UG_SATU, UG_VALU, | ||||
|       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, UG_NEXT, UG_HUED, UG_SATD, UG_VALD | ||||
|       ) | ||||
| }; | ||||
| 
 | ||||
| @ -287,7 +287,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||||
|         return false; | ||||
|         break; | ||||
|       //led operations - RGB mode change now updates the RGB_current_mode to allow the right RGB mode to be set after reactive keys are released
 | ||||
|     case RGB_MOD: | ||||
|     case QK_UNDERGLOW_MODE_NEXT: | ||||
|       #ifdef RGBLIGHT_ENABLE | ||||
|         if (record->event.pressed) { | ||||
|           rgblight_mode(RGB_current_mode); | ||||
|  | ||||
| @ -183,8 +183,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|   [_ADJUST] =  LAYOUT( | ||||
|     XXXXXXX, QK_BOOT, RGBRST,  XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, QK_BOOT, RGBRST,  XXXXXXX, XXXXXXX, XXXXXXX, | ||||
|     XXXXXXX, DL_BAS,  DL_BASE, AG_NORM, AG_SWAP, XXXXXXX,                   XXXXXXX, DL_BAS,  DL_BASE, AG_NORM, AG_SWAP, XXXXXXX, | ||||
|     XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX,                   XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, | ||||
|     XXXXXXX, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, | ||||
|     XXXXXXX, UG_TOGG, UG_HUEU, UG_SATU, UG_VALU, XXXXXXX,                   XXXXXXX, UG_TOGG, UG_HUEU, UG_SATU, UG_VALU, XXXXXXX, | ||||
|     XXXXXXX, UG_NEXT, UG_HUED, UG_SATD, UG_VALD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, UG_NEXT, UG_HUED, UG_SATD, UG_VALD, XXXXXXX, | ||||
|     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ | ||||
|     ), | ||||
| }; | ||||
| @ -255,7 +255,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||||
|   switch (keycode) { | ||||
|     #ifdef RGBLIGHT_ENABLE | ||||
|       //led operations - RGB mode change now updates the RGB_current_mode to allow the right RGB mode to be set after reactive keys are released
 | ||||
|       case RGB_MOD: | ||||
|       case QK_UNDERGLOW_MODE_NEXT: | ||||
|           if (record->event.pressed) { | ||||
|             rgblight_mode(RGB_current_mode); | ||||
|             rgblight_step(); | ||||
|  | ||||
| @ -84,16 +84,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15     */ | ||||
|     [_FN]   = LAYOUT_65_ansi( | ||||
|                 _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           _______, QK_BOOT, | ||||
|                 _______,          _______, KC_UP,   _______, _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, _______, _______, RGB_HUI, RGB_MOD, | ||||
|                 _______,          KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, _______,          KC_HOME, | ||||
|                          _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,          _______, RGB_VAI, KC_END, | ||||
|                 _______, _______,          _______,                   _______,                            _______, _______, KC_APP,  RGB_SPD, RGB_VAD, RGB_SPI | ||||
|                 _______,          _______, KC_UP,   _______, _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, _______, _______, RM_HUEU, RM_NEXT, | ||||
|                 _______,          KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, RM_TOGG, _______, _______, _______,          KC_HOME, | ||||
|                          _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,          _______, RM_VALU, KC_END, | ||||
|                 _______, _______,          _______,                   _______,                            _______, _______, KC_APP,  RM_SPDD, RM_VALD, RM_SPDU | ||||
|             ), | ||||
| }; | ||||
| 
 | ||||
| bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||||
|     switch (keycode) { | ||||
|         case RGB_TOG: | ||||
|         case QK_RGB_MATRIX_TOGGLE: | ||||
|             if (record->event.pressed) { | ||||
|                 switch (rgb_matrix_get_flags()) { | ||||
|                     case LED_FLAG_ALL: { | ||||
|  | ||||
| @ -88,11 +88,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
| */ | ||||
|     /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15        16     */ | ||||
|     [_FN]   = LAYOUT_tkl_ansi( | ||||
|                 QK_BOOT, KC_MSEL, KC_VOLD, KC_VOLU, KC_MUTE, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MAIL, KC_WHOM, KC_CALC, KC_WSCH,          RGB_RMOD, RGB_MOD, RGB_TOG, | ||||
|                 NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, RGB_C_E,  _______, _______, | ||||
|                 QK_BOOT, KC_MSEL, KC_VOLD, KC_VOLU, KC_MUTE, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MAIL, KC_WHOM, KC_CALC, KC_WSCH,          RM_PREV, RM_NEXT, RM_TOGG, | ||||
|                 NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_SPDD, RM_SPDU, _______, RGB_C_E,  _______, _______, | ||||
|                 _______, G1_HUD,  G1_HUI,  G1_SAD,  G1_SAI,  G1_VAD,  G1_VAI,  _______, _______, _______, _______, _______, _______, _______, _______,  _______, TG(_WAVE), | ||||
|                 _______, G2_HUD,  G2_HUI,  G2_SAD,  G2_SAI,  G2_VAD,  G2_VAI,  _______, _______, _______, _______, _______,          _______, | ||||
|                 _______,          G_PRE,   REF_G,   G_FLIP,  _______, _______, _______, _______, _______, _______, _______,          _______,           RGB_VAI, | ||||
|                 _______, _______, _______, _______, _______, _______, _______,          _______,                                              RGB_HUD,  RGB_VAD, RGB_HUI | ||||
|                 _______,          G_PRE,   REF_G,   G_FLIP,  _______, _______, _______, _______, _______, _______, _______,          _______,           RM_VALU, | ||||
|                 _______, _______, _______, _______, _______, _______, _______,          _______,                                              RM_HUED,  RM_VALD, RM_HUEU | ||||
|             ), | ||||
| }; | ||||
|  | ||||
| @ -229,7 +229,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||||
|                 } | ||||
|             } | ||||
|             return false; | ||||
|         case RGB_TOG: | ||||
|         case QK_RGB_MATRIX_TOGGLE: | ||||
|             if (record->event.pressed) { | ||||
|                 switch (rgb_matrix_get_flags()) { | ||||
|                     case LED_FLAG_ALL: { | ||||
|  | ||||
| @ -76,10 +76,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
| */ | ||||
|     /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14     */ | ||||
|     [_FN]   = LAYOUT_65_ansi_blocker( | ||||
|                 KC_GRV,  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, | ||||
|                 QK_BOOT, _______, KC_MS_U, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, RGB_SPD, RGB_SPI, _______, RGB_MOD, | ||||
|                 KC_GRV,  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, | ||||
|                 QK_BOOT, _______, KC_MS_U, _______, _______, _______, _______, _______, _______, RM_SATD, RM_SATU, RM_SPDD, RM_SPDU, _______, RM_NEXT, | ||||
|                 _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, | ||||
|                 _______,          _______, _______, KC_CALC, _______, _______, NK_TOGG, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, RGB_VAI, _______, | ||||
|                 _______, _______, _______,                            _______,                   _______, _______,          RGB_HUD, RGB_VAD, RGB_HUI | ||||
|                 _______,          _______, _______, KC_CALC, _______, _______, NK_TOGG, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, RM_VALU, _______, | ||||
|                 _______, _______, _______,                            _______,                   _______, _______,          RM_HUED, RM_VALD, RM_HUEU | ||||
|             ) | ||||
| }; | ||||
|  | ||||
| @ -19,7 +19,7 @@ | ||||
| #ifdef RGB_MATRIX_ENABLE | ||||
| bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||||
|     switch (keycode) { | ||||
|         case RGB_TOG: | ||||
|         case QK_RGB_MATRIX_TOGGLE: | ||||
|             if (record->event.pressed) { | ||||
|                 switch (rgb_matrix_get_flags()) { | ||||
|                     case LED_FLAG_ALL: { | ||||
| @ -35,7 +35,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||||
|                 } | ||||
|             } | ||||
|             return false; | ||||
|         case RGB_MOD: | ||||
|         case QK_RGB_MATRIX_MODE_NEXT: | ||||
|             if (record->event.pressed) { | ||||
|                 switch (rgb_matrix_get_mode()) { | ||||
|                     case RGB_MATRIX_SOLID_MULTISPLASH: | ||||
| @ -47,7 +47,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||||
|                 } | ||||
|             } | ||||
|             return false; | ||||
|         case RGB_RMOD: | ||||
|         case QK_RGB_MATRIX_MODE_PREVIOUS: | ||||
|             if (record->event.pressed) { | ||||
|                 switch (rgb_matrix_get_mode()) { | ||||
|                     case RGB_MATRIX_SOLID_COLOR: | ||||
|  | ||||
| @ -18,20 +18,5 @@ | ||||
|  */ | ||||
| #pragma once | ||||
| 
 | ||||
| /*
 | ||||
|  * Feature disable options | ||||
|  *  These options are also useful to firmware size reduction. | ||||
|  */ | ||||
| 
 | ||||
| /* disable debug print */ | ||||
| //#define NO_DEBUG
 | ||||
| 
 | ||||
| /* disable print */ | ||||
| //#define NO_PRINT
 | ||||
| 
 | ||||
| #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND | ||||
| #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC | ||||
| 
 | ||||
| #if defined(RGB_MATRIX_ENABLE) && defined(RGBLIGHT_ENABLE) | ||||
|     #define RGB_MATRIX_DISABLE_KEYCODES | ||||
| #endif | ||||
|  | ||||
| @ -17,7 +17,7 @@ | ||||
|     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||
|  */ | ||||
| 
 | ||||
| #include "hotswap.h" | ||||
| #include "quantum.h" | ||||
| 
 | ||||
| #ifdef RGB_MATRIX_ENABLE | ||||
| const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = { | ||||
| @ -163,43 +163,3 @@ bool rgb_matrix_indicators_kb(void) { | ||||
| } | ||||
| 
 | ||||
| #endif  //RGB_MATRIX_ENABLE
 | ||||
| 
 | ||||
| bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||||
|     if (!process_record_user(keycode, record)) { | ||||
|         return false; | ||||
|     } | ||||
| 
 | ||||
|     if (record->event.pressed) { | ||||
|         switch(keycode) { | ||||
| #if defined(RGB_MATRIX_DISABLE_KEYCODES) | ||||
|         case RGB_MATRIX_TOGGLE: // toggle rgb matrix
 | ||||
|             rgb_matrix_toggle(); | ||||
|             return false; | ||||
|         case RGB_MATRIX_STEP: | ||||
|             rgb_matrix_step(); | ||||
|             return false; | ||||
|         case RGB_MATRIX_INC_HUE: | ||||
|             rgb_matrix_increase_hue(); | ||||
|             return false; | ||||
|         case RGB_MATRIX_DEC_HUE: | ||||
|             rgb_matrix_decrease_hue(); | ||||
|             return false; | ||||
|         case RGB_MATRIX_INC_SAT: | ||||
|             rgb_matrix_increase_sat(); | ||||
|             return false; | ||||
|         case RGB_MATRIX_DEC_SAT: | ||||
|             rgb_matrix_decrease_sat(); | ||||
|             return false; | ||||
|         case RGB_MATRIX_INC_VAL: | ||||
|             rgb_matrix_increase_val(); | ||||
|             return false; | ||||
|         case RGB_MATRIX_DEC_VAL: | ||||
|             rgb_matrix_decrease_val(); | ||||
|             return false; | ||||
| #endif | ||||
|             default: | ||||
|             break; | ||||
|         } | ||||
|     } | ||||
|     return true; | ||||
| } | ||||
|  | ||||
| @ -1,48 +0,0 @@ | ||||
| /**
 | ||||
|   * @file hotswap.h | ||||
|   * | ||||
|     Copyright 2020 astro <yuleiz@gmail.com> | ||||
| 
 | ||||
|     This program is free software: you can redistribute it and/or modify | ||||
|     it under the terms of the GNU General Public License as published by | ||||
|     the Free Software Foundation, either version 2 of the License, or | ||||
|     (at your option) any later version. | ||||
| 
 | ||||
|     This program is distributed in the hope that it will be useful, | ||||
|     but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
|     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
|     GNU General Public License for more details. | ||||
| 
 | ||||
|     You should have received a copy of the GNU General Public License | ||||
|     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||
|   */ | ||||
| #pragma once | ||||
| 
 | ||||
| #include "quantum.h" | ||||
| 
 | ||||
| #if defined(RGB_MATRIX_DISABLE_KEYCODES) | ||||
| #    ifndef RGB_MATRIX_TOGGLE | ||||
| #        define RGB_MATRIX_TOGGLE   KC_F16 | ||||
| #    endif | ||||
| #    ifndef RGB_MATRIX_STEP | ||||
| #        define RGB_MATRIX_STEP     KC_F17 | ||||
| #    endif | ||||
| #    ifndef RGB_MATRIX_INC_HUE | ||||
| #        define RGB_MATRIX_INC_HUE  KC_F18 | ||||
| #    endif | ||||
| #    ifndef RGB_MATRIX_DEC_HUE | ||||
| #        define RGB_MATRIX_DEC_HUE  KC_F19 | ||||
| #    endif | ||||
| #    ifndef RGB_MATRIX_INC_SAT | ||||
| #        define RGB_MATRIX_INC_SAT  KC_F20 | ||||
| #    endif | ||||
| #    ifndef RGB_MATRIX_DEC_SAT | ||||
| #        define RGB_MATRIX_DEC_SAT  KC_F21 | ||||
| #    endif | ||||
| #    ifndef RGB_MATRIX_INC_VAL | ||||
| #        define RGB_MATRIX_INC_VAL  KC_F22 | ||||
| #    endif | ||||
| #    ifndef RGB_MATRIX_DEC_VAL | ||||
| #        define RGB_MATRIX_DEC_VAL  KC_F23 | ||||
| #    endif | ||||
| #endif | ||||
| @ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
| 
 | ||||
|     [1] = LAYOUT_60_ansi_tsangan_split_bs_rshift( | ||||
|       _______,  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_PSCR, | ||||
|       QK_BOOT,RGB_TOG,RGB_MOD,_______, KC_F16, KC_F17,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______, | ||||
|       QK_BOOT,UG_TOGG,UG_NEXT,_______, RM_TOGG, RM_NEXT,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______, | ||||
|       _______,        _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP,KC_RIGHT,KC_HOME, KC_END,_______, | ||||
|       _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, | ||||
|       _______,_______,_______,                        _______,                                _______,_______,_______), | ||||
|  | ||||
| @ -18,20 +18,5 @@ | ||||
|  */ | ||||
| #pragma once | ||||
| 
 | ||||
| /*
 | ||||
|  * Feature disable options | ||||
|  *  These options are also useful to firmware size reduction. | ||||
|  */ | ||||
| 
 | ||||
| /* disable debug print */ | ||||
| //#define NO_DEBUG
 | ||||
| 
 | ||||
| /* disable print */ | ||||
| //#define NO_PRINT
 | ||||
| 
 | ||||
| #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND | ||||
| #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC | ||||
| 
 | ||||
| #if defined(RGB_MATRIX_ENABLE) && defined(RGBLIGHT_ENABLE) | ||||
| #    define RGB_MATRIX_DISABLE_KEYCODES | ||||
| #endif | ||||
|  | ||||
| @ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
| 
 | ||||
|     [1] = LAYOUT_60_ansi_split_bs_rshift( | ||||
|       _______,  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_PSCR, | ||||
|       QK_BOOT,RGB_TOG,RGB_MOD,_______, KC_F16, KC_F17,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______, | ||||
|       QK_BOOT,UG_TOGG,UG_NEXT,_______, RM_TOGG, RM_NEXT,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______, | ||||
|       _______,        _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP,KC_RIGHT,KC_HOME, KC_END,_______, | ||||
|       _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, | ||||
|       _______,_______,_______,                        _______,                        _______,_______,TG(0),_______), | ||||
|  | ||||
| @ -17,7 +17,7 @@ | ||||
|     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||
|  */ | ||||
| 
 | ||||
| #include "universal.h" | ||||
| #include "quantum.h" | ||||
| 
 | ||||
| #ifdef RGB_MATRIX_ENABLE | ||||
| const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = { | ||||
| @ -167,43 +167,3 @@ bool rgb_matrix_indicators_kb(void) { | ||||
| } | ||||
| 
 | ||||
| #endif  //RGB_MATRIX_ENABLE
 | ||||
| 
 | ||||
| bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||||
|     if (!process_record_user(keycode, record)) { | ||||
|         return false; | ||||
|     } | ||||
| 
 | ||||
|     if (record->event.pressed) { | ||||
|         switch(keycode) { | ||||
| #if defined(RGB_MATRIX_DISABLE_KEYCODES) | ||||
|         case RGB_MATRIX_TOGGLE: // toggle rgb matrix
 | ||||
|             rgb_matrix_toggle(); | ||||
|             return false; | ||||
|         case RGB_MATRIX_STEP: | ||||
|             rgb_matrix_step(); | ||||
|             return false; | ||||
|         case RGB_MATRIX_INC_HUE: | ||||
|             rgb_matrix_increase_hue(); | ||||
|             return false; | ||||
|         case RGB_MATRIX_DEC_HUE: | ||||
|             rgb_matrix_decrease_hue(); | ||||
|             return false; | ||||
|         case RGB_MATRIX_INC_SAT: | ||||
|             rgb_matrix_increase_sat(); | ||||
|             return false; | ||||
|         case RGB_MATRIX_DEC_SAT: | ||||
|             rgb_matrix_decrease_sat(); | ||||
|             return false; | ||||
|         case RGB_MATRIX_INC_VAL: | ||||
|             rgb_matrix_increase_val(); | ||||
|             return false; | ||||
|         case RGB_MATRIX_DEC_VAL: | ||||
|             rgb_matrix_decrease_val(); | ||||
|             return false; | ||||
| #endif | ||||
|         default: | ||||
|             break; | ||||
|         } | ||||
|     } | ||||
|     return true; | ||||
| } | ||||
|  | ||||
| @ -1,48 +0,0 @@ | ||||
| /**
 | ||||
|   * @file universal.h | ||||
|   * | ||||
|     Copyright 2020 astro <yuleiz@gmail.com> | ||||
| 
 | ||||
|     This program is free software: you can redistribute it and/or modify | ||||
|     it under the terms of the GNU General Public License as published by | ||||
|     the Free Software Foundation, either version 2 of the License, or | ||||
|     (at your option) any later version. | ||||
| 
 | ||||
|     This program is distributed in the hope that it will be useful, | ||||
|     but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
|     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
|     GNU General Public License for more details. | ||||
| 
 | ||||
|     You should have received a copy of the GNU General Public License | ||||
|     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | ||||
|   */ | ||||
| #pragma once | ||||
| 
 | ||||
| #include "quantum.h" | ||||
| 
 | ||||
| #if defined(RGB_MATRIX_DISABLE_KEYCODES) | ||||
| #    ifndef RGB_MATRIX_TOGGLE | ||||
| #        define RGB_MATRIX_TOGGLE   KC_F16 | ||||
| #    endif | ||||
| #    ifndef RGB_MATRIX_STEP | ||||
| #        define RGB_MATRIX_STEP     KC_F17 | ||||
| #    endif | ||||
| #    ifndef RGB_MATRIX_INC_HUE | ||||
| #        define RGB_MATRIX_INC_HUE  KC_F18 | ||||
| #    endif | ||||
| #    ifndef RGB_MATRIX_DEC_HUE | ||||
| #        define RGB_MATRIX_DEC_HUE  KC_F19 | ||||
| #    endif | ||||
| #    ifndef RGB_MATRIX_INC_SAT | ||||
| #        define RGB_MATRIX_INC_SAT  KC_F20 | ||||
| #    endif | ||||
| #    ifndef RGB_MATRIX_DEC_SAT | ||||
| #        define RGB_MATRIX_DEC_SAT  KC_F21 | ||||
| #    endif | ||||
| #    ifndef RGB_MATRIX_INC_VAL | ||||
| #        define RGB_MATRIX_INC_VAL  KC_F22 | ||||
| #    endif | ||||
| #    ifndef RGB_MATRIX_DEC_VAL | ||||
| #        define RGB_MATRIX_DEC_VAL  KC_F23 | ||||
| #    endif | ||||
| #endif | ||||
| @ -414,7 +414,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||||
|             } | ||||
|             return true; | ||||
| 
 | ||||
|         case RGB_VAI: | ||||
|         case QK_RGB_MATRIX_VALUE_UP: | ||||
|             if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) { | ||||
|                 if ((RGB_HSV_level = (uint8_t)rgb_matrix_get_val() / (RGB_MATRIX_MAXIMUM_BRIGHTNESS / 4)) < 4) { | ||||
|                     RGB_HSV_level++; | ||||
| @ -423,7 +423,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||||
|                 rgb_hsv_updata_user(); | ||||
|             } | ||||
|             return false; | ||||
|         case RGB_VAD: | ||||
|         case QK_RGB_MATRIX_VALUE_DOWN: | ||||
|             if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) { | ||||
|                 if ((RGB_HSV_level = (uint8_t)rgb_matrix_get_val() / (RGB_MATRIX_MAXIMUM_BRIGHTNESS / 4)) > 0) { | ||||
|                     RGB_HSV_level--; | ||||
| @ -432,7 +432,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||||
|                 rgb_hsv_updata_user(); | ||||
|             } | ||||
|             return false; | ||||
|         case RGB_SAI: | ||||
|         case QK_RGB_MATRIX_SATURATION_UP: | ||||
|             if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) { | ||||
|                 if ((RGB_HSV_level = (uint8_t)rgb_matrix_get_sat() / (UINT8_MAX / 4)) < 4) { | ||||
|                     RGB_HSV_level++; | ||||
| @ -441,7 +441,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||||
|                 rgb_hsv_updata_user(); | ||||
|             } | ||||
|             return false; | ||||
|         case RGB_SAD: | ||||
|         case QK_RGB_MATRIX_SATURATION_DOWN: | ||||
|             if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) { | ||||
|                 if ((RGB_HSV_level = (uint8_t)rgb_matrix_get_sat() / (UINT8_MAX / 4)) > 0) { | ||||
|                     RGB_HSV_level--; | ||||
| @ -450,7 +450,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||||
|                 rgb_hsv_updata_user(); | ||||
|             } | ||||
|             return false; | ||||
|         case RGB_HUI: | ||||
|         case QK_RGB_MATRIX_HUE_UP: | ||||
|             if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) { | ||||
|                 if ((RGB_HSV_level = (uint8_t)rgb_matrix_get_hue() / (UINT8_MAX / 6)) < 6) { | ||||
|                     RGB_HSV_level++; | ||||
| @ -459,7 +459,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||||
|                 rgb_hsv_updata_user(); | ||||
|             } | ||||
|             return false; | ||||
|         case RGB_HUD: | ||||
|         case QK_RGB_MATRIX_HUE_DOWN: | ||||
|             if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) { | ||||
|                 if ((RGB_HSV_level = (uint8_t)rgb_matrix_get_hue() / (UINT8_MAX / 6)) > 0) { | ||||
|                     RGB_HSV_level--; | ||||
| @ -468,7 +468,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||||
|                 rgb_hsv_updata_user(); | ||||
|             } | ||||
|             return false; | ||||
|         case RGB_SPI: | ||||
|         case QK_RGB_MATRIX_SPEED_UP: | ||||
|             if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) { | ||||
|                 if ((RGB_HSV_level = (uint8_t)rgb_matrix_get_speed() / (UINT8_MAX / 4)) < 4) { | ||||
|                     RGB_HSV_level++; | ||||
| @ -476,7 +476,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||||
|                 } | ||||
|             } | ||||
|             return false; | ||||
|         case RGB_SPD: | ||||
|         case QK_RGB_MATRIX_SPEED_DOWN: | ||||
|             if ((fn_make_flag && record->event.pressed) && (alarm_flag == 0)) { | ||||
|                 if ((RGB_HSV_level = (uint8_t)rgb_matrix_get_speed() / (UINT8_MAX / 4)) > 0) { | ||||
|                     RGB_HSV_level--; | ||||
| @ -484,7 +484,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||||
|                 } | ||||
|             } | ||||
|             return false; | ||||
|         case RGB_TOG: | ||||
|         case QK_RGB_MATRIX_TOGGLE: | ||||
|             if (record->event.pressed) { | ||||
|                 switch (rgb_matrix_get_flags()) { | ||||
|                     case LED_FLAG_ALL: { | ||||
|  | ||||
| @ -38,12 +38,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
| 		KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(WIN_FN),KC_RCTL,    KC_LEFT,  KC_DOWN, KC_RGHT), | ||||
| 
 | ||||
|     [WIN_FN] = LAYOUT( /* FN */ | ||||
| 		_______, KC_BRID, KC_BRIU, KC_MAIL, KC_WSCH, KC_CALC, KC_MSEL, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______,       RGB_TOG,  | ||||
| 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD,       _______,  | ||||
| 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       RGB_HUI,  | ||||
| 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                RGB_HUD,  | ||||
| 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,               RGB_VAI,  _______,  | ||||
| 		_______, GU_TOGG, _______,                   _______,                            _______, _______, _______,      RGB_SPD, RGB_VAD, RGB_SPI), | ||||
| 		_______, KC_BRID, KC_BRIU, KC_MAIL, KC_WSCH, KC_CALC, KC_MSEL, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______,       RM_TOGG,  | ||||
| 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_NEXT,       _______,  | ||||
| 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       RM_HUEU,  | ||||
| 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                RM_HUED,  | ||||
| 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,               RM_VALU,  _______,  | ||||
| 		_______, GU_TOGG, _______,                   _______,                            _______, _______, _______,      RM_SPDD, RM_VALD, RM_SPDU), | ||||
| 
 | ||||
|     [MAC_B] = LAYOUT( /* Base */ | ||||
| 		KC_ESC,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, KC_SIRI, KC_F6,   KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL,        KC_MUTE,  | ||||
| @ -54,20 +54,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
| 		KC_LCTL, KC_LALT, KC_LGUI,                   KC_SPC,                             KC_RGUI, MO(MAC_FN),KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT), | ||||
| 
 | ||||
|     [MAC_FN] = LAYOUT( /* FN */ | ||||
| 		_______, 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,  | ||||
| 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD,       _______,  | ||||
| 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       RGB_HUI,  | ||||
| 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                RGB_HUD,  | ||||
| 		_______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,                RGB_VAI, _______,  | ||||
| 		_______, _______, _______,                   _______,                            _______, _______, _______,       RGB_SPD, RGB_VAD, RGB_SPI) | ||||
| 		_______, 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,  | ||||
| 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_NEXT,       _______,  | ||||
| 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       RM_HUEU,  | ||||
| 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                RM_HUED,  | ||||
| 		_______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,                RM_VALU, _______,  | ||||
| 		_______, _______, _______,                   _______,                            _______, _______, _______,       RM_SPDD, RM_VALD, RM_SPDU) | ||||
| }; | ||||
| 
 | ||||
| #if defined(ENCODER_MAP_ENABLE) | ||||
| const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { | ||||
|     [WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, | ||||
|     [WIN_FN] = { ENCODER_CCW_CW(RGB_SAI, RGB_SAD) }, | ||||
|     [WIN_FN] = { ENCODER_CCW_CW(RM_SATU, RM_SATD) }, | ||||
|     [MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, | ||||
|     [MAC_FN] = { ENCODER_CCW_CW(RGB_SAI, RGB_SAD) }, | ||||
|     [MAC_FN] = { ENCODER_CCW_CW(RM_SATU, RM_SATD) }, | ||||
| }; | ||||
| #endif | ||||
| 
 | ||||
|  | ||||
| @ -31,8 +31,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
| 
 | ||||
|     [_LAYER1] = LAYOUT_65_ansi( | ||||
|         KC_TRNS, 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_TRNS, KC_TRNS, | ||||
|         KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_TRNS, | ||||
|         KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_TRNS, | ||||
|         KC_TRNS, RM_TOGG, RM_NEXT, RM_HUEU, RM_HUED, RM_SATU, RM_SATD, RM_VALU, RM_VALD, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUSE, QK_BOOT, KC_TRNS, | ||||
|         KC_TRNS, RM_SPDU, RM_SPDD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EE_CLR, KC_TRNS, | ||||
|         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, | ||||
|         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK | ||||
|     ) | ||||
| @ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
| 
 | ||||
| bool process_record_user(uint16_t keycode, keyrecord_t *record) { | ||||
|     switch (keycode) { | ||||
|         case RGB_TOG: | ||||
|         case QK_RGB_MATRIX_TOGGLE: | ||||
|             if (record->event.pressed) { | ||||
|               switch (rgb_matrix_get_flags()) { | ||||
|                 case LED_FLAG_ALL: { | ||||
|  | ||||
| @ -30,7 +30,7 @@ enum layers{ | ||||
| 
 | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [MAC_BASE] = LAYOUT_tkl_ansi( | ||||
|         KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_NO,    KC_NO,    RGB_MOD, | ||||
|         KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RM_VALD,  RM_VALU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_NO,    KC_NO,    RM_NEXT, | ||||
|         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_INS,   KC_HOME,  KC_PGUP, | ||||
|         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_DEL,   KC_END,   KC_PGDN, | ||||
|         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, | ||||
| @ -38,15 +38,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT), | ||||
| 
 | ||||
|     [MAC_FN] = LAYOUT_tkl_ansi( | ||||
|         _______,            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, | ||||
|         _______,            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_tkl_ansi( | ||||
|         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_PSCR,  KC_NO,    RGB_MOD, | ||||
|         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_PSCR,  KC_NO,    RM_NEXT, | ||||
|         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_INS,   KC_HOME,  KC_PGUP, | ||||
|         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_DEL,   KC_END,   KC_PGDN, | ||||
|         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, | ||||
| @ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT), | ||||
| 
 | ||||
|     [WIN_FN] = LAYOUT_tkl_ansi( | ||||
|         _______,            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, | ||||
|         _______,            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,  _______,  _______,  _______,  _______,              _______,            _______, | ||||
|         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______), | ||||
| }; | ||||
|  | ||||
| @ -128,7 +128,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||||
|         return false; | ||||
|     } | ||||
|     switch (keycode) { | ||||
|         case RGB_TOG: | ||||
|         case QK_RGB_MATRIX_TOGGLE: | ||||
|             if (record->event.pressed) { | ||||
|                 switch (rgb_matrix_get_flags()) { | ||||
|                     case LED_FLAG_ALL: { | ||||
|  | ||||
| @ -30,7 +30,7 @@ enum layers{ | ||||
| 
 | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [MAC_BASE] = LAYOUT( | ||||
|         KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_NO,    KC_NO,    RGB_MOD, | ||||
|         KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RM_VALD,  RM_VALU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_NO,    KC_NO,    RM_NEXT, | ||||
|         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_INS,   KC_HOME,  KC_PGUP,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS, | ||||
|         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_DEL,   KC_END,   KC_PGDN,  KC_P7,    KC_P8,    KC_P9,    KC_PPLS, | ||||
|         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_P4,    KC_P5,    KC_P6, | ||||
| @ -38,15 +38,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT         ), | ||||
| 
 | ||||
|     [MAC_FN] = LAYOUT( | ||||
|         _______,            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, | ||||
|         _______,            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( | ||||
|         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_PSCR,  KC_NO,    RGB_MOD, | ||||
|         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_PSCR,  KC_NO,    RM_NEXT, | ||||
|         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_INS,   KC_HOME,  KC_PGUP,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS, | ||||
|         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_DEL,   KC_END,   KC_PGDN,  KC_P7,    KC_P8,    KC_P9,    KC_PPLS, | ||||
|         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_P4,    KC_P5,    KC_P6, | ||||
| @ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT         ), | ||||
| 
 | ||||
|     [WIN_FN] = LAYOUT( | ||||
|         _______,            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, | ||||
|         _______,            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,  _______,  _______,  _______,  _______,              _______,            _______,            _______,  _______,  _______,  _______, | ||||
|         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______,  _______,            _______         ), | ||||
| }; | ||||
|  | ||||
| @ -31,6 +31,7 @@ bool dip_switch_update_kb(uint8_t index, bool active) { | ||||
| #endif // DIP_SWITCH_ENABLE
 | ||||
| 
 | ||||
| #    ifdef RGB_MATRIX_ENABLE | ||||
| #        define LED_TOGGLE_KEYCODE QK_RGB_MATRIX_TOGGLE | ||||
| #        define LED_SET_FLAGS rgb_matrix_set_flags | ||||
| #        define LED_GET_FLAGS rgb_matrix_get_flags | ||||
| #        define LED_SET_ALL_OFF rgb_matrix_set_color_all(COLOR_BLACK) | ||||
| @ -47,6 +48,7 @@ bool dip_switch_update_kb(uint8_t index, bool active) { | ||||
| #    endif | ||||
| 
 | ||||
| #    ifdef LED_MATRIX_ENABLE | ||||
| #        define LED_TOGGLE_KEYCODE QK_LED_MATRIX_TOGGLE | ||||
| #        define LED_SET_FLAGS led_matrix_set_flags | ||||
| #        define LED_GET_FLAGS led_matrix_get_flags | ||||
| #        define LED_SET_ALL_OFF led_matrix_set_value_all(COLOR_BLACK) | ||||
| @ -66,7 +68,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||||
|         return false; | ||||
|     } | ||||
|     switch (keycode) { | ||||
|         case RGB_TOG: | ||||
|         case LED_TOGGLE_KEYCODE: | ||||
|             if (record->event.pressed) { | ||||
|                 switch (LED_GET_FLAGS()) { | ||||
|                     case LED_FLAG_ALL: { | ||||
|  | ||||
| @ -29,9 +29,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
| 
 | ||||
|     [_FN1] = LAYOUT_numpad_6x4( | ||||
|         _______,    KC_MUTE, KC_VOLD,   KC_VOLU, | ||||
|         RGB_MOD,    RGB_VAI, RGB_HUI,   KC_DEL, | ||||
|         RGB_RMOD,   RGB_VAD, RGB_HUD, | ||||
|         RGB_SAI,    RGB_SPI, KC_MPRV,   _______, | ||||
|         RGB_SAD,    RGB_SPD, KC_MPLY, | ||||
|         RGB_TOG,             KC_MNXT,   _______) | ||||
|         RM_NEXT,    RM_VALU, RM_HUEU,   KC_DEL, | ||||
|         RM_PREV,    RM_VALD, RM_HUED, | ||||
|         RM_SATU,    RM_SPDU, KC_MPRV,   _______, | ||||
|         RM_SATD,    RM_SPDD, KC_MPLY, | ||||
|         RM_TOGG,             KC_MNXT,   _______) | ||||
| }; | ||||
|  | ||||
| @ -33,17 +33,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         _______, KC_P0,             KC_PDOT), | ||||
| 
 | ||||
|     [FUNC] = LAYOUT_numpad_6x5( | ||||
|         RGB_TOG, _______,  KC_MUTE, KC_VOLD,  KC_VOLU, | ||||
|         _______, RGB_MOD,  RGB_VAI, RGB_HUI,  KC_DEL, | ||||
|         _______, RGB_RMOD, RGB_VAD, RGB_HUD,  _______, | ||||
|         _______, RGB_SAI,  RGB_SPI, KC_MPRV, | ||||
|         _______, RGB_SAD,  RGB_SPD, KC_MPLY,  _______, | ||||
|         _______, RGB_TOG,           KC_MNXT), | ||||
|         RM_TOGG, _______,  KC_MUTE, KC_VOLD,  KC_VOLU, | ||||
|         _______, RM_NEXT,  RM_VALU, RM_HUEU,  KC_DEL, | ||||
|         _______, RM_PREV,  RM_VALD, RM_HUED,  _______, | ||||
|         _______, RM_SATU,  RM_SPDU, KC_MPRV, | ||||
|         _______, RM_SATD,  RM_SPDD, KC_MPLY,  _______, | ||||
|         _______, RM_TOGG,           KC_MNXT), | ||||
| }; | ||||
| 
 | ||||
| #if defined(ENCODER_MAP_ENABLE) | ||||
| const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { | ||||
|     [BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, | ||||
|     [FUNC] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, | ||||
|     [FUNC] = { ENCODER_CCW_CW(RM_VALD, RM_VALU) }, | ||||
| }; | ||||
| #endif // ENCODER_MAP_ENABLE
 | ||||
|  | ||||
| @ -24,7 +24,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||||
|     } | ||||
|     switch (keycode) { | ||||
| #    ifdef RGB_MATRIX_ENABLE | ||||
|         case RGB_TOG: | ||||
|         case QK_RGB_MATRIX_TOGGLE: | ||||
|             if (record->event.pressed) { | ||||
|                 switch (rgb_matrix_get_flags()) { | ||||
|                     case LED_FLAG_ALL: { | ||||
|  | ||||
| @ -30,7 +30,7 @@ enum layers{ | ||||
| 
 | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [MAC_BASE] = LAYOUT_ansi_89( | ||||
|         KC_MUTE,  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_INS,             KC_DEL, | ||||
|         KC_MUTE,  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_INS,             KC_DEL, | ||||
|         _______,  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_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_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, | ||||
| @ -38,10 +38,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         _______,  KC_LCTL,  KC_LOPT,            KC_LCMD,  KC_SPC,  MO(MAC_FN),                     KC_SPC,             KC_RCMD,                      KC_LEFT,  KC_DOWN,  KC_RGHT), | ||||
| 
 | ||||
|     [MAC_FN] = LAYOUT_ansi_89( | ||||
|         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,   _______,            _______, | ||||
|         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,   _______,            _______, | ||||
|         _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______, | ||||
|         _______,  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,  _______,  _______,  _______,  _______,  _______,  _______, | ||||
|         _______,  _______,  _______,            _______,  _______,  _______,                       _______,            _______,                      _______,  _______,  _______), | ||||
| 
 | ||||
| @ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         _______,  KC_LCTL,  KC_LWIN,            KC_LALT,  KC_SPC,  MO(WIN_FN),                     KC_SPC,             KC_RALT,                      KC_LEFT,  KC_DOWN,  KC_RGHT), | ||||
| 
 | ||||
|     [WIN_FN] = LAYOUT_ansi_89( | ||||
|         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,  _______,            _______, | ||||
|         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,  _______,            _______, | ||||
|         _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,            _______, | ||||
|         _______,  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,  _______,  _______,  _______,   _______,  _______,  _______, | ||||
|         _______,  _______,  _______,            _______,  _______,  _______,                       _______,            _______,                       _______,  _______,  _______), | ||||
| }; | ||||
| @ -65,8 +65,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
| #if defined(ENCODER_ENABLE) && 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 // ENCODER_MAP_ENABLE
 | ||||
|  | ||||
| @ -30,7 +30,7 @@ enum layers{ | ||||
| 
 | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [MAC_BASE] = LAYOUT_iso_90( | ||||
|         KC_MUTE,  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_INS,             KC_DEL, | ||||
|         KC_MUTE,  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_INS,             KC_DEL, | ||||
|         _______,  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_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_PGDN, | ||||
|         _______,  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_NUHS,  KC_ENT,             KC_HOME, | ||||
| @ -38,10 +38,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         _______,  KC_LCTL,  KC_LOPT,            KC_LCMD,  KC_SPC,  MO(MAC_FN),                     KC_SPC,             KC_RCMD,                      KC_LEFT,  KC_DOWN,  KC_RGHT), | ||||
| 
 | ||||
|     [MAC_FN] = LAYOUT_iso_90( | ||||
|         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,   _______,            _______, | ||||
|         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,   _______,            _______, | ||||
|         _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______, | ||||
|         _______,  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,  _______,  _______,  _______,  _______,  _______,  _______, | ||||
|         _______,  _______,  _______,            _______,  _______,  _______,                       _______,            _______,                      _______,  _______,  _______), | ||||
| 
 | ||||
| @ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         _______,  KC_LCTL,  KC_LWIN,            KC_LALT,  KC_SPC,  MO(WIN_FN),                     KC_SPC,             KC_RALT,                      KC_LEFT,  KC_DOWN,  KC_RGHT), | ||||
| 
 | ||||
|     [WIN_FN] = LAYOUT_iso_90( | ||||
|         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,  _______,            _______, | ||||
|         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,  _______,            _______, | ||||
|         _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,            _______, | ||||
|         _______,  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,  _______,  _______,  _______,   _______,  _______,  _______, | ||||
|         _______,  _______,  _______,            _______,  _______,  _______,                       _______,            _______,                       _______,  _______,  _______), | ||||
| }; | ||||
| @ -65,8 +65,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
| #if defined(ENCODER_ENABLE) && 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 // ENCODER_MAP_ENABLE
 | ||||
|  | ||||
| @ -38,7 +38,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||||
|     } | ||||
|     switch (keycode) { | ||||
| #    ifdef RGB_MATRIX_ENABLE | ||||
|         case RGB_TOG: | ||||
|         case QK_RGB_MATRIX_TOGGLE: | ||||
|             if (record->event.pressed) { | ||||
|                 switch (rgb_matrix_get_flags()) { | ||||
|                     case LED_FLAG_ALL: { | ||||
|  | ||||
| @ -27,7 +27,7 @@ enum layers{ | ||||
| 
 | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [MAC_BASE] = LAYOUT_91_ansi( | ||||
|         KC_MUTE,  KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,   RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_INS,   KC_DEL,   KC_MUTE, | ||||
|         KC_MUTE,  KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RM_VALD,   RM_VALU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_INS,   KC_DEL,   KC_MUTE, | ||||
|         _______,  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_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_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, | ||||
| @ -35,10 +35,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         _______,  KC_LCTL,  KC_LOPT,  KC_LCMD,  MO(MAC_FN),         KC_SPC,                        KC_SPC,             KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT), | ||||
| 
 | ||||
|     [MAC_FN] = LAYOUT_91_ansi( | ||||
|         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,  _______,  _______,  _______,  _______,              _______,  _______, | ||||
|         _______,  _______,  _______,  _______,  _______,            _______,                       _______,            _______,  _______,    _______,  _______,  _______,  _______), | ||||
| 
 | ||||
| @ -51,10 +51,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         _______,  KC_LCTL,  KC_LWIN,  KC_LALT,  MO(WIN_FN),         KC_SPC,                        KC_SPC,             KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT), | ||||
| 
 | ||||
|     [WIN_FN] = LAYOUT_91_ansi( | ||||
|         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), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, | ||||
|     [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, | ||||
|     [MAC_FN]   = { ENCODER_CCW_CW(RM_VALD, RM_VALU), ENCODER_CCW_CW(RM_VALD, RM_VALU) }, | ||||
|     [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, | ||||
|     [WIN_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_VAD, RGB_VAI) } | ||||
|     [WIN_FN]   = { ENCODER_CCW_CW(RM_VALD, RM_VALU), ENCODER_CCW_CW(RM_VALD, RM_VALU) } | ||||
| }; | ||||
| #endif // ENCODER_MAP_ENABLE
 | ||||
|  | ||||
| @ -27,7 +27,7 @@ enum layers{ | ||||
| 
 | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [MAC_BASE] = LAYOUT_92_iso( | ||||
|         KC_MUTE,  KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,   RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_INS,   KC_DEL,   KC_MUTE, | ||||
|         KC_MUTE,  KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RM_VALD,   RM_VALU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_INS,   KC_DEL,   KC_MUTE, | ||||
|         _______,  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_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_PGDN, | ||||
|         _______,  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_NUHS,  KC_ENT,             KC_HOME, | ||||
| @ -35,10 +35,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         _______,  KC_LCTL,  KC_LOPT,  KC_LCMD,  MO(MAC_FN),         KC_SPC,                        KC_SPC,             KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT), | ||||
| 
 | ||||
|     [MAC_FN] = LAYOUT_92_iso( | ||||
|         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,  _______,  _______,  _______,  _______,              _______,  _______, | ||||
|         _______,  _______,  _______,  _______,  _______,            _______,                       _______,            _______,  _______,    _______,  _______,  _______,  _______), | ||||
| 
 | ||||
| @ -51,10 +51,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         _______,  KC_LCTL,  KC_LWIN,  KC_LALT,  MO(WIN_FN),         KC_SPC,                        KC_SPC,             KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT), | ||||
| 
 | ||||
|     [WIN_FN] = LAYOUT_92_iso( | ||||
|         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), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, | ||||
|     [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, | ||||
|     [MAC_FN]   = { ENCODER_CCW_CW(RM_VALD, RM_VALU), ENCODER_CCW_CW(RM_VALD, RM_VALU) }, | ||||
|     [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, | ||||
|     [WIN_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_VAD, RGB_VAI) } | ||||
|     [WIN_FN]   = { ENCODER_CCW_CW(RM_VALD, RM_VALU), ENCODER_CCW_CW(RM_VALD, RM_VALU) } | ||||
| }; | ||||
| #endif // ENCODER_MAP_ENABLE
 | ||||
|  | ||||
| @ -34,7 +34,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||||
|         return false; | ||||
|     } | ||||
|     switch (keycode) { | ||||
|         case RGB_TOG: | ||||
|         case QK_RGB_MATRIX_TOGGLE: | ||||
|             if (record->event.pressed) { | ||||
|                 switch (rgb_matrix_get_flags()) { | ||||
|                     case LED_FLAG_ALL: { | ||||
|  | ||||
| @ -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 | ||||
|  | ||||
| @ -30,31 +30,31 @@ enum layers{ | ||||
| 
 | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [MAC_BASE] = LAYOUT_iso_104( | ||||
|         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_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_NUHS,  KC_ENT,            KC_HOME, | ||||
|         KC_P1,    KC_P2,    KC_P3,    KC_PENT,   KC_LSFT,  KC_NUBS,  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_iso_104( | ||||
|         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_iso_104( | ||||
|         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_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_NUHS,  KC_ENT,            KC_HOME, | ||||
|         KC_P1,    KC_P2,    KC_P3,    KC_PENT,   KC_LSFT,  KC_NUBS,  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_iso_104( | ||||
|         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 | ||||
|  | ||||
| @ -34,7 +34,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||||
|         return false; | ||||
|     } | ||||
|     switch (keycode) { | ||||
|         case RGB_TOG: | ||||
|         case QK_RGB_MATRIX_TOGGLE: | ||||
|             if (record->event.pressed) { | ||||
|                 switch (rgb_matrix_get_flags()) { | ||||
|                     case LED_FLAG_ALL: { | ||||
|  | ||||
| @ -28,7 +28,7 @@ enum layers{ | ||||
| 
 | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [MAC_BASE] = LAYOUT_ansi_82( | ||||
|         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,   KC_INS, | ||||
|         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,   KC_INS, | ||||
|         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_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_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, | ||||
| @ -38,8 +38,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [MAC_FN] = LAYOUT_ansi_82( | ||||
|         _______,            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,  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,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            _______, | ||||
|         _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______, | ||||
|         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,  _______,  _______,  _______), | ||||
| 
 | ||||
| @ -52,10 +52,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         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_82( | ||||
|         _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,  _______, | ||||
|         _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RM_VALD,  RM_VALU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,  _______, | ||||
|         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______, | ||||
|         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,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            _______, | ||||
|         _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______, | ||||
|         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,  _______,  _______,  _______) | ||||
| }; | ||||
|  | ||||
| @ -25,7 +25,7 @@ enum layers{ | ||||
| 
 | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [MAC_BASE] = LAYOUT_ansi_82( | ||||
|         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,   KC_MUTE, | ||||
|         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,   KC_MUTE, | ||||
|         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_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_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, | ||||
| @ -33,10 +33,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_ROPT, MO(MAC_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT), | ||||
| 
 | ||||
|     [MAC_FN] = LAYOUT_ansi_82( | ||||
|         _______,            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, | ||||
|         _______,            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,  _______,  _______,  _______,  _______,            _______,  _______, | ||||
|         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,  _______,  _______,  _______), | ||||
| 
 | ||||
| @ -49,10 +49,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         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_82( | ||||
|         _______,            KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,  RGB_TOG, | ||||
|         _______,            KC_BRID,  KC_BRIU,  _______,  _______,  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,  _______,  _______,  _______,  _______,            _______,  _______, | ||||
|         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,  _______,  _______,  _______) | ||||
| }; | ||||
| @ -60,8 +60,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 | ||||
|  | ||||
| @ -28,7 +28,7 @@ enum layers{ | ||||
| 
 | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [MAC_BASE] = LAYOUT_iso_83( | ||||
|         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,   KC_INS, | ||||
|         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,   KC_INS, | ||||
|         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_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_PGDN, | ||||
|         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_NUHS,  KC_ENT,             KC_HOME, | ||||
| @ -38,8 +38,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [MAC_FN] = LAYOUT_iso_83( | ||||
|         _______,            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,  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,  _______,  _______,  _______,  _______,            _______,  _______, | ||||
|         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,  _______,  _______,  _______), | ||||
| 
 | ||||
| @ -52,10 +52,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT, MO(WIN_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT), | ||||
| 
 | ||||
|     [WIN_FN] = LAYOUT_iso_83( | ||||
|         _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,  _______, | ||||
|         _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RM_VALD,  RM_VALU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,  _______, | ||||
|         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______, | ||||
|         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,  _______,  _______,  _______,  _______,            _______,  _______, | ||||
|         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,  _______,  _______,  _______) | ||||
|     }; | ||||
|  | ||||
| @ -26,7 +26,7 @@ enum layers{ | ||||
| 
 | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [MAC_BASE] = LAYOUT_iso_83( | ||||
|         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,   KC_MUTE, | ||||
|         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,   KC_MUTE, | ||||
|         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_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_PGDN, | ||||
|         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_NUHS,  KC_ENT,             KC_HOME, | ||||
| @ -36,8 +36,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [MAC_FN] = LAYOUT_iso_83( | ||||
|         _______,            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,  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,  _______,  _______,  _______,  _______,              _______,  _______, | ||||
|         _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______), | ||||
| 
 | ||||
| @ -50,10 +50,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT), | ||||
| 
 | ||||
|     [WIN_FN] = LAYOUT_iso_83( | ||||
|         _______,            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_BRID,  KC_BRIU,  KC_NO,    KC_NO,    RM_VALD,  RM_VALU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,  _______,  _______, | ||||
|         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______, | ||||
|         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,  _______,  _______,  _______,  _______,              _______,  _______, | ||||
|         _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______) | ||||
| }; | ||||
| @ -61,8 +61,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 | ||||
| @ -34,7 +34,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||||
|     if (!process_record_user(keycode, record)) { return false; } | ||||
|     switch (keycode) { | ||||
| #ifdef RGB_MATRIX_ENABLE | ||||
|         case RGB_TOG: | ||||
|         case QK_RGB_MATRIX_TOGGLE: | ||||
|             if (record->event.pressed) { | ||||
|                 switch (rgb_matrix_get_flags()) { | ||||
|                     case LED_FLAG_ALL: { | ||||
|  | ||||
| @ -30,7 +30,7 @@ enum layers{ | ||||
| 
 | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [MAC_BASE] = LAYOUT_ansi_82( | ||||
|         KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_DEL,             KC_INS, | ||||
|         KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RM_VALD,  RM_VALU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_DEL,             KC_INS, | ||||
|         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_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_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, | ||||
| @ -40,8 +40,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [MAC_FN] = LAYOUT_ansi_82( | ||||
|         _______,  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,  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,  _______,  _______,  _______,  _______,              _______,  _______, | ||||
|         _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______), | ||||
| 
 | ||||
| @ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         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_82( | ||||
|         _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,            _______, | ||||
|         _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RM_VALD,  RM_VALU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,            _______, | ||||
|         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______, | ||||
|         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,  _______,  _______,  _______,  _______,              _______,  _______, | ||||
|         _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______), | ||||
| }; | ||||
|  | ||||
| @ -30,7 +30,7 @@ enum layers{ | ||||
| 
 | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [MAC_BASE] = LAYOUT_ansi_82( | ||||
|         KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_DEL,             KC_MUTE, | ||||
|         KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RM_VALD,  RM_VALU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_DEL,             KC_MUTE, | ||||
|         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_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_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, | ||||
| @ -38,10 +38,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         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_82( | ||||
|         _______,  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, | ||||
|         _______,  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,  _______,  _______,  _______,  _______,              _______,  _______, | ||||
|         _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______), | ||||
| 
 | ||||
| @ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_LCTL,  KC_LCMD,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT), | ||||
| 
 | ||||
|     [WIN_FN] = LAYOUT_ansi_82( | ||||
|         _______,  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, | ||||
|         _______,  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,  _______,  _______,  _______,  _______,              _______,  _______, | ||||
|         _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______), | ||||
| }; | ||||
| @ -65,8 +65,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 // ENCODER_MAP_ENABLE
 | ||||
|  | ||||
| @ -30,7 +30,7 @@ enum layers { | ||||
| 
 | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [MAC_BASE] = LAYOUT_iso_83( | ||||
|         KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_DEL,             KC_INS, | ||||
|         KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RM_VALD,  RM_VALU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_DEL,             KC_INS, | ||||
|         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_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_PGDN, | ||||
|         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_NUHS,  KC_ENT,             KC_HOME, | ||||
| @ -40,8 +40,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [MAC_FN] = LAYOUT_iso_83( | ||||
|         _______,  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,  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,  _______,  _______,  _______,  _______,              _______,  _______, | ||||
|         _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______), | ||||
| 
 | ||||
| @ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT), | ||||
| 
 | ||||
|     [WIN_FN] = LAYOUT_iso_83( | ||||
|         _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,            _______, | ||||
|         _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RM_VALD,  RM_VALU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,            _______, | ||||
|         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______, | ||||
|         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,  _______,  _______,  _______,  _______,              _______,  _______, | ||||
|         _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______) | ||||
| }; | ||||
|  | ||||
| @ -30,7 +30,7 @@ enum layers{ | ||||
| 
 | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [MAC_BASE] = LAYOUT_iso_83( | ||||
|         KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_DEL,             KC_MUTE, | ||||
|         KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RM_VALD,  RM_VALU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_DEL,             KC_MUTE, | ||||
|         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_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_PGDN, | ||||
|         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_NUHS,  KC_ENT,             KC_HOME, | ||||
| @ -38,10 +38,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT), | ||||
| 
 | ||||
|     [MAC_FN] = LAYOUT_iso_83( | ||||
|         _______,  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, | ||||
|         _______,  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,  _______,  _______,  _______,  _______,              _______,  _______, | ||||
|         _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______), | ||||
| 
 | ||||
| @ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT), | ||||
| 
 | ||||
|     [WIN_FN] = LAYOUT_iso_83( | ||||
|         _______,  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, | ||||
|         _______,  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,  _______,  _______,  _______,  _______,              _______,  _______, | ||||
|         _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______) | ||||
| }; | ||||
| @ -65,8 +65,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 // ENCODER_MAP_ENABLE
 | ||||
|  | ||||
| @ -30,7 +30,7 @@ enum layers{ | ||||
| 
 | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [MAC_BASE] = LAYOUT( | ||||
|         KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,  KC_DEL,   KC_INS, | ||||
|         KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RM_VALD,  RM_VALU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,  KC_DEL,   KC_INS, | ||||
|         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_INT3,  KC_BSPC,  KC_PGUP, | ||||
|         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_PGDN, | ||||
|         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_NUHS,  KC_ENT,             KC_HOME, | ||||
| @ -40,8 +40,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [MAC_FN] = LAYOUT( | ||||
|         _______,            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,  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,  _______,  _______,  _______,  _______,    _______,  _______,  _______, | ||||
|         _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,    _______,  _______,  _______,  _______), | ||||
| 
 | ||||
| @ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_LCTL,  KC_LWIN,  KC_LALT,  KC_INT5,                      KC_SPC,                       KC_INT4,  KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT), | ||||
| 
 | ||||
|     [WIN_FN] = LAYOUT( | ||||
|         _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,  _______,  _______, | ||||
|         _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RM_VALD,  RM_VALU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,  _______,  _______, | ||||
|         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______, | ||||
|         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,  _______,  _______,  _______,  _______,    _______,  _______,  _______, | ||||
|         _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,    _______,  _______,  _______,  _______), | ||||
| }; | ||||
|  | ||||
| @ -30,7 +30,7 @@ enum layers{ | ||||
| 
 | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [MAC_BASE] = LAYOUT( | ||||
|         KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,  KC_DEL,   KC_MUTE, | ||||
|         KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RM_VALD,  RM_VALU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,    KC_VOLD,  KC_VOLU,  KC_DEL,   KC_MUTE, | ||||
|         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_INT3,  KC_BSPC,  KC_PGUP, | ||||
|         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_PGDN, | ||||
|         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_NUHS,  KC_ENT,             KC_HOME, | ||||
| @ -38,10 +38,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_LCTL,  KC_LOPT,  KC_LCMD,  KC_LNG2,                      KC_SPC,                       KC_LNG1,  KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT), | ||||
| 
 | ||||
|     [MAC_FN] = LAYOUT( | ||||
|         _______,            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, | ||||
|         _______,            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,  _______,  _______,  _______,  _______,    _______,  _______,  _______, | ||||
|         _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,    _______,  _______,  _______,  _______), | ||||
| 
 | ||||
| @ -54,10 +54,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_LCTL,  KC_LWIN,  KC_LALT,  KC_INT5,                      KC_SPC,                       KC_INT4,  KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT), | ||||
| 
 | ||||
|     [WIN_FN] = LAYOUT( | ||||
|         _______,            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, | ||||
|         _______,            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,  _______,  _______,  _______,  _______,    _______,  _______,  _______, | ||||
|         _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,    _______,  _______,  _______,  _______), | ||||
| }; | ||||
| @ -65,8 +65,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 // ENCODER_MAP_ENABLE
 | ||||
|  | ||||
| @ -36,7 +36,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||||
|     } | ||||
|     switch (keycode) { | ||||
| #    ifdef RGB_MATRIX_ENABLE | ||||
|         case RGB_TOG: | ||||
|         case QK_RGB_MATRIX_TOGGLE: | ||||
|             if (record->event.pressed) { | ||||
|                 switch (rgb_matrix_get_flags()) { | ||||
|                     case LED_FLAG_ALL: { | ||||
|  | ||||
| @ -43,23 +43,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_LCTL, KC_LWIN, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT), | ||||
| 
 | ||||
|     [_FN1] = LAYOUT_ansi_67( | ||||
|         KC_GRV,  KC_BRID, KC_BRIU, _______, _______, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU, _______,          _______, | ||||
|         RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______,  _______, _______,          _______, | ||||
|         _______, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______,           _______,          _______, | ||||
|         KC_GRV,  KC_BRID, KC_BRIU, _______, _______, RM_VALD, RM_VALU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU, _______,          _______, | ||||
|         RM_TOGG, RM_NEXT, RM_VALU, RM_HUEU, RM_SATU, RM_SPDU, _______, _______, _______, _______, _______, _______,  _______, _______,          _______, | ||||
|         _______, RM_PREV, RM_VALD, RM_HUED, RM_SATD, RM_SPDD, _______, _______, _______, _______, _______, _______,           _______,          _______, | ||||
|         _______,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,           _______, _______, | ||||
|         _______, _______, _______,                            _______,                            _______, _______,  _______, _______, _______, _______), | ||||
| 
 | ||||
|     [_FN2] = LAYOUT_ansi_67( | ||||
|         KC_GRV,  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, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______,  _______, _______,          _______, | ||||
|         _______, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______,           _______,          _______, | ||||
|         KC_GRV,  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, RM_NEXT, RM_VALU, RM_HUEU, RM_SATU, RM_SPDU, _______, _______, _______, _______, _______, _______,  _______, _______,          _______, | ||||
|         _______, RM_PREV, RM_VALD, RM_HUED, RM_SATD, RM_SPDD, _______, _______, _______, _______, _______, _______,           _______,          _______, | ||||
|         _______,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,           _______, _______, | ||||
|         _______, _______, _______,                            _______,                            _______, _______,  _______, _______, _______, _______), | ||||
| 
 | ||||
|     [_FN3] = LAYOUT_ansi_67( | ||||
|         KC_TILD, 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, 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, _______, _______, _______, _______, _______, _______,           _______,          _______, | ||||
|         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           _______, _______, | ||||
|         _______, _______, _______,                            _______,                            _______, _______,  _______, _______, _______, _______) | ||||
| }; | ||||
|  | ||||
| @ -43,23 +43,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_LCTL, KC_LWIN, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN2), MO(_FN3),  KC_LEFT, KC_DOWN, KC_RGHT), | ||||
| 
 | ||||
|     [_FN1] = LAYOUT_ansi_67( | ||||
|         KC_GRV,  KC_BRID, KC_BRIU, _______, _______, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU,   _______,          RGB_TOG, | ||||
|         RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______,  _______,   _______,          _______, | ||||
|         _______, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______,             _______,          _______, | ||||
|         KC_GRV,  KC_BRID, KC_BRIU, _______, _______, RM_VALD, RM_VALU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU,   _______,          RM_TOGG, | ||||
|         RM_TOGG, RM_NEXT, RM_VALU, RM_HUEU, RM_SATU, RM_SPDU, _______, _______, _______, _______, _______, _______,  _______,   _______,          _______, | ||||
|         _______, RM_PREV, RM_VALD, RM_HUED, RM_SATD, RM_SPDD, _______, _______, _______, _______, _______, _______,             _______,          _______, | ||||
|         _______,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,             _______, _______, | ||||
|         _______, _______, _______,                            _______,                            _______, _______,  _______,   _______, _______, _______), | ||||
| 
 | ||||
|     [_FN2] = LAYOUT_ansi_67( | ||||
|         KC_GRV,  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, | ||||
|         RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______,  _______,   _______,          _______, | ||||
|         _______, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______,             _______,          _______, | ||||
|         KC_GRV,  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, | ||||
|         RM_TOGG, RM_NEXT, RM_VALU, RM_HUEU, RM_SATU, RM_SPDU, _______, _______, _______, _______, _______, _______,  _______,   _______,          _______, | ||||
|         _______, RM_PREV, RM_VALD, RM_HUED, RM_SATD, RM_SPDD, _______, _______, _______, _______, _______, _______,             _______,          _______, | ||||
|         _______,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,             _______, _______, | ||||
|         _______, _______, _______,                            _______,                            _______, _______,  _______,   _______, _______, _______), | ||||
| 
 | ||||
|     [_FN3] = LAYOUT_ansi_67( | ||||
|         KC_TILD, 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, 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, _______, _______, _______, _______, _______, _______,             _______,          _______, | ||||
|         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, | ||||
|         _______, _______, _______,                            _______,                            _______, _______,  _______,   _______, _______, _______) | ||||
| }; | ||||
| @ -68,8 +68,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
| const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { | ||||
|     [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, | ||||
|     [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, | ||||
|     [_FN1]     = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, | ||||
|     [_FN2]     = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, | ||||
|     [_FN1]     = { ENCODER_CCW_CW(RM_VALD, RM_VALU) }, | ||||
|     [_FN2]     = { ENCODER_CCW_CW(RM_VALD, RM_VALU) }, | ||||
|     [_FN3]     = { ENCODER_CCW_CW(_______, _______) }, | ||||
| }; | ||||
| #endif | ||||
|  | ||||
| @ -43,23 +43,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_LCTL, KC_LWIN, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT), | ||||
| 
 | ||||
|     [_FN1] = LAYOUT_iso_68( | ||||
|         KC_GRV,  KC_BRID, KC_BRIU, _______, _______, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU,  _______,          _______, | ||||
|         RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______,  _______,                    _______, | ||||
|         _______, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______,  _______,  _______,          _______, | ||||
|         KC_GRV,  KC_BRID, KC_BRIU, _______, _______, RM_VALD, RM_VALU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU,  _______,          _______, | ||||
|         RM_TOGG, RM_NEXT, RM_VALU, RM_HUEU, RM_SATU, RM_SPDU, _______, _______, _______, _______, _______, _______,  _______,                    _______, | ||||
|         _______, RM_PREV, RM_VALD, RM_HUED, RM_SATD, RM_SPDD, _______, _______, _______, _______, _______, _______,  _______,  _______,          _______, | ||||
|         _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,            _______, _______, | ||||
|         _______, _______, _______,                            _______,                            _______, _______,  _______,  _______, _______, _______), | ||||
| 
 | ||||
|     [_FN2] = LAYOUT_iso_68( | ||||
|         KC_GRV,  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, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______,  _______,                    _______, | ||||
|         _______, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______,  _______,  _______,          _______, | ||||
|         KC_GRV,  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, RM_NEXT, RM_VALU, RM_HUEU, RM_SATU, RM_SPDU, _______, _______, _______, _______, _______, _______,  _______,                    _______, | ||||
|         _______, RM_PREV, RM_VALD, RM_HUED, RM_SATD, RM_SPDD, _______, _______, _______, _______, _______, _______,  _______,  _______,          _______, | ||||
|         _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,            _______, _______, | ||||
|         _______, _______, _______,                            _______,                            _______, _______,  _______,  _______, _______, _______), | ||||
| 
 | ||||
|     [_FN3] = LAYOUT_iso_68( | ||||
|         KC_TILD, 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, 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, _______, _______, _______, _______, _______, _______,  _______,  _______,          _______, | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, | ||||
|         _______, _______, _______,                            _______,                            _______, _______,  _______,  _______, _______, _______) | ||||
| }; | ||||
|  | ||||
| @ -43,23 +43,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_LCTL, KC_LWIN, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT), | ||||
| 
 | ||||
|     [_FN1] = LAYOUT_iso_68( | ||||
|         KC_GRV,  KC_BRID, KC_BRIU, _______, _______, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU,  _______,          _______, | ||||
|         RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______,  _______,                    _______, | ||||
|         _______, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______,  _______,  _______,          _______, | ||||
|         KC_GRV,  KC_BRID, KC_BRIU, _______, _______, RM_VALD, RM_VALU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU,  _______,          _______, | ||||
|         RM_TOGG, RM_NEXT, RM_VALU, RM_HUEU, RM_SATU, RM_SPDU, _______, _______, _______, _______, _______, _______,  _______,                    _______, | ||||
|         _______, RM_PREV, RM_VALD, RM_HUED, RM_SATD, RM_SPDD, _______, _______, _______, _______, _______, _______,  _______,  _______,          _______, | ||||
|         _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,            _______, _______, | ||||
|         _______, _______, _______,                            _______,                            _______, _______,  _______,  _______, _______, _______), | ||||
| 
 | ||||
|     [_FN2] = LAYOUT_iso_68( | ||||
|         KC_GRV,  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, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______,  _______,                    _______, | ||||
|         _______, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______,  _______,  _______,          _______, | ||||
|         KC_GRV,  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, RM_NEXT, RM_VALU, RM_HUEU, RM_SATU, RM_SPDU, _______, _______, _______, _______, _______, _______,  _______,                    _______, | ||||
|         _______, RM_PREV, RM_VALD, RM_HUED, RM_SATD, RM_SPDD, _______, _______, _______, _______, _______, _______,  _______,  _______,          _______, | ||||
|         _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,            _______, _______, | ||||
|         _______, _______, _______,                            _______,                            _______, _______,  _______,  _______, _______, _______), | ||||
| 
 | ||||
|     [_FN3] = LAYOUT_iso_68( | ||||
|         KC_TILD, 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, 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, _______, _______, _______, _______, _______, _______,  _______,  _______,          _______, | ||||
|         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, | ||||
|         _______, _______, _______,                            _______,                            _______, _______,  _______,  _______, _______, _______) | ||||
| }; | ||||
|  | ||||
| @ -45,23 +45,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_LCTL, KC_LWIN,  KC_LALT,  KC_INT5,                   KC_SPC,                    KC_INT4, KC_RALT,  MO(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT), | ||||
| 
 | ||||
|     [_FN1] = LAYOUT_jis_71( | ||||
|         KC_GRV,  KC_BRID,  KC_BRIU,  KC_NO,   KC_NO,   RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE,  KC_VOLD,  KC_VOLU,  _______, _______, _______, | ||||
|         RGB_TOG, RGB_MOD,  RGB_VAI,  RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______,  _______,  _______,                    _______, | ||||
|         _______, RGB_RMOD, RGB_VAD,  RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______,  _______,  _______,  _______,          _______, | ||||
|         KC_GRV,  KC_BRID,  KC_BRIU,  KC_NO,   KC_NO,   RM_VALD, RM_VALU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE,  KC_VOLD,  KC_VOLU,  _______, _______, _______, | ||||
|         RM_TOGG, RM_NEXT,  RM_VALU,  RM_HUEU, RM_SATU, RM_SPDU, _______, _______, _______, _______, _______,  _______,  _______,                    _______, | ||||
|         _______, RM_PREV,  RM_VALD,  RM_HUED, RM_SATD, RM_SPDD, _______, _______, _______, _______, _______,  _______,  _______,  _______,          _______, | ||||
|         _______,           _______,  _______, _______, _______, _______, NK_TOGG, _______, _______, _______,  _______,  _______,  _______, _______, | ||||
|         _______, _______,  _______,  _______,                   _______,                   _______, _______,  _______,  _______,  _______, _______, _______), | ||||
| 
 | ||||
|     [_FN2] = LAYOUT_jis_71( | ||||
|         KC_GRV,  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, RGB_MOD,  RGB_VAI,  RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______,  _______,  _______,                    _______, | ||||
|         _______, RGB_RMOD, RGB_VAD,  RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______,  _______,  _______,  _______,          _______, | ||||
|         KC_GRV,  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, RM_NEXT,  RM_VALU,  RM_HUEU, RM_SATU, RM_SPDU, _______, _______, _______, _______, _______,  _______,  _______,                    _______, | ||||
|         _______, RM_PREV,  RM_VALD,  RM_HUED, RM_SATD, RM_SPDD, _______, _______, _______, _______, _______,  _______,  _______,  _______,          _______, | ||||
|         _______,           _______,  _______, _______, _______, _______, NK_TOGG, _______, _______, _______,  _______,  _______,  _______, _______, | ||||
|         _______, _______,  _______,  _______,                   _______,                   _______, _______,  _______,  _______,  _______, _______, _______), | ||||
| 
 | ||||
|     [_FN3] = LAYOUT_jis_71( | ||||
|         KC_TILD, 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, 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, _______, _______, _______, _______, _______,  _______,  _______,  _______,          _______, | ||||
|         _______,           _______,  _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______,  _______, _______, | ||||
|         _______, _______,  _______,  _______,                   _______,                   _______, _______,  _______,  _______,  _______, _______, _______) | ||||
| }; | ||||
|  | ||||
| @ -45,23 +45,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_LCTL, KC_LWIN,  KC_LALT,  KC_INT5,                   KC_SPC,                    KC_INT4, KC_RALT,  MO(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT), | ||||
| 
 | ||||
|     [_FN1] = LAYOUT_jis_71( | ||||
|         KC_GRV,  KC_BRID,  KC_BRIU,  KC_NO,   KC_NO,   RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE,  KC_VOLD,  KC_VOLU,  _______, _______, RGB_TOG, | ||||
|         RGB_TOG, RGB_MOD,  RGB_VAI,  RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______,  _______,  _______,                    _______, | ||||
|         _______, RGB_RMOD, RGB_VAD,  RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______,  _______,  _______,  _______,          _______, | ||||
|         KC_GRV,  KC_BRID,  KC_BRIU,  KC_NO,   KC_NO,   RM_VALD, RM_VALU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE,  KC_VOLD,  KC_VOLU,  _______, _______, RM_TOGG, | ||||
|         RM_TOGG, RM_NEXT,  RM_VALU,  RM_HUEU, RM_SATU, RM_SPDU, _______, _______, _______, _______, _______,  _______,  _______,                    _______, | ||||
|         _______, RM_PREV,  RM_VALD,  RM_HUED, RM_SATD, RM_SPDD, _______, _______, _______, _______, _______,  _______,  _______,  _______,          _______, | ||||
|         _______,           _______,  _______, _______, _______, _______, NK_TOGG, _______, _______, _______,  _______,  _______,  _______, _______, | ||||
|         _______, _______,  _______,  _______,                   _______,                   _______, _______,  _______,  _______,  _______, _______, _______), | ||||
| 
 | ||||
|     [_FN2] = LAYOUT_jis_71( | ||||
|         KC_GRV,  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, | ||||
|         RGB_TOG, RGB_MOD,  RGB_VAI,  RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______,  _______,  _______,                    _______, | ||||
|         _______, RGB_RMOD, RGB_VAD,  RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______,  _______,  _______,  _______,          _______, | ||||
|         KC_GRV,  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, | ||||
|         RM_TOGG, RM_NEXT,  RM_VALU,  RM_HUEU, RM_SATU, RM_SPDU, _______, _______, _______, _______, _______,  _______,  _______,                    _______, | ||||
|         _______, RM_PREV,  RM_VALD,  RM_HUED, RM_SATD, RM_SPDD, _______, _______, _______, _______, _______,  _______,  _______,  _______,          _______, | ||||
|         _______,           _______,  _______, _______, _______, _______, NK_TOGG, _______, _______, _______,  _______,  _______,  _______, _______, | ||||
|         _______, _______,  _______,  _______,                   _______,                   _______, _______,  _______,  _______,  _______, _______, _______), | ||||
| 
 | ||||
|     [_FN3] = LAYOUT_jis_71( | ||||
|         KC_TILD, 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, 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, _______, _______, _______, _______, _______,  _______,  _______,  _______,          _______, | ||||
|         _______,           _______,  _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______,  _______, _______, | ||||
|         _______, _______,  _______,  _______,                   _______,                   _______, _______,  _______,  _______,  _______, _______, _______) | ||||
| }; | ||||
| @ -70,8 +70,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
| const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { | ||||
|     [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, | ||||
|     [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, | ||||
|     [_FN1]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, | ||||
|     [_FN2]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, | ||||
|     [_FN1]   = { ENCODER_CCW_CW(RM_VALD, RM_VALU)}, | ||||
|     [_FN2]   = { ENCODER_CCW_CW(RM_VALD, RM_VALU)}, | ||||
|     [_FN3]   = { ENCODER_CCW_CW(_______, _______)} | ||||
| }; | ||||
| #endif // ENCODER_MAP_ENABLE
 | ||||
|  | ||||
| @ -33,7 +33,7 @@ bool dip_switch_update_kb(uint8_t index, bool active) { | ||||
| bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||||
|     if (!process_record_user(keycode, record)) { return false; } | ||||
|     switch (keycode) { | ||||
|         case RGB_TOG: | ||||
|         case QK_RGB_MATRIX_TOGGLE: | ||||
|             if (record->event.pressed) { | ||||
|                 switch (rgb_matrix_get_flags()) { | ||||
|                     case LED_FLAG_ALL: { | ||||
|  | ||||
| @ -25,7 +25,7 @@ enum layers{ | ||||
| 
 | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [MAC_BASE] = LAYOUT_tkl_ansi( | ||||
|         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_NO,    KC_NO,    RGB_MOD, | ||||
|         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_NO,    KC_NO,    RM_NEXT, | ||||
|         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_INS,   KC_HOME,  KC_PGUP, | ||||
|         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_DEL,   KC_END,   KC_PGDN, | ||||
|         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, | ||||
| @ -33,15 +33,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT), | ||||
| 
 | ||||
|     [MAC_FN] = LAYOUT_tkl_ansi( | ||||
|         _______,            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, | ||||
|         _______,            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_tkl_ansi( | ||||
|         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_PSCR,  _______,  RGB_MOD, | ||||
|         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_PSCR,  _______,  RM_NEXT, | ||||
|         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_INS,   KC_HOME,  KC_PGUP, | ||||
|         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_DEL,   KC_END,   KC_PGDN, | ||||
|         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, | ||||
| @ -49,10 +49,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT), | ||||
| 
 | ||||
|     [WIN_FN] = LAYOUT_tkl_ansi( | ||||
|         _______,            KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  RGB_TOG, | ||||
|         _______,            KC_BRID,  KC_BRIU,  _______,  _______,  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,  _______,  _______,  _______,  _______,              _______,            _______, | ||||
|         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______), | ||||
| }; | ||||
|  | ||||
| @ -25,7 +25,7 @@ enum layers{ | ||||
| 
 | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [MAC_BASE] = LAYOUT_tkl_f13_ansi( | ||||
|         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_MUTE,  KC_NO,    KC_NO,    RGB_MOD, | ||||
|         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_MUTE,  KC_NO,    KC_NO,    RM_NEXT, | ||||
|         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_INS,   KC_HOME,  KC_PGUP, | ||||
|         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_DEL,   KC_END,   KC_PGDN, | ||||
|         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, | ||||
| @ -33,15 +33,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT), | ||||
| 
 | ||||
|     [MAC_FN] = LAYOUT_tkl_f13_ansi( | ||||
|         _______,  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,  _______,  _______,  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,     RM_TOGG,  _______,  _______,  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_tkl_f13_ansi( | ||||
|         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_MUTE,  KC_PSCR,  KC_NO,    RGB_MOD, | ||||
|         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_MUTE,  KC_PSCR,  KC_NO,    RM_NEXT, | ||||
|         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_INS,   KC_HOME,  KC_PGUP, | ||||
|         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_DEL,   KC_END,   KC_PGDN, | ||||
|         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, | ||||
| @ -49,10 +49,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT), | ||||
| 
 | ||||
|     [WIN_FN] = LAYOUT_tkl_f13_ansi( | ||||
|         _______,  KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    RGB_TOG,  _______,  _______,  RGB_TOG, | ||||
|         _______,  KC_BRID,  KC_BRIU,  _______,  _______,  RM_VALD,  RM_VALU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    RM_TOGG,  _______,  _______,  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,  _______,  _______,  _______,  _______,              _______,            _______, | ||||
|         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______), | ||||
| }; | ||||
| @ -60,8 +60,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 // ENCODER_MAP_ENABLE
 | ||||
|  | ||||
| @ -25,7 +25,7 @@ enum layers{ | ||||
| 
 | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [MAC_BASE] = LAYOUT_tkl_iso( | ||||
|         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_NO,    KC_NO,    RGB_MOD, | ||||
|         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_NO,    KC_NO,    RM_NEXT, | ||||
|         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_INS,   KC_HOME,  KC_PGUP, | ||||
|         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_DEL,   KC_END,   KC_PGDN, | ||||
|         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_NUHS,    KC_ENT, | ||||
| @ -33,15 +33,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT), | ||||
| 
 | ||||
|     [MAC_FN] = LAYOUT_tkl_iso( | ||||
|         _______,            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, | ||||
|         _______,            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_tkl_iso( | ||||
|         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_PSCR,  KC_NO,    RGB_MOD, | ||||
|         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_PSCR,  KC_NO,    RM_NEXT, | ||||
|         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_INS,   KC_HOME,  KC_PGUP, | ||||
|         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_DEL,   KC_END,   KC_PGDN, | ||||
|         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_NUHS,    KC_ENT, | ||||
| @ -49,10 +49,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT), | ||||
| 
 | ||||
|     [WIN_FN] = LAYOUT_tkl_iso( | ||||
|         _______,            KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  RGB_TOG, | ||||
|         _______,            KC_BRID,  KC_BRIU,  _______,  _______,  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,  _______,  _______,  _______,  _______,              _______,            _______, | ||||
|         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______), | ||||
| }; | ||||
|  | ||||
| @ -25,7 +25,7 @@ enum layers{ | ||||
| 
 | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [MAC_BASE] = LAYOUT_tkl_f13_iso( | ||||
|         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_MUTE,  KC_NO,    KC_NO,    RGB_MOD, | ||||
|         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_MUTE,  KC_NO,    KC_NO,    RM_NEXT, | ||||
|         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_INS,   KC_HOME,  KC_PGUP, | ||||
|         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_DEL,   KC_END,   KC_PGDN, | ||||
|         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_NUHS,    KC_ENT, | ||||
| @ -33,15 +33,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT), | ||||
| 
 | ||||
|     [MAC_FN] = LAYOUT_tkl_f13_iso( | ||||
|         _______,  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,  _______,  _______,  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,     RM_TOGG,  _______,  _______,  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_tkl_f13_iso( | ||||
|         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_MUTE,  KC_PSCR,  KC_NO,    RGB_MOD, | ||||
|         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_MUTE,  KC_PSCR,  KC_NO,    RM_NEXT, | ||||
|         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_INS,   KC_HOME,  KC_PGUP, | ||||
|         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_DEL,   KC_END,   KC_PGDN, | ||||
|         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_NUHS,    KC_ENT, | ||||
| @ -49,10 +49,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT), | ||||
| 
 | ||||
|     [WIN_FN] = LAYOUT_tkl_f13_iso( | ||||
|         _______,  KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    RGB_TOG,  _______,  _______,  RGB_TOG, | ||||
|         _______,  KC_BRID,  KC_BRIU,  _______,  _______,  RM_VALD,  RM_VALU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    RM_TOGG,  _______,  _______,  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,  _______,  _______,  _______,  _______,              _______,            _______, | ||||
|         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______), | ||||
| }; | ||||
| @ -60,8 +60,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 | ||||
|  | ||||
| @ -25,7 +25,7 @@ enum layers{ | ||||
| 
 | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [MAC_BASE] = LAYOUT_jis_91( | ||||
|         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_NO,    KC_NO,    RGB_MOD, | ||||
|         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_NO,    KC_NO,    RM_NEXT, | ||||
|         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_INT3,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP, | ||||
|         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_DEL,   KC_END,   KC_PGDN, | ||||
|         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_NUHS,    KC_ENT, | ||||
| @ -33,15 +33,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_LCTL,  KC_LOPT,  KC_LCMD,  KC_LNG2,                      KC_SPC,                       KC_LNG1,  KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT), | ||||
| 
 | ||||
|     [MAC_FN] = LAYOUT_jis_91( | ||||
|         _______,            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, | ||||
|         _______,            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_jis_91( | ||||
|         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_PSCR,  KC_NO,    RGB_MOD, | ||||
|         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_PSCR,  KC_NO,    RM_NEXT, | ||||
|         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_INT3,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP, | ||||
|         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_DEL,   KC_END,   KC_PGDN, | ||||
|         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_NUHS,    KC_ENT, | ||||
| @ -49,10 +49,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_LCTL,  KC_LWIN,  KC_LALT,  KC_INT5,                      KC_SPC,                       KC_INT4,  KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT), | ||||
| 
 | ||||
|     [WIN_FN] = LAYOUT_jis_91( | ||||
|         _______,            KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,            _______,  _______,  RGB_TOG, | ||||
|         _______,            KC_BRID,  KC_BRIU,  _______,  _______,  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,  _______,  _______,  _______,  _______,  _______,    _______,                      _______, | ||||
|         _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,  _______,    _______,            _______,  _______,  _______), | ||||
| }; | ||||
|  | ||||
| @ -25,7 +25,7 @@ enum layers{ | ||||
| 
 | ||||
| const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|     [MAC_BASE] = LAYOUT_jis_92( | ||||
|         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_MUTE,  KC_NO,    KC_NO,    RGB_MOD, | ||||
|         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_MUTE,  KC_NO,    KC_NO,    RM_NEXT, | ||||
|         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_INT3,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP, | ||||
|         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_DEL,   KC_END,   KC_PGDN, | ||||
|         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_NUHS,    KC_ENT, | ||||
| @ -33,15 +33,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_LCTL,  KC_LOPT,  KC_LCMD,  KC_LNG2,                      KC_SPC,                       KC_LNG1,  KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT), | ||||
| 
 | ||||
|     [MAC_FN] = LAYOUT_jis_92( | ||||
|         _______,            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,  _______,  _______,  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,   RM_TOGG,  _______,  _______,  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_jis_92( | ||||
|         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_MUTE,  KC_PSCR,  KC_NO,    RGB_MOD, | ||||
|         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_MUTE,  KC_PSCR,  KC_NO,    RM_NEXT, | ||||
|         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_INT3,  KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP, | ||||
|         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_DEL,   KC_END,   KC_PGDN, | ||||
|         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_NUHS,    KC_ENT, | ||||
| @ -49,10 +49,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||||
|         KC_LCTL,  KC_LWIN,  KC_LALT,  KC_INT5,                      KC_SPC,                       KC_INT4,  KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT), | ||||
| 
 | ||||
|     [WIN_FN] = LAYOUT_jis_92( | ||||
|         _______,            KC_BRID,  KC_BRIU,  _______,  _______,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  RGB_TOG,  _______,  _______,  RGB_TOG, | ||||
|         _______,            KC_BRID,  KC_BRIU,  _______,  _______,  RM_VALD,  RM_VALU,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  RM_TOGG,  _______,  _______,  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 // ENCODER_MAP_ENABLE
 | ||||
|  | ||||
| @ -37,7 +37,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | ||||
|     if (!process_record_user(keycode, record)) { return false; } | ||||
|     switch (keycode) { | ||||
| #ifdef RGB_MATRIX_ENABLE | ||||
|         case RGB_TOG: | ||||
|         case QK_RGB_MATRIX_TOGGLE: | ||||
|             if (record->event.pressed) { | ||||
|                 switch (rgb_matrix_get_flags()) { | ||||
|                     case LED_FLAG_ALL: { | ||||
|  | ||||
Some files were not shown because too many files have changed in this diff Show More
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user