From 7766caa52eff5ac83fb5987de269a21e0fabd8ee Mon Sep 17 00:00:00 2001
From: honorless <86894501+lesshonor@users.noreply.github.com>
Date: Sat, 9 Sep 2023 07:28:58 -0400
Subject: [PATCH 1/3] refactor: unify location of generated build files
Moving Vial's generated files to the same place all the other generated
files go means not having to tack on EXTRAINCDIRS.
---
builddefs/common_features.mk | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index 85e309484e..e94a70c3c1 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -635,13 +635,12 @@ ifeq ($(strip $(VIAL_ENABLE)), yes)
COMBO_ENABLE ?= yes
KEY_OVERRIDE_ENABLE ?= yes
SRC += $(QUANTUM_DIR)/vial.c
- EXTRAINCDIRS += $(INTERMEDIATE_OUTPUT)
OPT_DEFS += -DVIAL_ENABLE -DNO_DEBUG -DSERIAL_NUMBER=\"vial:f64c2b3c\"
-$(QUANTUM_DIR)/vial.c: $(INTERMEDIATE_OUTPUT)/vial_generated_keyboard_definition.h
+$(QUANTUM_DIR)/vial.c: $(INTERMEDIATE_OUTPUT)/src/vial_generated_keyboard_definition.h
-$(INTERMEDIATE_OUTPUT)/vial_generated_keyboard_definition.h: $(KEYMAP_PATH)/vial.json
- python3 util/vial_generate_definition.py $(KEYMAP_PATH)/vial.json $(INTERMEDIATE_OUTPUT)/vial_generated_keyboard_definition.h
+$(INTERMEDIATE_OUTPUT)/src/vial_generated_keyboard_definition.h: $(KEYMAP_PATH)/vial.json
+ python3 util/vial_generate_definition.py $(KEYMAP_PATH)/vial.json $(INTERMEDIATE_OUTPUT)/src/vial_generated_keyboard_definition.h
endif
ifeq ($(strip $(VIAL_INSECURE)), yes)
From 8d8a0cdeccb92976969f4959ac56d3a5d28f05f7 Mon Sep 17 00:00:00 2001
From: honorless <86894501+lesshonor@users.noreply.github.com>
Date: Sat, 9 Sep 2023 12:05:30 -0400
Subject: [PATCH 2/3] refactor: create Vial-specific makefile
Isolating Vial build rules and recipes makes it clearer where and why
the codebase diverges and prevents unintentional modifications after
upstream changes.
---
builddefs/build_vial.mk | 36 ++++++++++++++++++++++++++++++++++++
builddefs/common_features.mk | 33 +--------------------------------
2 files changed, 37 insertions(+), 32 deletions(-)
create mode 100644 builddefs/build_vial.mk
diff --git a/builddefs/build_vial.mk b/builddefs/build_vial.mk
new file mode 100644
index 0000000000..ce31d29562
--- /dev/null
+++ b/builddefs/build_vial.mk
@@ -0,0 +1,36 @@
+# Copyright 2023 Ilya Zhuravlev
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+QMK_SETTINGS ?= yes
+TAP_DANCE_ENABLE ?= yes
+ifeq ($(strip $(TAP_DANCE_ENABLE)), yes)
+ OPT_DEFS += -DTAPPING_TERM_PER_KEY
+endif
+COMBO_ENABLE ?= yes
+KEY_OVERRIDE_ENABLE ?= yes
+SRC += $(QUANTUM_DIR)/vial.c
+OPT_DEFS += -DVIAL_ENABLE -DNO_DEBUG -DSERIAL_NUMBER=\"vial:f64c2b3c\"
+
+ifeq ($(strip $(VIAL_INSECURE)), yes)
+ OPT_DEFS += -DVIAL_INSECURE
+endif
+
+ifeq ($(strip $(VIALRGB_ENABLE)), yes)
+ SRC += $(QUANTUM_DIR)/vialrgb.c
+ OPT_DEFS += -DVIALRGB_ENABLE
+endif
+
+ifeq ($(strip $(QMK_SETTINGS)), yes)
+ AUTO_SHIFT_ENABLE := yes
+ SRC += $(QUANTUM_DIR)/qmk_settings.c
+ OPT_DEFS += -DQMK_SETTINGS \
+ -DAUTO_SHIFT_NO_SETUP -DAUTO_SHIFT_REPEAT_PER_KEY -DAUTO_SHIFT_NO_AUTO_REPEAT_PER_KEY \
+ -DPERMISSIVE_HOLD_PER_KEY -DHOLD_ON_OTHER_KEY_PRESS_PER_KEY -DTAPPING_FORCE_HOLD_PER_KEY -DRETRO_TAPPING_PER_KEY \
+ -DCOMBO_TERM_PER_COMBO
+endif
+
+# Generate Vial layout definition header from JSON
+$(QUANTUM_DIR)/vial.c: $(INTERMEDIATE_OUTPUT)/src/vial_generated_keyboard_definition.h
+
+$(INTERMEDIATE_OUTPUT)/src/vial_generated_keyboard_definition.h: $(KEYMAP_PATH)/vial.json
+ python3 util/vial_generate_definition.py $(KEYMAP_PATH)/vial.json $(INTERMEDIATE_OUTPUT)/src/vial_generated_keyboard_definition.h
diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index e94a70c3c1..8446f4250a 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -627,38 +627,7 @@ ifeq ($(strip $(VIA_ENABLE)), yes)
endif
ifeq ($(strip $(VIAL_ENABLE)), yes)
- QMK_SETTINGS ?= yes
- TAP_DANCE_ENABLE ?= yes
- ifeq ($(strip $(TAP_DANCE_ENABLE)), yes)
- OPT_DEFS += -DTAPPING_TERM_PER_KEY
- endif
- COMBO_ENABLE ?= yes
- KEY_OVERRIDE_ENABLE ?= yes
- SRC += $(QUANTUM_DIR)/vial.c
- OPT_DEFS += -DVIAL_ENABLE -DNO_DEBUG -DSERIAL_NUMBER=\"vial:f64c2b3c\"
-
-$(QUANTUM_DIR)/vial.c: $(INTERMEDIATE_OUTPUT)/src/vial_generated_keyboard_definition.h
-
-$(INTERMEDIATE_OUTPUT)/src/vial_generated_keyboard_definition.h: $(KEYMAP_PATH)/vial.json
- python3 util/vial_generate_definition.py $(KEYMAP_PATH)/vial.json $(INTERMEDIATE_OUTPUT)/src/vial_generated_keyboard_definition.h
-endif
-
-ifeq ($(strip $(VIAL_INSECURE)), yes)
- OPT_DEFS += -DVIAL_INSECURE
-endif
-
-ifeq ($(strip $(VIALRGB_ENABLE)), yes)
- SRC += $(QUANTUM_DIR)/vialrgb.c
- OPT_DEFS += -DVIALRGB_ENABLE
-endif
-
-ifeq ($(strip $(QMK_SETTINGS)), yes)
- AUTO_SHIFT_ENABLE := yes
- SRC += $(QUANTUM_DIR)/qmk_settings.c
- OPT_DEFS += -DQMK_SETTINGS \
- -DAUTO_SHIFT_NO_SETUP -DAUTO_SHIFT_REPEAT_PER_KEY -DAUTO_SHIFT_NO_AUTO_REPEAT_PER_KEY \
- -DPERMISSIVE_HOLD_PER_KEY -DHOLD_ON_OTHER_KEY_PRESS_PER_KEY -DTAPPING_FORCE_HOLD_PER_KEY -DRETRO_TAPPING_PER_KEY \
- -DCOMBO_TERM_PER_COMBO
+ include $(BUILDDEFS_PATH)/build_vial.mk
endif
VALID_MAGIC_TYPES := yes
From 357e996ffdd8b1718c9d78ff8f5858c4ab46bcc7 Mon Sep 17 00:00:00 2001
From: honorless <86894501+lesshonor@users.noreply.github.com>
Date: Sat, 9 Sep 2023 07:36:38 -0400
Subject: [PATCH 3/3] fix: restore vial keymap
---
.../{k3x0 => k320}/keymaps/vial/config.h | 0
keyboards/durgod/k320/keymaps/vial/keymap.c | 42 ++++++
.../{k3x0 => k320}/keymaps/vial/rules.mk | 0
.../{k3x0 => k320}/keymaps/vial/vial.json | 0
keyboards/durgod/k3x0/keymaps/vial/keymap.c | 128 ------------------
keyboards/durgod/k3x0/keymaps/vial/readme.md | 16 ---
keyboards/durgod/k3x0/readme.md | 82 -----------
7 files changed, 42 insertions(+), 226 deletions(-)
rename keyboards/durgod/{k3x0 => k320}/keymaps/vial/config.h (100%)
create mode 100644 keyboards/durgod/k320/keymaps/vial/keymap.c
rename keyboards/durgod/{k3x0 => k320}/keymaps/vial/rules.mk (100%)
rename keyboards/durgod/{k3x0 => k320}/keymaps/vial/vial.json (100%)
delete mode 100644 keyboards/durgod/k3x0/keymaps/vial/keymap.c
delete mode 100644 keyboards/durgod/k3x0/keymaps/vial/readme.md
delete mode 100644 keyboards/durgod/k3x0/readme.md
diff --git a/keyboards/durgod/k3x0/keymaps/vial/config.h b/keyboards/durgod/k320/keymaps/vial/config.h
similarity index 100%
rename from keyboards/durgod/k3x0/keymaps/vial/config.h
rename to keyboards/durgod/k320/keymaps/vial/config.h
diff --git a/keyboards/durgod/k320/keymaps/vial/keymap.c b/keyboards/durgod/k320/keymaps/vial/keymap.c
new file mode 100644
index 0000000000..74c4c2e5f5
--- /dev/null
+++ b/keyboards/durgod/k320/keymaps/vial/keymap.c
@@ -0,0 +1,42 @@
+/* Copyright 2021 Maxime Coirault, Don Kjer, Tyler Tidman
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#include QMK_KEYBOARD_H
+
+// Layer shorthand
+enum _layer {
+ _BASE,
+ _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [_BASE] = LAYOUT_all( /* Base Layer */
+ 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_SCRL, KC_PAUS,
+ 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_INS, KC_HOME, KC_PGUP,
+ 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_DEL, KC_END, KC_PGDN,
+ 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_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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [_FN] = LAYOUT_all( /* Function Layer */
+ _______, KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, GUI_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ )
+};
diff --git a/keyboards/durgod/k3x0/keymaps/vial/rules.mk b/keyboards/durgod/k320/keymaps/vial/rules.mk
similarity index 100%
rename from keyboards/durgod/k3x0/keymaps/vial/rules.mk
rename to keyboards/durgod/k320/keymaps/vial/rules.mk
diff --git a/keyboards/durgod/k3x0/keymaps/vial/vial.json b/keyboards/durgod/k320/keymaps/vial/vial.json
similarity index 100%
rename from keyboards/durgod/k3x0/keymaps/vial/vial.json
rename to keyboards/durgod/k320/keymaps/vial/vial.json
diff --git a/keyboards/durgod/k3x0/keymaps/vial/keymap.c b/keyboards/durgod/k3x0/keymaps/vial/keymap.c
deleted file mode 100644
index d1a9e1496a..0000000000
--- a/keyboards/durgod/k3x0/keymaps/vial/keymap.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/* Copyright 2021 Maxime Coirault, Don Kjer, Tyler Tidman
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#include QMK_KEYBOARD_H
-
-// Layer shorthand
-enum _layer {
- _BASE,
- _FN,
- _LAYER3,
- _LAYER4,
- _LAYER5,
- _LAYER6,
- _LAYER7,
- _LAYER8
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- /* Keymap _BASE: Base Layer (Default Layer)
- * ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
- * │Esc│ │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Slk│Pse│
- * └───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
- * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Ins│Hom│PgU│ │Num│ / │ * │ - │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
- * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ │ │Del│End│PgD│ │ 7 │ 8 │ 9 │ │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬┈┈┈┈┤ └───┴───┴───┘ ├───┼───┼───┤ + │
- * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │Entr│ │ 4 │ 5 │ 6 │ │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ ┌───┐ ├───┼───┼───┼───┤
- * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift │ │ ↑ │ │ 1 │ 2 │ 3 │ │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤Ent│
- * │Ctrl│GUI │Alt │ │ Alt│Func│ App│Ctrl│ │ ← │ ↓ │ → │ │ 0 │ . │ │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
- */
- [_BASE] = LAYOUT_all( /* Base Layer */
- 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_SCRL, KC_PAUS,
- 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_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
- 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_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS,
- 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_P4, KC_P5, KC_P6,
- 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_P1, KC_P2, KC_P3, KC_PENT,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT
- ),
- /* Keymap _FN: Function Layer
- * ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
- * │ │ │Ply│Stp│Prv│Nxt│ │Mut│Vo+│Vo-│ │ │ │ │ │ │ │ │ │ │
- * └───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
- * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
- * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬┈┈┈┈┤ └───┴───┴───┘ ├───┼───┼───┤ │
- * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
- * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ ┌───┐ ├───┼───┼───┼───┤
- * │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │
- * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤ │
- * │ │Lock│ │ │ │Func│ Sys│ │ │ │ │ │ │ │ │ │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
- */
- [_FN] = LAYOUT_all( /* Function Layer */
- _______, KC_MPLY, KC_MSTP, KC_MPRV, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, KC_TGUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
- [_LAYER3] = LAYOUT_all( /* Layer 3 */
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
- [_LAYER4] = LAYOUT_all( /* Layer 4 */
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
- [_LAYER5] = LAYOUT_all( /* Layer 5 */
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
- [_LAYER6] = LAYOUT_all( /* Layer 6 */
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
- [_LAYER7] = LAYOUT_all( /* Layer 7 */
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
- [_LAYER8] = LAYOUT_all( /* Layer 8 */
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- )
-};
diff --git a/keyboards/durgod/k3x0/keymaps/vial/readme.md b/keyboards/durgod/k3x0/keymaps/vial/readme.md
deleted file mode 100644
index 952b1912ce..0000000000
--- a/keyboards/durgod/k3x0/keymaps/vial/readme.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# The default keymap for Durgod Taurus K3X0 (K310, K320, etc.) without backlight
-
-Supports both ANSI and ISO layouts.
-
-Layer 0 : Standard layout (Windows)
-
-Layer 1 : Media control and Windows lock key
-- Reusing Durgod's Original Media Control for Fn + F1 ~ Fn + F7
-- Fn + Windows to toggle Windows lock key functionality
-
-## Windows key lock
-
-You can hold down Fn + Windows key to disable the Windows key while in locked mode.
-The 'Lock' LED indicates if the Windows key is locked.
-
-This is similar to the stock K310/K320 Windows key lock functionality.
diff --git a/keyboards/durgod/k3x0/readme.md b/keyboards/durgod/k3x0/readme.md
deleted file mode 100644
index 90e9602e71..0000000000
--- a/keyboards/durgod/k3x0/readme.md
+++ /dev/null
@@ -1,82 +0,0 @@
-# K3X0 = K310, K320, etc.
-
-This K3X0 code is shared between both the ANSI and ISO variants of both the
-K310 full-sized 104/105-key and K320 TKL 87/88-key keyboards.
-
-* Keyboard Maintainers: [dkjer](https://github.com/dkjer) and [tylert](https://github.com/tylert)
-* Hardware Supported:
- * [Durgod Taurus K310 with STM32F070RBT6](https://www.durgod.com/page9?product_id=53&_l=en "Taurus K310 Product Page | Durgod.com")
- * [Durgod Taurus K320 with STM32F070RBT6](https://www.durgod.com/page9?product_id=47&_l=en "Taurus K320 Product Page | Durgod.com")
-* Hardware Availability:
- * [K310 on Amazon.com](https://www.amazon.com/Durgod-Taurus-K310-Mechanical-Keyboard/dp/B07TXB4XF3)
- * [K320 on Amazon.com](https://www.amazon.com/Durgod-Taurus-Corona-Mechanical-Keyboard/dp/B078H3WPHM)
-
-## Instructions
-
-### Build
-
-Instructions for building the K310 and K320 firmware can be found here:
-* [K310](k310/readme.md)
-* [K320](k320/readme.md)
-
-### Initial Flash
-
-#### Requirements
-
-- The Durgod K320/K310 - different batches have different controllers, so when opening the keyboard, you will have to make sure it's using SMT32 controller.
-- Another keyboard - when on bootloader mode, you can't use the keyboard to type and execute the commands (not really required if you can use any mouse interface to type and execute the commands).
-- 2 prying tools - to open the keyboard.
-- Another helping hand - it can be also done with just two hands, but it will require a lot of dexterity.
-- A small cable with both ends cut.
-
-#### Enter bootloader while using the original firmware
-
-1. Unplug USB cable.
-2. Open the keyboard case - there are plenty of youtube videos in that, but you will basically need 2 prying tools and a certain amount of force.
-3. After opening the keyboard, put the PCB upsides down, and the controller should be near the LEDs, and make sure it's using the right controller (SMT32).
-4. Use the cable to short Boot0 to Vdd, by shorting R21 to C27 on the sides closest to the processor, as shown:
-
-
-
-5. While shorting both contacts as instructed in step 4, plug in the USB cable.
-6. When the USB cable is fully inserted, the LEDs should not turn on and the keyboard it's not able to type, you are probably on bootloader mode, to be sure:
- - Using dfu-util, it should show something like "Found DFU…" after using this command:
-```
-dfu-util --list
-```
-
-Now that you are sure to be in bootloader mode, you can backup the original firmware and flash QMK Firmware.
-
-If it does not behave like described, remove the cable and go back to step 4.
-
-#### Backup original firmware
-
-1. Be in Bootloader mode.
-2. Execute this command to backup:
- - Using dfu-util:
-```bash
-dfu-util -a 0 -d 0483:DF11 -s 0x08000000 -U k3x0_original.bin
-```
-
-#### Flash the QMK Firmware Image
-
-1. Be in Bootloader mode.
-2. Here are a few options for performing the initial Flash:
- - Using [QMK Toolbox](https://github.com/qmk/qmk_toolbox)
- - Using qmk on command line:
-
-```bash
-# k310
-qmk flash -kb durgod/k3x0/k310 -km default
-
-# k320
-qmk flash -kb durgod/k3x0/k320 -km default
-```
-
-### Subsequent Flashing
-
-For repeating Flashing you can use BootMagic Lite has been enabled by default and assigned to the "Esc" key:
-
-1. Unplug USB Cable.
-2. Hold the "Esc" key.
-2. Plug in the USB Cable, the Keyboard should be in ST-Bootloader state.