From 51320a3bff9f88ecc5e41a686b6763562a1aaaf4 Mon Sep 17 00:00:00 2001 From: ItzAdel Date: Wed, 20 Jul 2022 19:45:33 +0400 Subject: [PATCH] Keymap, RGB light conf update --- firmware/keymaps/default/config.h | 2 +- firmware/keymaps/default/keymap.c | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/firmware/keymaps/default/config.h b/firmware/keymaps/default/config.h index e2b5f80..f87a294 100644 --- a/firmware/keymaps/default/config.h +++ b/firmware/keymaps/default/config.h @@ -3,7 +3,7 @@ #ifdef RGBLIGHT_ENABLE # undef RGBLED_NUM # define RGBLIGHT_ANIMATIONS -# define RGBLED_NUM 54 +# define RGBLED_NUM 46 # undef RGBLED_SPLIT # define RGBLED_SPLIT \ { 23, 23 } diff --git a/firmware/keymaps/default/keymap.c b/firmware/keymaps/default/keymap.c index 5546350..967004a 100644 --- a/firmware/keymaps/default/keymap.c +++ b/firmware/keymaps/default/keymap.c @@ -32,31 +32,31 @@ enum layers { #define PDN_ADJ LT(_ADJUST, KC_PGDN) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT( + [_QWERTY] = LAYOUT_3x7( KC_ESC, KC_GRV, 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_PGUP, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, RCTL_T(KC_QUOT), KC_PGUP, + KC_PGUP, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, RCTL_T(KC_QUOT), KC_PGDN, KC_LALT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, BSL_RAL, - DEL_RSE, BSP_LSH, GUI_LWR, ENT_LWR, SPC_RSH, TAB_RSE + DEL_RSE, BSP_LSH, GUI_LWR, ENT_LWR, SPC_RSH, TAB_RSE ), - [_LOWER] = LAYOUT( + [_LOWER] = LAYOUT_3x7( KC_MUTE, KC_UNDS, 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_PPLS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_EQL, _______, KC_PMNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, - _______, _______, _______, _______, _______, _______ + _______, BSP_LSH, _______, _______, SPC_RSH, _______ ), - [_RAISE] = LAYOUT( - _______, KC_NLCK, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_END, KC_HOME, KC_UP, KC_PSCR, KC_SLCK, KC_CAPS, _______, - KC_VOLU, KC_PEQL, KC_PAST, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS, KC_APP, KC_VOLD, - _______, KC_P0, KC_P1, KC_P2, KC_P3, KC_PCMM, _______, KC_END, _______, KC_PGDN, KC_PAUS, _______, - _______, _______, _______, _______, _______, _______ + [_RAISE] = LAYOUT_3x7( + _______, KC_NLCK, KC_PSLS, KC_P7, KC_P8, KC_P9, KC_PMNS, _______, KC_END, KC_HOME, KC_PSCR, KC_SLCK, KC_CAPS, _______, + KC_VOLU, KC_PEQL, KC_PAST, KC_P4, KC_P5, KC_P6, KC_PPLS, _______, KC_LEFT, KC_UP, KC_RGHT, KC_INS, KC_APP, KC_VOLD, + _______, KC_P0, KC_P1, KC_P2, KC_P3, KC_PCMM, _______, KC_END, KC_DOWN, KC_PGDN, KC_PAUS, _______, + _______, BSP_LSH, _______, _______, SPC_RSH, _______ ), - [_ADJUST] = LAYOUT( - _______, QK_RBT, KC_ASUP, KC_ASTG, KC_ASDN, _______, _______, KC_WH_U, KC_BTN1, KC_ACL1, KC_BTN2, _______, _______, _______, - _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, KC_WH_D, KC_MS_L, KC_MS_U, KC_MS_R, _______, _______, _______, - RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, KC_ACL0, KC_MS_D, KC_ACL2, _______, _______, - _______, _______, _______, _______, _______, _______ + [_ADJUST] = LAYOUT_3x7( + _______, _______, KC_ASUP, KC_ASTG, KC_ASDN, _______, _______, KC_WH_U, KC_BTN1, KC_ACL1, KC_BTN2, _______, _______, _______, + _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, KC_WH_D, KC_MS_L, KC_MS_U, KC_MS_R, _______, _______, _______, + RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, KC_ACL0, KC_MS_D, KC_ACL2, _______, _______, + _______, BSP_LSH, _______, _______, SPC_RSH, _______ ), };