From 8875ffb0828524c61c9f99cda0f1c5032e31c965 Mon Sep 17 00:00:00 2001 From: Hau Nguyen Date: Sun, 23 Jul 2023 01:02:56 +0700 Subject: [PATCH] feat: remove usb delay config (wip) --- Makefile | 9 +- .../keymap-drawer/haunt98/keymap.svg | 479 ++++++++++++++++++ .../keymap-drawer/haunt98/keymap.yaml | 191 +++++++ dztech_dz60rgb_wkl/keymaps/haunt98/config.h | 3 - dztech_dz60rgb_wkl/keymaps/haunt98/keymap.c | 2 +- .../keymaps_json/haunt98/keymap.json | 2 +- keymap-drawer-custom.yaml | 2 + 7 files changed, 681 insertions(+), 7 deletions(-) create mode 100644 dztech_dz60rgb_wkl/keymap-drawer/haunt98/keymap.svg create mode 100644 dztech_dz60rgb_wkl/keymap-drawer/haunt98/keymap.yaml create mode 100644 keymap-drawer-custom.yaml diff --git a/Makefile b/Makefile index 2db62a0..4bc1678 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: all format clean dztech_dz60rgb_wkl +.PHONY: all format clean draw dztech_dz60rgb_wkl all: $(MAKE) format @@ -12,6 +12,11 @@ clean: rm -rf ~/qmk_firmware/keyboards/dztech/dz60rgb_wkl/keymaps/haunt98 rm -rf dztech_dz60rgb_wkl_v2_1_haunt98.bin +draw: + pipx install keymap-drawer + # keymap -c keymap-drawer-custom.yaml parse -q dztech_dz60rgb_wkl/keymaps_json/haunt98/keymap.json > dztech_dz60rgb_wkl/keymap-drawer/haunt98/keymap.yaml + keymap -c keymap-drawer-custom.yaml draw dztech_dz60rgb_wkl/keymap-drawer/haunt98/keymap.yaml > dztech_dz60rgb_wkl/keymap-drawer/haunt98/keymap.svg + dztech_dz60rgb_wkl: # Copy rm -rf ~/qmk_firmware/keyboards/dztech/dz60rgb_wkl/keymaps/haunt98 @@ -20,7 +25,7 @@ dztech_dz60rgb_wkl: qmk lint -kb dztech/dz60rgb_wkl/v2_1 -km haunt98 # Compile qmk compile -j 8 -kb dztech/dz60rgb_wkl/v2_1 -km haunt98 - # JSON mv ~/qmk_firmware/dztech_dz60rgb_wkl_v2_1_haunt98.bin . + # JSON rm -rf dztech_dz60rgb_wkl/keymaps_json/haunt98/keymap.json qmk c2json -kb dztech/dz60rgb_wkl/v2_1 -km haunt98 -o dztech_dz60rgb_wkl/keymaps_json/haunt98/keymap.json dztech_dz60rgb_wkl/keymaps/haunt98/keymap.c diff --git a/dztech_dz60rgb_wkl/keymap-drawer/haunt98/keymap.svg b/dztech_dz60rgb_wkl/keymap-drawer/haunt98/keymap.svg new file mode 100644 index 0000000..fc294b5 --- /dev/null +++ b/dztech_dz60rgb_wkl/keymap-drawer/haunt98/keymap.svg @@ -0,0 +1,479 @@ + + + +L0 + + +QKGESC + +1 + +2 + +3 + +4 + +5 + +6 + +7 + +8 + +9 + +0 + +- + += + +\ + +` + +TAB + +Q + +W + +E + +R + +T + +Y + +U + +I + +O + +P + +[ + +] + +BSPC + +ESC +CTL + +A + +S + +D + +F + +G + +H + +J + +K + +L + +; + +' + +ENT + +LSFT + +Z + +X + +C + +V + +B + +N + +M + +, + +. + +/ + +RSFT + +L1 + + +LALT + +LGUI + +SPC + +RGUI + +RALT + + + +L1 + +` + +F1 + +F2 + +F3 + +F4 + +F5 + +F6 + +F7 + +F8 + +F9 + +F10 + +F11 + +F12 + + + + + + + + + + + + + + + + + + + + + + + + + + + +UP + + + + + + + +VOLD + +VOLU + +MUTE + + + + + + + + + + + + + +LEFT + +RGHT + + + + + + + + + + + + + + + + + + + + + + + +DOWN + + + + + +TG(2) + + + + + + + + + + + +L2 + + +QKBOOT + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +QKRBT + + + + + + + + + + + + + + + + + + + +CAPS + + +RGBHUD + + +RGBSAI + + +RGBVAI + + + + + + + + + +HOME + +PGUP + + + + + + + + + + + + + + + + + + + + + + + +END + +PGDN + + + + + + + + + + + + + + + +RGBTOG + + +RGBMOD + + + diff --git a/dztech_dz60rgb_wkl/keymap-drawer/haunt98/keymap.yaml b/dztech_dz60rgb_wkl/keymap-drawer/haunt98/keymap.yaml new file mode 100644 index 0000000..f08971d --- /dev/null +++ b/dztech_dz60rgb_wkl/keymap-drawer/haunt98/keymap.yaml @@ -0,0 +1,191 @@ +layout: {qmk_keyboard: dztech/dz60rgb_wkl/v2_1, qmk_layout: LAYOUT_60_tsangan_hhkb} +layers: + L0: + - QK GESC + - '1' + - '2' + - '3' + - '4' + - '5' + - '6' + - '7' + - '8' + - '9' + - '0' + - {t: '-', s:'_'} + - '=' + - \ + - '`' + - TAB + - Q + - W + - E + - R + - T + - Y + - U + - I + - O + - P + - '[' + - ']' + - BSPC + - {t: ESC, h: CTL} + - A + - S + - D + - F + - G + - H + - J + - K + - L + - ; + - '''' + - ENT + - LSFT + - Z + - X + - C + - V + - B + - N + - M + - ',' + - . + - / + - RSFT + - L1 + - '' + - LALT + - LGUI + - SPC + - RGUI + - RALT + - '' + L1: + - '`' + - F1 + - F2 + - F3 + - F4 + - F5 + - F6 + - F7 + - F8 + - F9 + - F10 + - F11 + - F12 + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - UP + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - VOLD + - VOLU + - MUTE + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - LEFT + - RGHT + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - DOWN + - {t: ▽, type: trans} + - {type: held} + - '' + - TG(2) + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - '' + L2: + - QK BOOT + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - QK RBT + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - CAPS + - RGB HUD + - RGB SAI + - RGB VAI + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - HOME + - PGUP + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - END + - PGDN + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - '' + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - RGB TOG + - RGB MOD + - '' diff --git a/dztech_dz60rgb_wkl/keymaps/haunt98/config.h b/dztech_dz60rgb_wkl/keymaps/haunt98/config.h index a5a6b40..5a875fa 100644 --- a/dztech_dz60rgb_wkl/keymaps/haunt98/config.h +++ b/dztech_dz60rgb_wkl/keymaps/haunt98/config.h @@ -61,6 +61,3 @@ // https://github.com/qmk/qmk_firmware/blob/master/docs/feature_debounce_type.md #undef DEBOUNCE #define DEBOUNCE 5 - -// https://github.com/qmk/qmk_firmware/blob/master/docs/config_options.md -#define USB_SUSPEND_WAKEUP_DELAY 200 diff --git a/dztech_dz60rgb_wkl/keymaps/haunt98/keymap.c b/dztech_dz60rgb_wkl/keymaps/haunt98/keymap.c index e9f2cb3..dbd6140 100644 --- a/dztech_dz60rgb_wkl/keymaps/haunt98/keymap.c +++ b/dztech_dz60rgb_wkl/keymaps/haunt98/keymap.c @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { XXXXXXX, TG(2), _______, _______, _______, _______, XXXXXXX), [2] = LAYOUT_60_tsangan_hhkb( QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, QK_RBT, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CAPS, RGB_HUD, RGB_SAI, RGB_VAI, _______, _______, _______, _______, KC_HOME, KC_PGUP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, KC_PGDN, _______, _______, _______, XXXXXXX, _______, _______, _______, RGB_TOG, RGB_MOD, XXXXXXX)}; diff --git a/dztech_dz60rgb_wkl/keymaps_json/haunt98/keymap.json b/dztech_dz60rgb_wkl/keymaps_json/haunt98/keymap.json index 3978fe4..802d9e5 100644 --- a/dztech_dz60rgb_wkl/keymaps_json/haunt98/keymap.json +++ b/dztech_dz60rgb_wkl/keymaps_json/haunt98/keymap.json @@ -4,7 +4,7 @@ "layers": [ ["QK_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_BSLS", "KC_GRV", "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_BSPC", "CTL_T(KC_ESC)", "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_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "MO(1)", "KC_NO", "KC_LALT", "KC_LGUI", "KC_SPC", "KC_RGUI", "KC_RALT", "KC_NO"], ["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_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_UP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_VOLD", "KC_VOLU", "KC_MUTE", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_LEFT", "KC_RGHT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_DOWN", "KC_TRNS", "KC_TRNS", "KC_NO", "TG(2)", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_NO"], - ["QK_BOOT", "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", "QK_RBT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_CAPS", "RGB_HUD", "RGB_SAI", "RGB_VAI", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_HOME", "KC_PGUP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_END", "KC_PGDN", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_NO", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "KC_NO"] + ["QK_BOOT", "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", "KC_CAPS", "RGB_HUD", "RGB_SAI", "RGB_VAI", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_HOME", "KC_PGUP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_END", "KC_PGDN", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_NO", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "KC_NO"] ], "layout": "LAYOUT_60_tsangan_hhkb" } \ No newline at end of file diff --git a/keymap-drawer-custom.yaml b/keymap-drawer-custom.yaml new file mode 100644 index 0000000..75802c3 --- /dev/null +++ b/keymap-drawer-custom.yaml @@ -0,0 +1,2 @@ +draw_config: + append_colon_to_layer_header: false