From b1fe8a10c9b0e9980ab9ebee3d641f36be5cf9f2 Mon Sep 17 00:00:00 2001 From: kemonine Date: Thu, 17 Sep 2020 12:55:54 -0400 Subject: [PATCH] Updated keymap --- firmware/alt/kemonine/qmk/keymap.c | 30 ++++++++++-------- .../kemonine/qmk/massdrop_alt_kemonine.bin | Bin 47096 -> 47096 bytes 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/firmware/alt/kemonine/qmk/keymap.c b/firmware/alt/kemonine/qmk/keymap.c index 942df8d1..cf8cdaea 100644 --- a/firmware/alt/kemonine/qmk/keymap.c +++ b/firmware/alt/kemonine/qmk/keymap.c @@ -19,30 +19,31 @@ enum alt_keycodes { keymap_config_t keymap_config; rgb_config_t rgb_matrix_config; +const uint8_t PROGMEM layercolors[][2] = { + [0] = {10,255}, + [1] = {128, 255} +}; + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_65_ansi_blocker(KC_GESC, 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_HOME, 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_PGUP, LM(1, MOD_LALT), 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_PGDN, 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_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(1), KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT), + KC_LCTL, KC_LGUI, MO(1), KC_SPC, MO(1), KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT), [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_DEL, KC_DEL, - KC_CAPS, KC_TRNS, KC_TRNS, KC_MS_UP, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, - KC_NO, KC_MS_WH_DOWN, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_MS_WH_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PLAY_PAUSE, KC_RSFT, RGB_VAI, KC_MUTE, - KC_TRNS, KC_TRNS, KC_MS_BTN2, KC_MS_BTN1, KC_NO, KC_RCTL, KC_VOLD, RGB_VAD, KC_VOLU) -}; - -const uint8_t PROGMEM layercolors[][2] = { - [0] = {10,255} + KC_CAPS, KC_TRNS, KC_TRNS, KC_MS_UP, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, + KC_NO, KC_MS_WH_DOWN, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_MS_WH_UP, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, + KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_BTN2, KC_MS_BTN1, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PLAY_PAUSE, KC_RSFT, RGB_VAI, KC_MUTE, + KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, KC_NO, KC_RCTL, KC_VOLD, RGB_VAD, KC_VOLU) }; const uint8_t PROGMEM ledcolors[][DRIVER_LED_TOTAL][3] = { [1] = { {128, 255, 255}, {128, 255, 255}, {128, 255, 255}, {128, 255, 255}, {128, 255, 255}, {128, 255, 255}, {128, 255, 255}, {128, 255, 255}, {128, 255, 255}, {128, 255, 255}, {128, 255, 255}, {128, 255, 255}, {128, 255, 255}, {128, 255, 255}, {128, 255, 255}, - {128, 255, 255}, {0, 0, 0}, {0, 0, 0}, {128, 255, 255}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {128, 255, 255}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {128, 255, 255}, - {0, 0, 0}, {128, 255, 255}, {128, 255, 255}, {128, 255, 255}, {128, 255, 255}, {128, 255, 255}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {128, 255, 255}, - {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {128, 255, 255}, {0, 0, 0}, {128, 255, 255}, {128, 255, 255}, - {0, 0, 0}, {0, 0, 0}, {128, 255, 255}, {128, 255, 255}, {0, 0, 0}, {128, 255, 255}, {128, 255, 255}, {128, 255, 255}, {128, 255, 255} + {128, 255, 255}, {0, 0, 0}, {0, 0, 0}, {128, 255, 255}, {0, 0, 0}, {0, 0, 0}, {128, 255, 255}, {0, 0, 0}, {128, 255, 255}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {128, 255, 255}, + {0, 0, 0}, {128, 255, 255}, {128, 255, 255}, {128, 255, 255}, {128, 255, 255}, {128, 255, 255}, {0, 0, 0}, {128, 255, 255}, {128, 255, 255}, {128, 255, 255}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {128, 255, 255}, + {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {128, 255, 255}, {128, 255, 255}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {128, 255, 255}, {0, 0, 0}, {128, 255, 255}, {128, 255, 255}, + {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {128, 255, 255}, {128, 255, 255}, {128, 255, 255}, {128, 255, 255} } }; @@ -59,6 +60,7 @@ void matrix_init_user(void) { void matrix_scan_user(void) { }; +// Set the colors for individual LEDs for a given layer void set_leds_color( int layer) { for (int i = 0; i < DRIVER_LED_TOTAL; i++) { uint8_t val = pgm_read_byte(&ledcolors[layer][i][2]); @@ -71,6 +73,7 @@ void set_leds_color( int layer) { } } +// Set the colors for ALL LEDs for a given layer void set_layer_color( uint8_t layer ) { HSV hsv = { .h = pgm_read_byte(&layercolors[layer][0]), .s = pgm_read_byte(&layercolors[layer][1]), .v = rgb_matrix_config.hsv.v}; RGB rgb = hsv_to_rgb( hsv ); @@ -79,6 +82,7 @@ void set_layer_color( uint8_t layer ) { } } +// Override standard rgb colorization stuff void rgb_matrix_indicators_user(void) { uint32_t mode = rgblight_get_mode(); // assign colors if the matrix is on and the current mode diff --git a/firmware/alt/kemonine/qmk/massdrop_alt_kemonine.bin b/firmware/alt/kemonine/qmk/massdrop_alt_kemonine.bin index 211c201c2ec49d731147caa32da4267935bb2768..f96cacfa9ac6fb09970c09c6b717fbd0e089c7ad 100644 GIT binary patch delta 247 zcmezIp6SPXrVaC0MJN0yH|qVtXdvKyyQ238lL5mFh7VSgH?pd8+5O1W`FxRSgTUU+ zPgpaUdFyU6Ffe)>{}5m(aKE!Tl5;*IEFaXKP8)t}4o-;#;2grsXp!nqc8KTTkNj8Y+WP=&flUD=PDol@M z=K9|-xq4&cs0)p_iHWa@mr$h1LVFT?)L zPgpaUd24PmFfe)>{}5m(aKE)Vl5;*INALPb6`mIv~#th(R