diff options
54 files changed, 4502 insertions, 311 deletions
diff --git a/keyboards/keychron/bluetooth/bluetooth.c b/keyboards/keychron/bluetooth/bluetooth.c index 481099af67..bf0950a529 100644 --- a/keyboards/keychron/bluetooth/bluetooth.c +++ b/keyboards/keychron/bluetooth/bluetooth.c @@ -291,7 +291,7 @@ uint8_t bluetooth_keyboard_leds(void) { extern keymap_config_t keymap_config; void bluetooth_send_keyboard(report_keyboard_t *report) { - if (bt_state == BLUETOOTH_PARING && !pincodeEntry) return; + if ((bt_state == BLUETOOTH_PARING && !pincodeEntry) || battery_is_critical_low()) return; if (bt_state == BLUETOOTH_CONNECTED || (bt_state == BLUETOOTH_PARING && pincodeEntry)) { #if defined(NKRO_ENABLE) diff --git a/keyboards/keychron/k5_pro/ansi/rgb/config.h b/keyboards/keychron/k5_pro/ansi/rgb/config.h index 9f656ec129..19a8b9aa2e 100644 --- a/keyboards/keychron/k5_pro/ansi/rgb/config.h +++ b/keyboards/keychron/k5_pro/ansi/rgb/config.h @@ -21,6 +21,8 @@ # define DRIVER_COUNT 2 # define DRIVER_ADDR_1 0b1110111 # define DRIVER_ADDR_2 0b1110100 + +/* RGB Matrix Configuration */ # define DRIVER_1_LED_TOTAL 58 # define DRIVER_2_LED_TOTAL 50 # define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) @@ -34,14 +36,13 @@ /* Turn off backllit if brightness value is low */ # define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48 -# define NUM_LOCK_INDEX 37 // NumLock - +/* Indication led */ +# define NUM_LOCK_INDEX 37 // NumLock # define LOW_BAT_IND_INDEX 98 // Space // RGB Matrix Animation modes. Explicitly enabled // For full list of effects, see: // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects - # define RGB_MATRIX_KEYPRESSES # define RGB_MATRIX_FRAMEBUFFER_EFFECTS diff --git a/keyboards/keychron/k5_pro/ansi/rgb/info.json b/keyboards/keychron/k5_pro/ansi/rgb/info.json index 2c7946e4de..6cca75cf47 100644 --- a/keyboards/keychron/k5_pro/ansi/rgb/info.json +++ b/keyboards/keychron/k5_pro/ansi/rgb/info.json @@ -30,6 +30,121 @@ "solid_reactive_multinexus": true, "splash": true, "solid_splash": true - } + }, + "layout": [ + {"matrix":[0, 0], "flags":1, "x":0, "y":0}, + {"matrix":[0, 1], "flags":1, "x":21, "y":0}, + {"matrix":[0, 2], "flags":1, "x":32, "y":0}, + {"matrix":[0, 3], "flags":1, "x":42, "y":0}, + {"matrix":[0, 4], "flags":1, "x":53, "y":0}, + {"matrix":[0, 5], "flags":1, "x":69, "y":0}, + {"matrix":[0, 6], "flags":1, "x":79, "y":0}, + {"matrix":[0, 7], "flags":1, "x":90, "y":0}, + {"matrix":[0, 8], "flags":1, "x":100, "y":0}, + {"matrix":[0, 9], "flags":1, "x":116, "y":0}, + {"matrix":[0, 10], "flags":1, "x":127, "y":0}, + {"matrix":[0, 11], "flags":1, "x":137, "y":0}, + {"matrix":[0, 12], "flags":1, "x":148, "y":0}, + {"matrix":[0, 14], "flags":1, "x":160, "y":0}, + {"matrix":[0, 15], "flags":1, "x":170, "y":0}, + {"matrix":[0, 16], "flags":1, "x":181, "y":0}, + {"matrix":[0, 17], "flags":4, "x":192, "y":0}, + {"matrix":[0, 18], "flags":4, "x":203, "y":0}, + {"matrix":[0, 19], "flags":4, "x":213, "y":0}, + {"matrix":[0, 20], "flags":4, "x":224, "y":0}, + + {"matrix":[1, 0], "flags":1, "x":0, "y":14}, + {"matrix":[1, 1], "flags":8, "x":11, "y":14}, + {"matrix":[1, 2], "flags":8, "x":21, "y":14}, + {"matrix":[1, 3], "flags":8, "x":32, "y":14}, + {"matrix":[1, 4], "flags":4, "x":42, "y":14}, + {"matrix":[1, 5], "flags":4, "x":53, "y":14}, + {"matrix":[1, 6], "flags":4, "x":63, "y":14}, + {"matrix":[1, 7], "flags":4, "x":74, "y":14}, + {"matrix":[1, 8], "flags":4, "x":84, "y":14}, + {"matrix":[1, 9], "flags":4, "x":95, "y":14}, + {"matrix":[1, 10], "flags":4, "x":106, "y":14}, + {"matrix":[1, 11], "flags":4, "x":116, "y":14}, + {"matrix":[1, 12], "flags":4, "x":127, "y":14}, + {"matrix":[1, 13], "flags":1, "x":143, "y":14}, + {"matrix":[1, 14], "flags":1, "x":160, "y":14}, + {"matrix":[1, 15], "flags":1, "x":170, "y":14}, + {"matrix":[1, 16], "flags":1, "x":181, "y":14}, + {"matrix":[1, 17], "flags":8, "x":192, "y":14}, + {"matrix":[1, 18], "flags":4, "x":203, "y":14}, + {"matrix":[1, 19], "flags":4, "x":213, "y":14}, + {"matrix":[1, 20], "flags":4, "x":224, "y":14}, + + {"matrix":[2, 0], "flags":1, "x":3, "y":26}, + {"matrix":[2, 1], "flags":4, "x":16, "y":26}, + {"matrix":[2, 2], "flags":4, "x":26, "y":26}, + {"matrix":[2, 3], "flags":4, "x":37, "y":26}, + {"matrix":[2, 4], "flags":4, "x":48, "y":26}, + {"matrix":[2, 5], "flags":4, "x":58, "y":26}, + {"matrix":[2, 6], "flags":4, "x":69, "y":26}, + {"matrix":[2, 7], "flags":4, "x":79, "y":26}, + {"matrix":[2, 8], "flags":4, "x":90, "y":26}, + {"matrix":[2, 9], "flags":4, "x":100, "y":26}, + {"matrix":[2, 10], "flags":4, "x":111, "y":26}, + {"matrix":[2, 11], "flags":4, "x":121, "y":26}, + {"matrix":[2, 12], "flags":1, "x":132, "y":26}, + {"matrix":[2, 13], "flags":1, "x":145, "y":26}, + {"matrix":[2, 14], "flags":1, "x":160, "y":26}, + {"matrix":[2, 15], "flags":1, "x":170, "y":26}, + {"matrix":[2, 16], "flags":1, "x":181, "y":26}, + {"matrix":[2, 17], "flags":4, "x":192, "y":26}, + {"matrix":[2, 18], "flags":4, "x":203, "y":26}, + {"matrix":[2, 19], "flags":4, "x":213, "y":26}, + {"matrix":[2, 20], "flags":4, "x":224, "y":26}, + + {"matrix":[3, 0], "flags":8, "x":4, "y":39}, + {"matrix":[3, 1], "flags":4, "x":18, "y":39}, + {"matrix":[3, 2], "flags":4, "x":29, "y":39}, + {"matrix":[3, 3], "flags":4, "x":40, "y":39}, + {"matrix":[3, 4], "flags":4, "x":50, "y":39}, + {"matrix":[3, 5], "flags":4, "x":61, "y":39}, + {"matrix":[3, 6], "flags":4, "x":71, "y":39}, + {"matrix":[3, 7], "flags":4, "x":82, "y":39}, + {"matrix":[3, 8], "flags":4, "x":92, "y":39}, + {"matrix":[3, 9], "flags":4, "x":103, "y":39}, + {"matrix":[3, 10], "flags":4, "x":114, "y":39}, + {"matrix":[3, 11], "flags":4, "x":124, "y":39}, + {"matrix":[3, 13], "flags":4, "x":141, "y":39}, + {"matrix":[3, 17], "flags":4, "x":192, "y":39}, + {"matrix":[3, 18], "flags":4, "x":203, "y":39}, + {"matrix":[3, 19], "flags":4, "x":213, "y":39}, + + {"matrix":[4, 0], "flags":1, "x":7, "y":51}, + {"matrix":[4, 2], "flags":4, "x":24, "y":51}, + {"matrix":[4, 3], "flags":4, "x":34, "y":51}, + {"matrix":[4, 4], "flags":4, "x":45, "y":51}, + {"matrix":[4, 5], "flags":4, "x":55, "y":51}, + {"matrix":[4, 6], "flags":4, "x":66, "y":51}, + {"matrix":[4, 7], "flags":4, "x":77, "y":51}, + {"matrix":[4, 8], "flags":4, "x":87, "y":51}, + {"matrix":[4, 9], "flags":4, "x":98, "y":51}, + {"matrix":[4, 10], "flags":4, "x":108, "y":51}, + {"matrix":[4, 11], "flags":4, "x":119, "y":51}, + {"matrix":[4, 13], "flags":1, "x":139, "y":51}, + {"matrix":[4, 15], "flags":1, "x":170, "y":51}, + {"matrix":[4, 17], "flags":4, "x":192, "y":51}, + {"matrix":[4, 18], "flags":4, "x":203, "y":51}, + {"matrix":[4, 19], "flags":4, "x":213, "y":51}, + {"matrix":[4, 20], "flags":4, "x":224, "y":51}, + + {"matrix":[5, 0], "flags":1, "x":1, "y":64}, + {"matrix":[5, 1], "flags":1, "x":15, "y":64}, + {"matrix":[5, 2], "flags":1, "x":28, "y":64}, + {"matrix":[5, 6], "flags":4, "x":67, "y":64}, + {"matrix":[5, 10], "flags":1, "x":107, "y":64}, + {"matrix":[5, 11], "flags":1, "x":120, "y":64}, + {"matrix":[5, 12], "flags":1, "x":133, "y":64}, + {"matrix":[5, 13], "flags":1, "x":147, "y":64}, + {"matrix":[5, 14], "flags":1, "x":160, "y":64}, + {"matrix":[5, 15], "flags":1, "x":170, "y":64}, + {"matrix":[5, 16], "flags":1, "x":181, "y":64}, + {"matrix":[5, 17], "flags":4, "x":198, "y":64}, + {"matrix":[5, 19], "flags":4, "x":213, "y":64} + ] } } diff --git a/keyboards/keychron/k5_pro/ansi/rgb/keymaps/default/keymap.c b/keyboards/keychron/k5_pro/ansi/rgb/keymaps/default/keymap.c index 04c056a00e..37cfcff0a8 100644 --- a/keyboards/keychron/k5_pro/ansi/rgb/keymaps/default/keymap.c +++ b/keyboards/keychron/k5_pro/ansi/rgb/keymaps/default/keymap.c @@ -16,44 +16,44 @@ #include QMK_KEYBOARD_H -// clang-format off -enum layers{ - MAC_BASE, - MAC_FN, - WIN_BASE, - WIN_FN +enum layers { + MAC_BASE, + MAC_FN, + WIN_BASE, + WIN_FN, }; +// clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[MAC_BASE] = LAYOUT_ansi_108( - 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_SNAP, KC_SIRI, RGB_MOD, KC_F13, KC_F14, KC_F15, KC_F16, - 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, - 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_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, KC_ROPTN,MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT), + [MAC_BASE] = LAYOUT_108_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_SNAP, KC_SIRI, RGB_MOD, KC_F13, KC_F14, KC_F15, KC_F16, + 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, + 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_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, KC_ROPTN,MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT), -[MAC_FN] = LAYOUT_ansi_108( - _______, 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, _______, _______, _______, _______, - _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + [MAC_FN] = LAYOUT_108_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, _______, _______, _______, _______, + _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), -[WIN_BASE] = LAYOUT_ansi_108( - 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_CTANA, RGB_MOD, _______, _______, _______, _______, - 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, - 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_P1, KC_P2, KC_P3, KC_PENT, - 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_BASE] = LAYOUT_108_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_CTANA, RGB_MOD, _______, _______, _______, _______, + 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, + 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_P1, KC_P2, KC_P3, KC_PENT, + 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_ansi_108( - _______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_TOG, _______, _______, _______, _______, - _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + [WIN_FN] = LAYOUT_108_ansi( + _______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_TOG, _______, _______, _______, _______, + _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), }; diff --git a/keyboards/keychron/k5_pro/ansi/rgb/keymaps/via/keymap.c b/keyboards/keychron/k5_pro/ansi/rgb/keymaps/via/keymap.c index 04c056a00e..07c73eccad 100644 --- a/keyboards/keychron/k5_pro/ansi/rgb/keymaps/via/keymap.c +++ b/keyboards/keychron/k5_pro/ansi/rgb/keymaps/via/keymap.c @@ -16,44 +16,44 @@ #include QMK_KEYBOARD_H -// clang-format off -enum layers{ - MAC_BASE, - MAC_FN, - WIN_BASE, - WIN_FN +enum layers { + MAC_BASE, + MAC_FN, + WIN_BASE, + WIN_FN, }; +// clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[MAC_BASE] = LAYOUT_ansi_108( - 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_SNAP, KC_SIRI, RGB_MOD, KC_F13, KC_F14, KC_F15, KC_F16, - 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, - 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_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, KC_ROPTN,MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT), + [MAC_BASE] = LAYOUT_108_ansi( + KC_ESC, KC_BRID, KC_BRIU, KC_MICT, KC_LAPA, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_SIRI, RGB_MOD, KC_F13, KC_F14, KC_F15, KC_F16, + 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, + 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_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, KC_ROPTN,MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT), -[MAC_FN] = LAYOUT_ansi_108( - _______, 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, _______, _______, _______, _______, - _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), + [MAC_FN] = LAYOUT_108_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, _______, _______, _______, _______, + _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), -[WIN_BASE] = LAYOUT_ansi_108( - 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_CTANA, RGB_MOD, _______, _______, _______, _______, - 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, - 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_P1, KC_P2, KC_P3, KC_PENT, - 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_BASE] = LAYOUT_108_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_CTANA, RGB_MOD, _______, _______, _______, _______, + 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, + 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_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, MO(WIN_FN),KC_RCTL, |