From e4832359149a8c9cd385797f3cb3462d78b6433a Mon Sep 17 00:00:00 2001 From: Nicolas FABRE Date: Fri, 19 May 2023 15:58:32 +0200 Subject: [PATCH] clean some code --- .../kanagawa/ansi/keymaps/default/keymap.c | 61 +++----------- .../ciaanh/kanagawa/ansi/keymaps/via/keymap.c | 76 ++--------------- .../kanagawa/iso/keymaps/default/keymap.c | 83 ++++--------------- 3 files changed, 35 insertions(+), 185 deletions(-) diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c index 73833d4f89c..7ac53f1a65a 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/default/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'---------' `---------' * | LShift | --- | Z | X | C | V | B | N | M | , | . | / | RShift | ,---------. * |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' | UP | -* | LCtrl | LGUI | LAlt | Func | ,---------. ,---------. | RAlt | CODE | RCtrl | ,---------|---------|---------. +* | LCtrl | LGUI | LAlt | CODE | ,---------. ,---------. | RAlt | RCtrl | FUNC | ,---------|---------|---------. * |---------+---------+---------+---------+ | Space | | Space | +---------+---------+---------' | LEFT | DOWN | RIGHT | * `---------' `---------' `---------+---------+---------' */ @@ -56,7 +56,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ ), - [_FUNC] = LAYOUT_ansi( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ @@ -67,17 +66,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, RGB_SPD, RGB_SPI, TO_BASE, RGB_SAD, RGB_HUD, RGB_SAI \ ), + [_TOP] = LAYOUT_ansi( + 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, \ + 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 \ + ), + }; - - - - -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ /*****************************************************************************************************/ #ifdef OLED_ENABLE @@ -120,52 +120,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // oled_write_ln("", false); } - // static void render_kanagawa_logo(void) { - // static const char PROGMEM kanagawa_logo[] = { - // 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,192,192, 64, 96, 96, 48, 24, 24, 8, 12, 12, 12, 4, 4, 6,134,134,195,194,194,210,250,250,254,254,254,188,124,252,232,248,216, 48,160,224,192,192,128, 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, 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, 0, 0, 0, 0, - // 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,192, 96, 48, 48, 24, 12, 4, 6, 3, 3, 0,192,192,208,248,248,252,255,255,127,254,158, 46,158,220, 63, 63, 63, 63, 63, 15, 7, 63, 63, 63,255,255,247,255,255,255,255,255,255,191,255,255,175, 28, 32,160,224,224,224,224,192,192, 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, 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,192, 96, 96, 48, 24, 12, 6, 3, 3, 0,128,128,192,192,192, 0, 0, 0, 0, 0, 0,143,153, 31, 63, 38,191,247,240,248,254,127,137,224,252,206, 7,192,240, 24, 60, 70,146,227,225,241,123,127,127, 55, 55,255,255,255,255,255,127,254,255,223, 63,255,255,255,255,255,158, 30, 56, 16, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 56, - // 56,248,249,241,248,248,224,240,240,252,254,255,255,239,231,239,255,255,253,252,248,216,254,254,252,255,255,255,255,254,254,253,251,247,255,254,255,255,255,255,255,255,253,249, 88,126,255,255, 15, 1, 0, 0, 0, 0, 0, 0, 3, 3, 1, 7, 1, 1, 1, 3, 31, 31, 27, 31, 31, 27, 3, 7, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, - // 62,124,208,240,185,135,135,195,255,255,255,255,199,159,255,255,255,255,255,255,255,255, 63,127, 63, 63,126,255,255,255,255,255,255,255,255,223,191,255,255,255,207,111,111,127,243,255,248,204,143,255,252,224,192, 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, 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,128,224, 48, 0, 0, 0, 0, 0,128,192,192, 0, 0, 10, - // 31,255,255,223,135, 63,111,255, 95,127,191,255,127,127,255,215, 63, 63,127,127,254,252,253,249,255,255,255,255,252,253,124,127, 63, 31, 15, 7, 3, 1, 0,128,224,224, 0, 0, 1, 1, 1, 3, 7, 63,127,239,238,124,224, 0, 0,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,192,224,224,224,224,192,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,192, 64, 96,176,152,200,204,195,227,193,192,224,248,176, 60, 63,191,255,116, 9, 0, 0, 0, 0, 1, - // 3, 0, 0, 0, 0, 3, 3, 2, 1, 11,204,207, 7, 12, 14, 13, 8, 96,244,247,227,225,225,193, 0,192,192,192,192,232,184,252,236,240,255,254,255,127,255,255,252,216,236,252,240,224,248,248,240,241,131, 7,142, 32,126,255,255,239,198,228,236,216,240,240,248,248,236,228,230,230,199, 71, 71, 71,199, 79,207,207,199,207, 79,238,238,108,236,232,184,240,240,208,216,248,232,236, 52,126,254,255,251,249,253,252,252,254,253,255,255,255,127,125,253,253,255,254,239,231, 31, 31, 63, 0, 96, 0, 0, 0, - // 32,224,112,224,192,128, 0, 0, 0, 0, 0,224,224, 0, 0, 0,252,120, 14,126,127,103,255,255,127,127,239,240,241,249,241,225,241,247,255,255,253,252,252,252,252,255,255,255,251,241,143, 63,255,143, 63,239,143, 63,127,255,254, 56,113,243,246,229,235,239,255,243,163,231, 78,221,219,179,167,143,158, 31, 63, 55,127,126,112,193,192,212,191,188,167, 7, 95,126,254,254,255,120,124,127,127,127,255,255,255,247,231, 47, 47, 31, 31, 15,231,243, 51, 51,115,115, 3, 1, 1, 0,192,192,192,192, 0, - // }; - // oled_write_raw_P(kanagawa_logo, sizeof(kanagawa_logo)); - // } - - // static void render_kanagawa_logo(void) { - // //oled_set_cursor(0, 5); - - // static const char PROGMEM kanagawa_logo[] = { - // 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, - // 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, - // 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00 - // }; - - // oled_write_P(kanagawa_logo, false); - // } bool oled_task_user(void) { - // switch (get_highest_layer(layer_state)) { - // case _UPPER: - // render_kanagawa_logo(); - // break; - // default: - // render_status(); - // } - render_status(); return false; } #endif -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ /*****************************************************************************************************/ bool process_record_user(uint16_t keycode, keyrecord_t *record) { @@ -212,6 +174,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_CODE] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, [_FUNC] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, + [_TOP] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, }; #endif diff --git a/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c b/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c index 032f8524783..7ac53f1a65a 100644 --- a/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c +++ b/keyboards/ciaanh/kanagawa/ansi/keymaps/via/keymap.c @@ -17,12 +17,6 @@ * `---------+---------+---------+---------+ | kf4 | | kf5 | +---------+---------+---------' | kf9 | kf10 | kf11 | * `---------' `---------' `---------+---------+---------' */ - -#define TO_0 TO(0) -#define MO_1 MO(1) -#define TG_2 TG(2) - - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap: BASE @@ -38,23 +32,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'---------' `---------' * | LShift | --- | Z | X | C | V | B | N | M | , | . | / | RShift | ,---------. * |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' | UP | -* | LCtrl | LGUI | LAlt | Func | ,---------. ,---------. | RAlt | CODE | RCtrl | ,---------|---------|---------. +* | LCtrl | LGUI | LAlt | CODE | ,---------. ,---------. | RAlt | RCtrl | FUNC | ,---------|---------|---------. * |---------+---------+---------+---------+ | Space | | Space | +---------+---------+---------' | LEFT | DOWN | RIGHT | * `---------' `---------' `---------+---------+---------' */ - // BASE - [0] = LAYOUT_ansi( + [_BASE] = LAYOUT_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_MPLY, \ 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_DEL, \ 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_HOME, \ KC_CAPS, KC_A, LT(0,KC_S), KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_END, \ KC_LSFT, XXXXXXX, KC_Z, LT(0,KC_X), LT(0,KC_C), LT(0,KC_V), KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, \ - KC_LCTL, KC_LGUI, KC_LALT, MO_1, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, TG_2, KC_LEFT, KC_DOWN, KC_RGHT \ + KC_LCTL, KC_LGUI, KC_LALT, L_CODE, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, TO_FUNC, KC_LEFT, KC_DOWN, KC_RGHT \ ), - // CODE - [1] = LAYOUT_ansi( + [_CODE] = LAYOUT_ansi( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ _SCRNSHOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \ @@ -64,20 +56,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ ), - // FUNCTION - [2] = LAYOUT_ansi( + [_FUNC] = LAYOUT_ansi( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ 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, RGB_VAI, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, \ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_HUI, \ - XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, RGB_SPD, RGB_SPI, TO_0, RGB_SAD, RGB_HUD, RGB_SAI \ + XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, RGB_SPD, RGB_SPI, TO_BASE, RGB_SAD, RGB_HUD, RGB_SAI \ ), - // EMPTY - [3] = LAYOUT_ansi( - XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ + [_TOP] = LAYOUT_ansi( + 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, \ @@ -86,18 +76,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ ), - }; - - - - -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ /*****************************************************************************************************/ #ifdef OLED_ENABLE @@ -140,52 +120,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // oled_write_ln("", false); } - // static void render_kanagawa_logo(void) { - // static const char PROGMEM kanagawa_logo[] = { - // 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,192,192, 64, 96, 96, 48, 24, 24, 8, 12, 12, 12, 4, 4, 6,134,134,195,194,194,210,250,250,254,254,254,188,124,252,232,248,216, 48,160,224,192,192,128, 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, 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, 0, 0, 0, 0, - // 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,192, 96, 48, 48, 24, 12, 4, 6, 3, 3, 0,192,192,208,248,248,252,255,255,127,254,158, 46,158,220, 63, 63, 63, 63, 63, 15, 7, 63, 63, 63,255,255,247,255,255,255,255,255,255,191,255,255,175, 28, 32,160,224,224,224,224,192,192, 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, 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,192, 96, 96, 48, 24, 12, 6, 3, 3, 0,128,128,192,192,192, 0, 0, 0, 0, 0, 0,143,153, 31, 63, 38,191,247,240,248,254,127,137,224,252,206, 7,192,240, 24, 60, 70,146,227,225,241,123,127,127, 55, 55,255,255,255,255,255,127,254,255,223, 63,255,255,255,255,255,158, 30, 56, 16, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 56, - // 56,248,249,241,248,248,224,240,240,252,254,255,255,239,231,239,255,255,253,252,248,216,254,254,252,255,255,255,255,254,254,253,251,247,255,254,255,255,255,255,255,255,253,249, 88,126,255,255, 15, 1, 0, 0, 0, 0, 0, 0, 3, 3, 1, 7, 1, 1, 1, 3, 31, 31, 27, 31, 31, 27, 3, 7, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, - // 62,124,208,240,185,135,135,195,255,255,255,255,199,159,255,255,255,255,255,255,255,255, 63,127, 63, 63,126,255,255,255,255,255,255,255,255,223,191,255,255,255,207,111,111,127,243,255,248,204,143,255,252,224,192, 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, 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,128,224, 48, 0, 0, 0, 0, 0,128,192,192, 0, 0, 10, - // 31,255,255,223,135, 63,111,255, 95,127,191,255,127,127,255,215, 63, 63,127,127,254,252,253,249,255,255,255,255,252,253,124,127, 63, 31, 15, 7, 3, 1, 0,128,224,224, 0, 0, 1, 1, 1, 3, 7, 63,127,239,238,124,224, 0, 0,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,192,224,224,224,224,192,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,192, 64, 96,176,152,200,204,195,227,193,192,224,248,176, 60, 63,191,255,116, 9, 0, 0, 0, 0, 1, - // 3, 0, 0, 0, 0, 3, 3, 2, 1, 11,204,207, 7, 12, 14, 13, 8, 96,244,247,227,225,225,193, 0,192,192,192,192,232,184,252,236,240,255,254,255,127,255,255,252,216,236,252,240,224,248,248,240,241,131, 7,142, 32,126,255,255,239,198,228,236,216,240,240,248,248,236,228,230,230,199, 71, 71, 71,199, 79,207,207,199,207, 79,238,238,108,236,232,184,240,240,208,216,248,232,236, 52,126,254,255,251,249,253,252,252,254,253,255,255,255,127,125,253,253,255,254,239,231, 31, 31, 63, 0, 96, 0, 0, 0, - // 32,224,112,224,192,128, 0, 0, 0, 0, 0,224,224, 0, 0, 0,252,120, 14,126,127,103,255,255,127,127,239,240,241,249,241,225,241,247,255,255,253,252,252,252,252,255,255,255,251,241,143, 63,255,143, 63,239,143, 63,127,255,254, 56,113,243,246,229,235,239,255,243,163,231, 78,221,219,179,167,143,158, 31, 63, 55,127,126,112,193,192,212,191,188,167, 7, 95,126,254,254,255,120,124,127,127,127,255,255,255,247,231, 47, 47, 31, 31, 15,231,243, 51, 51,115,115, 3, 1, 1, 0,192,192,192,192, 0, - // }; - // oled_write_raw_P(kanagawa_logo, sizeof(kanagawa_logo)); - // } - - // static void render_kanagawa_logo(void) { - // //oled_set_cursor(0, 5); - - // static const char PROGMEM kanagawa_logo[] = { - // 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, - // 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, - // 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00 - // }; - - // oled_write_P(kanagawa_logo, false); - // } bool oled_task_user(void) { - // switch (get_highest_layer(layer_state)) { - // case _UPPER: - // render_kanagawa_logo(); - // break; - // default: - // render_status(); - // } - render_status(); return false; } #endif -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ /*****************************************************************************************************/ bool process_record_user(uint16_t keycode, keyrecord_t *record) { @@ -232,7 +174,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_CODE] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, [_FUNC] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, - [_TOP] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, + [_TOP] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, }; #endif diff --git a/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c b/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c index d7924911a0b..1f4bb3b1ecd 100644 --- a/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c +++ b/keyboards/ciaanh/kanagawa/iso/keymaps/default/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'---------' `---------' * | LShift | NUBS < | Z | X | C | V | B | N | M | , | . | / | RShift | ,---------. * |---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------' | UP | -* | LCtrl | LGUI | LAlt | Func | ,---------. ,---------. | RAlt | CODE | RCtrl | ,---------|---------|---------. +* | LCtrl | LGUI | LAlt | CODE | ,---------. ,---------. | RAlt | RCtrl | FUNC | ,---------|---------|---------. * |---------+---------+---------+---------+ | Space | | Space | +---------+---------+---------' | LEFT | DOWN | RIGHT | * `---------' `---------' `---------+---------+---------' */ @@ -56,7 +56,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \ ), - [_FUNC] = LAYOUT_iso( XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, \ @@ -67,24 +66,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, RGB_SPD, RGB_SPI, TO_BASE, RGB_SAD, RGB_HUD, RGB_SAI \ ), + [_TOP] = LAYOUT_iso( + 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, \ + 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 \ + ), + }; - - - - -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ /*****************************************************************************************************/ #ifdef OLED_ENABLE - // oled_rotation_t oled_init_user(oled_rotation_t rotation) { - // return OLED_ROTATION_180; - // } - static void render_status(void) { // 21 characters per line // 16 cols / 4 rows @@ -124,52 +120,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // oled_write_ln("", false); } - // static void render_kanagawa_logo(void) { - // static const char PROGMEM kanagawa_logo[] = { - // 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,192,192, 64, 96, 96, 48, 24, 24, 8, 12, 12, 12, 4, 4, 6,134,134,195,194,194,210,250,250,254,254,254,188,124,252,232,248,216, 48,160,224,192,192,128, 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, 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, 0, 0, 0, 0, - // 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,192, 96, 48, 48, 24, 12, 4, 6, 3, 3, 0,192,192,208,248,248,252,255,255,127,254,158, 46,158,220, 63, 63, 63, 63, 63, 15, 7, 63, 63, 63,255,255,247,255,255,255,255,255,255,191,255,255,175, 28, 32,160,224,224,224,224,192,192, 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, 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,192, 96, 96, 48, 24, 12, 6, 3, 3, 0,128,128,192,192,192, 0, 0, 0, 0, 0, 0,143,153, 31, 63, 38,191,247,240,248,254,127,137,224,252,206, 7,192,240, 24, 60, 70,146,227,225,241,123,127,127, 55, 55,255,255,255,255,255,127,254,255,223, 63,255,255,255,255,255,158, 30, 56, 16, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 56, - // 56,248,249,241,248,248,224,240,240,252,254,255,255,239,231,239,255,255,253,252,248,216,254,254,252,255,255,255,255,254,254,253,251,247,255,254,255,255,255,255,255,255,253,249, 88,126,255,255, 15, 1, 0, 0, 0, 0, 0, 0, 3, 3, 1, 7, 1, 1, 1, 3, 31, 31, 27, 31, 31, 27, 3, 7, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, - // 62,124,208,240,185,135,135,195,255,255,255,255,199,159,255,255,255,255,255,255,255,255, 63,127, 63, 63,126,255,255,255,255,255,255,255,255,223,191,255,255,255,207,111,111,127,243,255,248,204,143,255,252,224,192, 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, 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,128,224, 48, 0, 0, 0, 0, 0,128,192,192, 0, 0, 10, - // 31,255,255,223,135, 63,111,255, 95,127,191,255,127,127,255,215, 63, 63,127,127,254,252,253,249,255,255,255,255,252,253,124,127, 63, 31, 15, 7, 3, 1, 0,128,224,224, 0, 0, 1, 1, 1, 3, 7, 63,127,239,238,124,224, 0, 0,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,192,224,224,224,224,192,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128,128,192, 64, 96,176,152,200,204,195,227,193,192,224,248,176, 60, 63,191,255,116, 9, 0, 0, 0, 0, 1, - // 3, 0, 0, 0, 0, 3, 3, 2, 1, 11,204,207, 7, 12, 14, 13, 8, 96,244,247,227,225,225,193, 0,192,192,192,192,232,184,252,236,240,255,254,255,127,255,255,252,216,236,252,240,224,248,248,240,241,131, 7,142, 32,126,255,255,239,198,228,236,216,240,240,248,248,236,228,230,230,199, 71, 71, 71,199, 79,207,207,199,207, 79,238,238,108,236,232,184,240,240,208,216,248,232,236, 52,126,254,255,251,249,253,252,252,254,253,255,255,255,127,125,253,253,255,254,239,231, 31, 31, 63, 0, 96, 0, 0, 0, - // 32,224,112,224,192,128, 0, 0, 0, 0, 0,224,224, 0, 0, 0,252,120, 14,126,127,103,255,255,127,127,239,240,241,249,241,225,241,247,255,255,253,252,252,252,252,255,255,255,251,241,143, 63,255,143, 63,239,143, 63,127,255,254, 56,113,243,246,229,235,239,255,243,163,231, 78,221,219,179,167,143,158, 31, 63, 55,127,126,112,193,192,212,191,188,167, 7, 95,126,254,254,255,120,124,127,127,127,255,255,255,247,231, 47, 47, 31, 31, 15,231,243, 51, 51,115,115, 3, 1, 1, 0,192,192,192,192, 0, - // }; - // oled_write_raw_P(kanagawa_logo, sizeof(kanagawa_logo)); - // } - - // static void render_kanagawa_logo(void) { - // //oled_set_cursor(0, 5); - - // static const char PROGMEM kanagawa_logo[] = { - // 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, - // 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, - // 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00 - // }; - - // oled_write_P(kanagawa_logo, false); - // } - bool oled_task_user(void) { - // switch (get_highest_layer(layer_state)) { - // case _UPPER: - // render_kanagawa_logo(); - // break; - // default: - // render_status(); - // } - + render_status(); return false; } #endif -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ -/*****************************************************************************************************/ /*****************************************************************************************************/ bool process_record_user(uint16_t keycode, keyrecord_t *record) { @@ -215,20 +173,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_CODE] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, - [_FUNC] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, + [_FUNC] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD) }, + [_TOP] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, }; #endif - -// #ifdef ENCODER_ENABLE -// bool encoder_update_kb(uint8_t index, bool clockwise) { -// if (!encoder_update_user(index, clockwise)) { return false; } -// if (index == 0) { -// if (clockwise) { -// tap_code_delay(KC_VOLU, 10); -// } else { -// tap_code_delay(KC_VOLD, 10); -// } -// } -// return true; -// } -// #endif \ No newline at end of file