From 6f16349e93a2a0dcb62c331e36d02381fa184c60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=95=E3=82=A3=E3=83=AB=E3=82=BF=E3=83=BC=E3=83=9A?= =?UTF-8?q?=E3=83=BC=E3=83=91=E3=83=BC?= <76888457+filterpaper@users.noreply.github.com> Date: Sun, 24 Dec 2023 07:48:40 +0800 Subject: [PATCH] Refactor: move keyboards into monokei folder (#22715) --- data/mappings/keyboard_aliases.hjson | 9 +++++++++ keyboards/{ => monokei}/mnk1800s/config.h | 0 keyboards/{ => monokei}/mnk1800s/info.json | 0 .../{ => monokei}/mnk1800s/keymaps/default/keymap.c | 0 .../{ => monokei}/mnk1800s/keymaps/default/readme.md | 0 .../mnk1800s/keymaps/default_2u_bs/keymap.c | 0 keyboards/{ => monokei}/mnk1800s/keymaps/via/keymap.c | 0 keyboards/{ => monokei}/mnk1800s/keymaps/via/readme.md | 0 keyboards/{ => monokei}/mnk1800s/keymaps/via/rules.mk | 0 keyboards/{ => monokei}/mnk1800s/matrix_diagram.md | 0 keyboards/{ => monokei}/mnk1800s/readme.md | 4 ++-- keyboards/{ => monokei}/mnk1800s/rules.mk | 0 keyboards/{ => monokei}/mnk50/config.h | 0 keyboards/{ => monokei}/mnk50/info.json | 0 keyboards/{ => monokei}/mnk50/keymaps/default/keymap.c | 0 keyboards/{ => monokei}/mnk50/keymaps/default/readme.md | 0 keyboards/{ => monokei}/mnk50/keymaps/via/keymap.c | 0 keyboards/{ => monokei}/mnk50/keymaps/via/readme.md | 0 keyboards/{ => monokei}/mnk50/keymaps/via/rules.mk | 0 keyboards/{ => monokei}/mnk50/readme.md | 4 ++-- keyboards/{ => monokei}/mnk50/rules.mk | 0 keyboards/{ => monokei}/mnk75/config.h | 0 keyboards/{ => monokei}/mnk75/info.json | 0 keyboards/{ => monokei}/mnk75/keymaps/default/keymap.c | 0 keyboards/{ => monokei}/mnk75/keymaps/default/readme.md | 0 keyboards/{ => monokei}/mnk75/keymaps/via/keymap.c | 0 keyboards/{ => monokei}/mnk75/keymaps/via/readme.md | 0 keyboards/{ => monokei}/mnk75/keymaps/via/rules.mk | 0 keyboards/{ => monokei}/mnk75/matrix_diagram.md | 0 keyboards/{ => monokei}/mnk75/readme.md | 4 ++-- keyboards/{ => monokei}/mnk75/rules.mk | 0 31 files changed, 15 insertions(+), 6 deletions(-) rename keyboards/{ => monokei}/mnk1800s/config.h (100%) rename keyboards/{ => monokei}/mnk1800s/info.json (100%) rename keyboards/{ => monokei}/mnk1800s/keymaps/default/keymap.c (100%) rename keyboards/{ => monokei}/mnk1800s/keymaps/default/readme.md (100%) rename keyboards/{ => monokei}/mnk1800s/keymaps/default_2u_bs/keymap.c (100%) rename keyboards/{ => monokei}/mnk1800s/keymaps/via/keymap.c (100%) rename keyboards/{ => monokei}/mnk1800s/keymaps/via/readme.md (100%) rename keyboards/{ => monokei}/mnk1800s/keymaps/via/rules.mk (100%) rename keyboards/{ => monokei}/mnk1800s/matrix_diagram.md (100%) rename keyboards/{ => monokei}/mnk1800s/readme.md (87%) rename keyboards/{ => monokei}/mnk1800s/rules.mk (100%) rename keyboards/{ => monokei}/mnk50/config.h (100%) rename keyboards/{ => monokei}/mnk50/info.json (100%) rename keyboards/{ => monokei}/mnk50/keymaps/default/keymap.c (100%) rename keyboards/{ => monokei}/mnk50/keymaps/default/readme.md (100%) rename keyboards/{ => monokei}/mnk50/keymaps/via/keymap.c (100%) rename keyboards/{ => monokei}/mnk50/keymaps/via/readme.md (100%) rename keyboards/{ => monokei}/mnk50/keymaps/via/rules.mk (100%) rename keyboards/{ => monokei}/mnk50/readme.md (88%) rename keyboards/{ => monokei}/mnk50/rules.mk (100%) rename keyboards/{ => monokei}/mnk75/config.h (100%) rename keyboards/{ => monokei}/mnk75/info.json (100%) rename keyboards/{ => monokei}/mnk75/keymaps/default/keymap.c (100%) rename keyboards/{ => monokei}/mnk75/keymaps/default/readme.md (100%) rename keyboards/{ => monokei}/mnk75/keymaps/via/keymap.c (100%) rename keyboards/{ => monokei}/mnk75/keymaps/via/readme.md (100%) rename keyboards/{ => monokei}/mnk75/keymaps/via/rules.mk (100%) rename keyboards/{ => monokei}/mnk75/matrix_diagram.md (100%) rename keyboards/{ => monokei}/mnk75/readme.md (88%) rename keyboards/{ => monokei}/mnk75/rules.mk (100%) diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson index 6341c28bcce..9b514045bae 100644 --- a/data/mappings/keyboard_aliases.hjson +++ b/data/mappings/keyboard_aliases.hjson @@ -479,6 +479,15 @@ "minim": { "target": "matthewdias/minim" }, + "mnk1800s": { + "target": "monokei/mnk1800s" + }, + "mnk50": { + "target": "monokei/mnk50" + }, + "mnk75": { + "target": "monokei/mnk75" + }, "model01": { "target": "keyboardio/model01" }, diff --git a/keyboards/mnk1800s/config.h b/keyboards/monokei/mnk1800s/config.h similarity index 100% rename from keyboards/mnk1800s/config.h rename to keyboards/monokei/mnk1800s/config.h diff --git a/keyboards/mnk1800s/info.json b/keyboards/monokei/mnk1800s/info.json similarity index 100% rename from keyboards/mnk1800s/info.json rename to keyboards/monokei/mnk1800s/info.json diff --git a/keyboards/mnk1800s/keymaps/default/keymap.c b/keyboards/monokei/mnk1800s/keymaps/default/keymap.c similarity index 100% rename from keyboards/mnk1800s/keymaps/default/keymap.c rename to keyboards/monokei/mnk1800s/keymaps/default/keymap.c diff --git a/keyboards/mnk1800s/keymaps/default/readme.md b/keyboards/monokei/mnk1800s/keymaps/default/readme.md similarity index 100% rename from keyboards/mnk1800s/keymaps/default/readme.md rename to keyboards/monokei/mnk1800s/keymaps/default/readme.md diff --git a/keyboards/mnk1800s/keymaps/default_2u_bs/keymap.c b/keyboards/monokei/mnk1800s/keymaps/default_2u_bs/keymap.c similarity index 100% rename from keyboards/mnk1800s/keymaps/default_2u_bs/keymap.c rename to keyboards/monokei/mnk1800s/keymaps/default_2u_bs/keymap.c diff --git a/keyboards/mnk1800s/keymaps/via/keymap.c b/keyboards/monokei/mnk1800s/keymaps/via/keymap.c similarity index 100% rename from keyboards/mnk1800s/keymaps/via/keymap.c rename to keyboards/monokei/mnk1800s/keymaps/via/keymap.c diff --git a/keyboards/mnk1800s/keymaps/via/readme.md b/keyboards/monokei/mnk1800s/keymaps/via/readme.md similarity index 100% rename from keyboards/mnk1800s/keymaps/via/readme.md rename to keyboards/monokei/mnk1800s/keymaps/via/readme.md diff --git a/keyboards/mnk1800s/keymaps/via/rules.mk b/keyboards/monokei/mnk1800s/keymaps/via/rules.mk similarity index 100% rename from keyboards/mnk1800s/keymaps/via/rules.mk rename to keyboards/monokei/mnk1800s/keymaps/via/rules.mk diff --git a/keyboards/mnk1800s/matrix_diagram.md b/keyboards/monokei/mnk1800s/matrix_diagram.md similarity index 100% rename from keyboards/mnk1800s/matrix_diagram.md rename to keyboards/monokei/mnk1800s/matrix_diagram.md diff --git a/keyboards/mnk1800s/readme.md b/keyboards/monokei/mnk1800s/readme.md similarity index 87% rename from keyboards/mnk1800s/readme.md rename to keyboards/monokei/mnk1800s/readme.md index eb4e1b0ef59..610baba72bc 100755 --- a/keyboards/mnk1800s/readme.md +++ b/keyboards/monokei/mnk1800s/readme.md @@ -12,7 +12,7 @@ This is a southpaw 65% keyboard. It supports VIA. Make example for this keyboard (after setting up your build environment): - make mnk1800s:default + make monokei/mnk1800s:default See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). @@ -29,4 +29,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to - Unplug - Hold Escape - Plug In -- Flash using QMK Toolbox or CLI (`make mnk1800s::flash`) +- Flash using QMK Toolbox or CLI (`make monokei/mnk1800s::flash`) diff --git a/keyboards/mnk1800s/rules.mk b/keyboards/monokei/mnk1800s/rules.mk similarity index 100% rename from keyboards/mnk1800s/rules.mk rename to keyboards/monokei/mnk1800s/rules.mk diff --git a/keyboards/mnk50/config.h b/keyboards/monokei/mnk50/config.h similarity index 100% rename from keyboards/mnk50/config.h rename to keyboards/monokei/mnk50/config.h diff --git a/keyboards/mnk50/info.json b/keyboards/monokei/mnk50/info.json similarity index 100% rename from keyboards/mnk50/info.json rename to keyboards/monokei/mnk50/info.json diff --git a/keyboards/mnk50/keymaps/default/keymap.c b/keyboards/monokei/mnk50/keymaps/default/keymap.c similarity index 100% rename from keyboards/mnk50/keymaps/default/keymap.c rename to keyboards/monokei/mnk50/keymaps/default/keymap.c diff --git a/keyboards/mnk50/keymaps/default/readme.md b/keyboards/monokei/mnk50/keymaps/default/readme.md similarity index 100% rename from keyboards/mnk50/keymaps/default/readme.md rename to keyboards/monokei/mnk50/keymaps/default/readme.md diff --git a/keyboards/mnk50/keymaps/via/keymap.c b/keyboards/monokei/mnk50/keymaps/via/keymap.c similarity index 100% rename from keyboards/mnk50/keymaps/via/keymap.c rename to keyboards/monokei/mnk50/keymaps/via/keymap.c diff --git a/keyboards/mnk50/keymaps/via/readme.md b/keyboards/monokei/mnk50/keymaps/via/readme.md similarity index 100% rename from keyboards/mnk50/keymaps/via/readme.md rename to keyboards/monokei/mnk50/keymaps/via/readme.md diff --git a/keyboards/mnk50/keymaps/via/rules.mk b/keyboards/monokei/mnk50/keymaps/via/rules.mk similarity index 100% rename from keyboards/mnk50/keymaps/via/rules.mk rename to keyboards/monokei/mnk50/keymaps/via/rules.mk diff --git a/keyboards/mnk50/readme.md b/keyboards/monokei/mnk50/readme.md similarity index 88% rename from keyboards/mnk50/readme.md rename to keyboards/monokei/mnk50/readme.md index f8484e9d36d..ebbe44378b7 100755 --- a/keyboards/mnk50/readme.md +++ b/keyboards/monokei/mnk50/readme.md @@ -12,7 +12,7 @@ This is a 40% keyboard. It supports VIA. Make example for this keyboard (after setting up your build environment): - make mnk50:default + make monokei/mnk50:default See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). @@ -29,4 +29,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to - Unplug - Hold Escape - Plug In -- Flash using QMK Toolbox or CLI (`make mnk50::flash`) +- Flash using QMK Toolbox or CLI (`make monokei/mnk50::flash`) diff --git a/keyboards/mnk50/rules.mk b/keyboards/monokei/mnk50/rules.mk similarity index 100% rename from keyboards/mnk50/rules.mk rename to keyboards/monokei/mnk50/rules.mk diff --git a/keyboards/mnk75/config.h b/keyboards/monokei/mnk75/config.h similarity index 100% rename from keyboards/mnk75/config.h rename to keyboards/monokei/mnk75/config.h diff --git a/keyboards/mnk75/info.json b/keyboards/monokei/mnk75/info.json similarity index 100% rename from keyboards/mnk75/info.json rename to keyboards/monokei/mnk75/info.json diff --git a/keyboards/mnk75/keymaps/default/keymap.c b/keyboards/monokei/mnk75/keymaps/default/keymap.c similarity index 100% rename from keyboards/mnk75/keymaps/default/keymap.c rename to keyboards/monokei/mnk75/keymaps/default/keymap.c diff --git a/keyboards/mnk75/keymaps/default/readme.md b/keyboards/monokei/mnk75/keymaps/default/readme.md similarity index 100% rename from keyboards/mnk75/keymaps/default/readme.md rename to keyboards/monokei/mnk75/keymaps/default/readme.md diff --git a/keyboards/mnk75/keymaps/via/keymap.c b/keyboards/monokei/mnk75/keymaps/via/keymap.c similarity index 100% rename from keyboards/mnk75/keymaps/via/keymap.c rename to keyboards/monokei/mnk75/keymaps/via/keymap.c diff --git a/keyboards/mnk75/keymaps/via/readme.md b/keyboards/monokei/mnk75/keymaps/via/readme.md similarity index 100% rename from keyboards/mnk75/keymaps/via/readme.md rename to keyboards/monokei/mnk75/keymaps/via/readme.md diff --git a/keyboards/mnk75/keymaps/via/rules.mk b/keyboards/monokei/mnk75/keymaps/via/rules.mk similarity index 100% rename from keyboards/mnk75/keymaps/via/rules.mk rename to keyboards/monokei/mnk75/keymaps/via/rules.mk diff --git a/keyboards/mnk75/matrix_diagram.md b/keyboards/monokei/mnk75/matrix_diagram.md similarity index 100% rename from keyboards/mnk75/matrix_diagram.md rename to keyboards/monokei/mnk75/matrix_diagram.md diff --git a/keyboards/mnk75/readme.md b/keyboards/monokei/mnk75/readme.md similarity index 88% rename from keyboards/mnk75/readme.md rename to keyboards/monokei/mnk75/readme.md index 631ca246e7a..4e34f5257f7 100755 --- a/keyboards/mnk75/readme.md +++ b/keyboards/monokei/mnk75/readme.md @@ -12,7 +12,7 @@ This is a 75% layout PCB. It supports VIA. Make example for this keyboard (after setting up your build environment): - make mnk75:default + make monokei/mnk75:default See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). @@ -29,4 +29,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to - Unplug - Hold Escape - Plug In -- Flash using QMK Toolbox or CLI (`make mnk75::flash`) +- Flash using QMK Toolbox or CLI (`make monokei/mnk75::flash`) diff --git a/keyboards/mnk75/rules.mk b/keyboards/monokei/mnk75/rules.mk similarity index 100% rename from keyboards/mnk75/rules.mk rename to keyboards/monokei/mnk75/rules.mk