From d92f8499fd571a0906a8c267a2709367ee243d78 Mon Sep 17 00:00:00 2001 From: TuDatTr Date: Fri, 2 Jul 2021 01:18:50 +0200 Subject: [PATCH] [keymap] changed lily58 and dz60 keymap --- keyboards/dz60/keymaps/tudattr/keymap.c | 28 ++++++----------------- keyboards/lily58/keymaps/tudattr/keymap.c | 10 ++++---- 2 files changed, 12 insertions(+), 26 deletions(-) diff --git a/keyboards/dz60/keymaps/tudattr/keymap.c b/keyboards/dz60/keymaps/tudattr/keymap.c index 12207cc36d..ab068fea00 100644 --- a/keyboards/dz60/keymaps/tudattr/keymap.c +++ b/keyboards/dz60/keymaps/tudattr/keymap.c @@ -23,12 +23,10 @@ #define _LIGHTS 3 enum custom_keycodes { - LENNY = SAFE_RANGE, - TBL, - SHRG, + SHRG = SAFE_RANGE, UWU, LYING, - DENKO, + TBL, }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -38,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------. * | ESC | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | \ | ~ | * |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| - * | _MACRO/Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | Backspace | + * | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | Backspace | * |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| * | LCtrl | A | S | D | F | G | H | J | K | L | ; | ' | Enter | * |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| @@ -64,9 +62,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| * | | | | | | | | | | | | | | | * |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| - * | (´・ω・｀) | | | | | | Previous | VolDown | VolUp | Next | | | | + * | | | | | | | Previous | VolDown | VolUp | Next | | | | * |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| - * | | ( ͡° ͜ʖ ͡°) | (╯°□°）╯彡 ┻━┻ | ¯\_(ツ)_/¯ | | BrghtDown | BrghtUp | | | | | uwu | _(:3」∠)_ | + * | | | (╯°□°）╯彡 ┻━┻ | ¯\_(ツ)_/¯ | | BrghtDown | BrghtUp | | | | | uwu | _(:3」∠)_ | * `---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------´ * | | | | PrvUnicode | NxtUnicode | | * `--------------------------------------------------------------------------------------------------------------------------------------------´ @@ -76,8 +74,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - DENKO, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_NO, LENNY, TBL, SHRG, KC_TRNS, KC_BRID, KC_BRIU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, UWU, LYING, KC_NO, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_NO, KC_TRNS, TBL, SHRG, KC_TRNS, KC_BRID, KC_BRIU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, UWU, LYING, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_NO, KC_TRNS, KC_NO, UC_RMOD, UC_MOD, KC_NO, KC_TRNS, KC_NO), @@ -131,12 +129,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch(keycode) { - case LENNY: - if (record->event.pressed) { - send_unicode_string("( ͡° ͜ʖ ͡°)"); - } - break; - case TBL: if (record->event.pressed) { send_unicode_string("(╯°□°）╯彡 ┻━┻"); @@ -176,12 +168,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } break; - case DENKO: - if (record->event.pressed) { - send_unicode_string("(´・ω・｀)"); - } - break; - case LYING: if (record->event.pressed) { send_unicode_string("_(:3」∠)_"); diff --git a/keyboards/lily58/keymaps/tudattr/keymap.c b/keyboards/lily58/keymaps/tudattr/keymap.c index 57a803633d..75d5aad525 100644 --- a/keyboards/lily58/keymaps/tudattr/keymap.c +++ b/keyboards/lily58/keymaps/tudattr/keymap.c @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------| [ | | ] |------+------+------+------+------+------| * |LShift| Z | X | C | V | B |-------| |-------| N | M | , | . | / |RShift| * `-----------------------------------------/ / \ \-----------------------------------------' - * | LGUI | LAlt | \ | /Space / \Enter \ | FUNC |BackSP| RALT | + * | LGUI | LAlt | FUNC | /Space / \Enter \ | FUNC |BackSP| RALT | * | | | |/ / \ \ | | | | * `----------------------------' '------''--------------------' */ @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS, \ KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, KC_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, \ - KC_LGUI, KC_LALT, KC_BSLS, KC_SPC , KC_ENT, MO(_FUNC), KC_BSPC, KC_RALT \ + KC_LGUI, KC_LALT, MO(_FUNC), KC_SPC , KC_ENT, MO(_FUNC), KC_BSPC, KC_RALT \ ), /* FUNC * ,-----------------------------------------. ,-----------------------------------------. @@ -80,8 +80,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_F11 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F12, \ KC_F13 , KC_F14 , KC_F15 , KC_F16 , KC_F17 , KC_F18 , KC_F19 , KC_F20 , KC_F21, KC_F22 , KC_F23 , KC_F24, \ KC_PSCR, KC_BRID, KC_BRIU, _______, _______, _______, KC_LEFT, KC_DOWN , KC_UP , KC_RIGHT, _______, _______,\ - _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MSTP, KC_EQL , _______ ,_______,_______ , _______, _______,\ - _______, _______, KC_MUTE, KC_VOLD , KC_VOLU, _______ , KC_DEL, _______ \ + _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MSTP, KC_EQL , _______ ,_______,_______ , KC_BSLS, _______,\ + _______, _______, KC_MUTE, KC_VOLD , KC_VOLU, KC_MUTE , KC_DEL, _______ \ ), }; @@ -108,7 +108,7 @@ static void render_status(void) { } oled_write_P(PSTR("\n\n "), false); - sprintf(wpm, "%03d", get_current_wpm()); + sprintf(wpm, "%01d", get_current_wpm()); oled_write(wpm, false); oled_write_P(PSTR(" wpm"), false); }