diff options
Diffstat (limited to 'keyboards/niu_mini/keymaps')
| -rw-r--r-- | keyboards/niu_mini/keymaps/xtonhasvim/config.h | 10 | ||||
| -rw-r--r-- | keyboards/niu_mini/keymaps/xtonhasvim/keymap.c | 187 | ||||
| -rw-r--r-- | keyboards/niu_mini/keymaps/xtonhasvim/rules.mk | 2 |
3 files changed, 130 insertions, 69 deletions
diff --git a/keyboards/niu_mini/keymaps/xtonhasvim/config.h b/keyboards/niu_mini/keymaps/xtonhasvim/config.h index a22bcab0f4..aa13d7b735 100644 --- a/keyboards/niu_mini/keymaps/xtonhasvim/config.h +++ b/keyboards/niu_mini/keymaps/xtonhasvim/config.h @@ -3,7 +3,7 @@ #include "../../config.h" -#define MUSIC_MASK (keycode != KC_NO) +// #define MUSIC_MASK (keycode != KC_NO) /* * MIDI options @@ -16,7 +16,7 @@ - MIDI notes can be sent when in Music mode is on */ -#define MIDI_BASIC +// #define MIDI_BASIC /* enable advanced MIDI features: - MIDI notes can be added to the keymap @@ -32,12 +32,6 @@ // help for fast typist+dual function keys? #define PERMISSIVE_HOLD -/* disable debug print */ -#define NO_DEBUG - -/* disable print */ -#define NO_PRINT - /* speed up mousekeys a bit */ #define MOUSEKEY_DELAY 50 #define MOUSEKEY_INTERVAL 20 diff --git a/keyboards/niu_mini/keymaps/xtonhasvim/keymap.c b/keyboards/niu_mini/keymaps/xtonhasvim/keymap.c index dd764826fe..bfda812738 100644 --- a/keyboards/niu_mini/keymaps/xtonhasvim/keymap.c +++ b/keyboards/niu_mini/keymaps/xtonhasvim/keymap.c @@ -16,6 +16,7 @@ #include QMK_KEYBOARD_H #include "xtonhasvim.h" +#include "fancylighting.h" /************************************ * states @@ -27,7 +28,15 @@ enum layers { _RAISE, _ADJUST, _MOVE, - _MOUSE + _MOUSE, + _CMD +}; + +extern uint8_t vim_cmd_layer(void) { return _CMD; } + +enum keymap_keycodes { + RAISE = VIM_SAFE_RANGE, + LOWER }; /************************************ @@ -48,14 +57,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' * * - Ctrl acts as Esc when tapped. - * - Holding A or ; switches to movement layer. + * - Holding ; switches to movement layer. * - Raise and Lower are one-shot layers. */ [_QWERTY] = LAYOUT_planck_mit( - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - LCTL_T(KC_ESC), LT(_MOVE,KC_A), KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT(_MOVE,KC_SCLN), KC_QUOT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RSFT_T(KC_ENT), - TG(_MOUSE), X_____X, KC_LALT, KC_LGUI, OSL(_LOWER), KC_SPC, OSL(_RAISE), KC_LGUI, KC_LALT, X_____X, VIM_START + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + LCTL_T(KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT(_MOVE,KC_SCLN), KC_QUOT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, RSFT_T(KC_ENT), + LSFT(KC_LALT), TG(_MOUSE), KC_LALT, KC_LGUI, LOWER, KC_SPC, RAISE, KC_LGUI, KC_LALT, X_____X, VIM_START ), /* Lower @@ -70,10 +79,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_LOWER] = LAYOUT_planck_mit( - KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_BSPC, - KC_DEL, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, - _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, X_____X, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, - X_____X, TO(_QWERTY), _______, _______, _______, KC_BSPC, OSL(_ADJUST), _______, _______, TO(_QWERTY), X_____X + KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_BSPC, + KC_DEL, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, X_____X, X_____X, X_____X, X_____X, FIREY_RETURN, + _______, TO(_QWERTY), _______, _______, _______, KC_BSPC, _______, _______, _______, TO(_QWERTY), X_____X ), /* Raise @@ -88,10 +97,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------------------------------------------------------------------' */ [_RAISE] = LAYOUT_planck_mit( - KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSPC, - KC_DEL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, - _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, - X_____X, TO(_QWERTY), _______, _______, OSL(_ADJUST), X_____X, _______, _______, _______, TO(_QWERTY), X_____X + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSPC, + KC_DEL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSLS, + _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, X_____X, X_____X, X_____X, X_____X, FIREY_RETURN, + _______, TO(_QWERTY), _______, _______, _______, KC_BSPC, _______, _______, _______, TO(_QWERTY), X_____X ), @@ -99,17 +108,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,-------------------------------------------------------------------------------------. * |RGBPlain| Reset| | | | | | | | | | Del | * |--------+------+------+------+------+-------------+------+------+------+------+------| - * |RGBMode-| | |Aud on|Audoff|AGnorm|AGswap| | | | |Lite+ | + * |RGBMode-| | | | | | | | | | |Lite+ | * |--------+------+------+------+------+------|------+------+------+------+------+------| - * |RGBMode+|Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof| | | | |Lite- | + * |RGBMode+| | | | | | | Next | Vol- | Vol+ | Play |Lite- | * |--------+------+------+------+------+------+------+------+------+------+------+------| * | RGB | Bail | | | | | | | | Bail | | * `-------------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT_planck_mit( RGB_MODE_PLAIN, RESET, DEBUG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, - RGB_MODE_REVERSE, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, RGB_VAI, - RGB_MODE_FORWARD, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, RGB_VAD, + RGB_MODE_REVERSE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, + RGB_MODE_FORWARD, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, RGB_VAD, RGB_TOG, TO(_QWERTY), _______, _______, _______, _______, _______, _______, _______, TO(_QWERTY), X_____X ), @@ -120,7 +129,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { TO(_QWERTY), X_____X, X_____X, X_____X, X_____X, X_____X, KC_HOME, KC_PGDN, KC_PGUP, KC_END, X_____X, X_____X, _______, X_____X, LGUI(KC_LBRC), LGUI(LSFT(KC_LBRC)), LGUI(LSFT(KC_RBRC)), LGUI(KC_RBRC), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, X_____X, X_____X, _______, X_____X, X_____X, X_____X, X_____X, X_____X, X_____X, X_____X, X_____X, X_____X, X_____X, _______, - X_____X, TO(_QWERTY), _______, _______, _______, X_____X, _______, _______, _______, TO(_QWERTY), X_____X + _______, TO(_QWERTY), _______, _______, _______, X_____X, _______, _______, _______, TO(_QWERTY), X_____X ), /* mouse layer @@ -132,68 +141,124 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, TO(_QWERTY), _______, _______, _______, X_____X, _______, _______, _______, TO(_QWERTY), X_____X ), -/* vim edit mode. just has an escape -> _CMD key */ -[_EDIT] = LAYOUT_planck_mit( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - VIM_START, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, TO(_QWERTY), _______, _______, _______, _______, _______, _______, _______, TO(_QWERTY), _______ -), - /* vim command layer. */ [_CMD] = LAYOUT_planck_mit( - X_____X, X_____X, VIM_W, VIM_E, X_____X, X_____X, VIM_Y, VIM_U, VIM_I, VIM_O, VIM_P, X_____X, - VIM_ESC, VIM_A, VIM_S, VIM_D, X_____X, VIM_G, VIM_H, VIM_J, VIM_K, VIM_L, X_____X, X_____X, - VIM_SHIFT, X_____X, VIM_X, VIM_C, VIM_V, VIM_B, X_____X, X_____X, VIM_COMMA, VIM_PERIOD, X_____X, VIM_SHIFT, - X_____X, TO(_QWERTY), _______, _______, X_____X, X_____X, X_____X, _______, _______, TO(_QWERTY), X_____X + X_____X, X_____X, VIM_W, VIM_E, X_____X, X_____X, VIM_Y, VIM_U, VIM_I, VIM_O, VIM_P, X_____X, + VIM_ESC, VIM_A, VIM_S, VIM_D, X_____X, VIM_G, VIM_H, VIM_J, VIM_K, VIM_L, X_____X, X_____X, + VIM_SHIFT, X_____X, VIM_X, VIM_C, VIM_V, VIM_B, X_____X, X_____X, VIM_COMMA, VIM_PERIOD, X_____X, VIM_SHIFT, + _______, TO(_QWERTY), _______, _______, X_____X, X_____X, X_____X, _______, _______, TO(_QWERTY), X_____X ) }; +#define C_RED 0xFF, 0x00, 0x00 +#define C_GRN 0x00, 0xFF, 0x00 +#define C_BLU 0x00, 0x00, 0xFF + +#define C_YAN 0x00, 0xFF, 0xFF +#define C_PRP 0x7A, 0x00, 0xFF +#define C_ORG 0xFF, 0x93, 0x00 + /** Set just 4 LEDs closest to the user. Slightly less annoying to bystanders.*/ -void rgbflag(uint8_t r, uint8_t g, uint8_t b) { - for(int i = 0; i < RGBLED_NUM; i++){ - switch(i) { - case 9 ... 12: - // rgblight_setrgb_at(r,g,b,i); - led[i].r = r; - led[i].g = g; - led[i].b = b; - break; - default: - // rgblight_setrgb_at(0,0,0,i); - led[i].r = 0; - led[i].g = 0; - led[i].b = 0; - break; +void rgbflag(uint8_t r, uint8_t g, uint8_t b, uint8_t rr, uint8_t gg, uint8_t bb) { + LED_TYPE *target_led = user_rgb_mode ? shadowed_led : led; + for (int i = 0; i < RGBLED_NUM; i++) { + switch (i) { + case 12: case 13: + target_led[i].r = r; + target_led[i].g = g; + target_led[i].b = b; + break; + case 8: case 9: + target_led[i].r = rr; + target_led[i].g = gg; + target_led[i].b = bb; + break; + default: + target_led[i].r = 0; + target_led[i].g = 0; + target_led[i].b = 0; + break; } } rgblight_set(); } -uint32_t layer_state_set_user(uint32_t state) { - if(rgblight_get_mode() == 1) { - switch (biton32(state)) { +void set_state_leds(void) { + if (rgblight_get_mode() == 1) { + switch (biton32(layer_state)) { case _RAISE: + rgbflag(C_BLU, C_GRN); + break; case _LOWER: + rgbflag(C_BLU, C_RED); + break; case _ADJUST: - rgbflag(0x00, 0x00, 0xFF); - break; + rgbflag(C_BLU, C_PRP); + break; case _MOVE: + rgbflag(C_RED, C_PRP); + break; case _MOUSE: - rgbflag(0xFF, 0x00, 0x00); - break; + rgbflag(C_RED, C_GRN); + break; case _CMD: - rgbflag(0x00, 0xFF, 0x00); - break; - case _EDIT: - rgbflag(0x7A, 0x00, 0xFF); - break; + switch(vstate) { + case VIM_V: + case VIM_VI: + case VIM_VS: + rgbflag(C_GRN, C_YAN); + break; + case VIM_C: + case VIM_CI: + rgbflag(C_GRN, C_ORG); + break; + case VIM_D: + case VIM_DI: + rgbflag(C_GRN, C_RED); + break; + case VIM_G: + rgbflag(C_GRN, C_BLU); + break; + case VIM_Y: + rgbflag(C_GRN, C_PRP); + break; + case VIM_START: + default: + rgbflag(C_GRN, C_GRN); + break; + } + break; default: // for any other layers, or the default layer - rgbflag(0x00, 0xFF, 0xFF); - break; + rgbflag(C_YAN, C_YAN); + break; } } - return state; +} + +bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { + switch(keycode) { + case LOWER: + if (record->event.pressed) { + layer_on(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_LOWER); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + case RAISE: + if (record->event.pressed) { + layer_on(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } else { + layer_off(_RAISE); + update_tri_layer(_LOWER, _RAISE, _ADJUST); + } + return false; + break; + } + return true; } diff --git a/keyboards/niu_mini/keymaps/xtonhasvim/rules.mk b/keyboards/niu_mini/keymaps/xtonhasvim/rules.mk index 3a93f9fd8c..359f94f1e4 100644 --- a/keyboards/niu_mini/keymaps/xtonhasvim/rules.mk +++ b/keyboards/niu_mini/keymaps/xtonhasvim/rules.mk @@ -4,3 +4,5 @@ endif MOUSEKEY_ENABLE = yes BACKLIGHT_ENABLE = no +AUDIO_ENABLE = no +CONSOLE_ENABLE = no # Console for debug(+400) |