From b617f96ee0ba6fe40fb2ef1f90070288b7722065 Mon Sep 17 00:00:00 2001 From: zhol0777 <97376918+zhol0777@users.noreply.github.com> Date: Wed, 3 Jan 2024 23:55:23 -0800 Subject: [PATCH] fix: ymdk/ymd75/rev4/iso/vial keymap building (#641) * fix: ymdk/ymd75/rev4/iso/vial keymap building rev4 of ymd75 is odd due to iso-only keymaps, which conflicts with ansi keymap in root of ymd75 folder. * fix unlock combo --------- Co-authored-by: Zhol Internet --- .../ymdk/ymd75/rev4/iso/keymaps/vial/config.h | 9 + .../ymdk/ymd75/rev4/iso/keymaps/vial/keymap.c | 37 +++ .../ymdk/ymd75/rev4/iso/keymaps/vial/rules.mk | 8 + .../ymd75/rev4/iso/keymaps/vial/vial.json | 223 ++++++++++++++++++ 4 files changed, 277 insertions(+) create mode 100644 keyboards/ymdk/ymd75/rev4/iso/keymaps/vial/config.h create mode 100644 keyboards/ymdk/ymd75/rev4/iso/keymaps/vial/keymap.c create mode 100644 keyboards/ymdk/ymd75/rev4/iso/keymaps/vial/rules.mk create mode 100644 keyboards/ymdk/ymd75/rev4/iso/keymaps/vial/vial.json diff --git a/keyboards/ymdk/ymd75/rev4/iso/keymaps/vial/config.h b/keyboards/ymdk/ymd75/rev4/iso/keymaps/vial/config.h new file mode 100644 index 00000000000..55dd2260492 --- /dev/null +++ b/keyboards/ymdk/ymd75/rev4/iso/keymaps/vial/config.h @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#pragma once + +#define VIAL_KEYBOARD_UID {0x26, 0xE5, 0x68, 0x8A, 0x5E, 0xC9, 0x9E, 0x0F} +#define VIAL_UNLOCK_COMBO_ROWS { 5, 9 } +#define VIAL_UNLOCK_COMBO_COLS { 0, 3 } + +#define DYNAMIC_KEYMAP_LAYER_COUNT 3 diff --git a/keyboards/ymdk/ymd75/rev4/iso/keymaps/vial/keymap.c b/keyboards/ymdk/ymd75/rev4/iso/keymaps/vial/keymap.c new file mode 100644 index 00000000000..15dc1dc8b70 --- /dev/null +++ b/keyboards/ymdk/ymd75/rev4/iso/keymaps/vial/keymap.c @@ -0,0 +1,37 @@ +// Copyright 2023 zvecr +// SPDX-License-Identifier: GPL-2.0-or-later +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │Esc│F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│PSc│Pse│Del│ + * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤ + * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│Hom│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ │PgU│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent├───┤ + * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │ │PgD│ + * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤ + * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │End│ + * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ + * │Ctrl│GUI │Alt │ │Alt│GUI│Ctl│ ← │ ↓ │ → │ + * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ + */ + [0] = LAYOUT_75_iso( + 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_PSCR, KC_PAUS, KC_DEL, + 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_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_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN, + KC_LSFT, KC_NUBS, 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, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + [1] = LAYOUT_75_iso( + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ), +}; diff --git a/keyboards/ymdk/ymd75/rev4/iso/keymaps/vial/rules.mk b/keyboards/ymdk/ymd75/rev4/iso/keymaps/vial/rules.mk new file mode 100644 index 00000000000..497ff513818 --- /dev/null +++ b/keyboards/ymdk/ymd75/rev4/iso/keymaps/vial/rules.mk @@ -0,0 +1,8 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes +KEY_LOCK_ENABLE = no + +# must reduce EEPROM usage +LTO_ENABLE = yes +COMBO_ENABLE = no +KEY_OVERRIDE_ENABLE = no diff --git a/keyboards/ymdk/ymd75/rev4/iso/keymaps/vial/vial.json b/keyboards/ymdk/ymd75/rev4/iso/keymaps/vial/vial.json new file mode 100644 index 00000000000..401dcd22c93 --- /dev/null +++ b/keyboards/ymdk/ymd75/rev4/iso/keymaps/vial/vial.json @@ -0,0 +1,223 @@ +{ + "name": "YMD 75 VIA", + "vendorId": "0x20A0", + "productId": "0x422D", + "lighting": "qmk_backlight_rgblight", + "matrix": { + "rows": 12, + "cols": 9 + }, + "layouts": { + "keymap": [ + [ + { + "y": 1.5, + "x": 3, + "c": "#777777" + }, + "5,0", + { + "c": "#cccccc" + }, + "5,1", + "5,2", + "5,3", + "5,4", + "5,5", + "5,6", + "5,7", + "5,8", + "11,8", + "11,7", + "11,5", + "11,4", + { + "c": "#aaaaaa" + }, + "11,3", + "11,6", + "11,2" + ], + [ + { + "x": 3, + "c": "#cccccc" + }, + "4,0", + "4,1", + "4,2", + "4,3", + "4,4", + "4,5", + "4,6", + "4,7", + "4,8", + "10,8", + "10,7", + "10,5", + "10,4", + { + "c": "#aaaaaa", + "w": 2 + }, + "10,6", + "10,2" + ], + [ + { + "x": 3, + "w": 1.5 + }, + "3,0", + { + "c": "#cccccc" + }, + "3,1", + "3,2", + "3,3", + "3,4", + "3,5", + "3,6", + "3,7", + "3,8", + "9,8", + "9,7", + "9,5", + "9,4", + { + "x": 0.25, + "c": "#777777", + "w": 1.25, + "h": 2, + "w2": 1.5, + "h2": 1, + "x2": -0.25 + }, + "9,3\n\n\n0,0", + { + "c": "#aaaaaa" + }, + "9,6", + { + "x": 1.25, + "c": "#cccccc", + "w": 1.5 + }, + "9,3\n\n\n0,1" + ], + [ + { + "x": 3, + "c": "#aaaaaa", + "w": 1.75 + }, + "2,0", + { + "c": "#cccccc" + }, + "2,1", + "2,2", + "2,3", + "2,4", + "2,5", + "2,6", + "2,7", + "2,8", + "8,8", + "8,7", + "8,5", + "8,4\n\n\n0,0", + { + "x": 1.25, + "c": "#aaaaaa" + }, + "8,6", + { + "x": 0.5, + "c": "#777777", + "w": 2.25 + }, + "8,4\n\n\n0,1" + ], + [ + { + "c": "#aaaaaa", + "w": 2.25 + }, + "1,0\n\n\n1,1", + { + "x": 0.75, + "w": 1.25 + }, + "1,0\n\n\n1,0", + { + "c": "#cccccc" + }, + "1,1\n\n\n1,0", + "1,2", + "1,3", + "1,4", + "1,5", + "1,6", + "1,7", + "1,8", + "7,8", + "7,7", + "7,5", + { + "c": "#aaaaaa", + "w": 1.75 + }, + "7,4", + "7,3", + "7,6" + ], + [ + { + "x": 3, + "w": 1.25 + }, + "0,0", + { + "w": 1.25 + }, + "0,1", + { + "w": 1.25 + }, + "0,2", + { + "c": "#cccccc", + "w": 6.25 + }, + "0,6", + { + "c": "#aaaaaa" + }, + "0,8\n\n\n2,0", + "0,7\n\n\n2,0", + "0,5\n\n\n2,0", + "0,4", + "0,3", + "6,6" + ], + [ + { + "y": 0.75, + "x": 13, + "w": 1.5 + }, + "0,8\n\n\n2,1", + { + "w": 1.5 + }, + "0,5\n\n\n2,1" + ] + ], + "labels": [ + "ANSI Enter", + "ANSI Left Shift", + "RWKL" + ] + } +} \ No newline at end of file