From bc7d1cc39744d0d2c6053aecc8294c6fe8e165cf 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: Mon, 19 Feb 2024 19:18:20 +0800 Subject: [PATCH] Refactor: group kbdfans keyboards (#22764) Move two kbdfans keyboard into kbdfans folder --- data/mappings/keyboard_aliases.hjson | 6 +++++ keyboards/{ => kbdfans}/epoch80/info.json | 0 .../epoch80/keymaps/default/keymap.c | 0 .../epoch80/keymaps/iso/keymap.c | 0 .../epoch80/keymaps/tsangan/keymap.c | 0 .../epoch80/keymaps/via/keymap.c | 0 .../epoch80/keymaps/via/rules.mk | 0 .../epoch80/keymaps/wkl/keymap.c | 0 keyboards/{ => kbdfans}/epoch80/readme.md | 4 ++-- keyboards/{ => kbdfans}/epoch80/rules.mk | 0 keyboards/{ => kbdfans}/jm60/board.h | 0 keyboards/{ => kbdfans}/jm60/chconf.h | 0 keyboards/{ => kbdfans}/jm60/config.h | 0 keyboards/{ => kbdfans}/jm60/info.json | 0 keyboards/{ => kbdfans}/jm60/jm60.c | 0 .../jm60/keymaps/default/keymap.c | 3 +++ .../kbdfans/jm60/keymaps/poker3/keymap.c | 24 +++++++++++++++++++ .../{ => kbdfans}/jm60/ld/jm60_bootloader.ld | 0 keyboards/{ => kbdfans}/jm60/mcuconf.h | 0 keyboards/{ => kbdfans}/jm60/readme.md | 2 +- keyboards/{ => kbdfans}/jm60/rules.mk | 0 21 files changed, 36 insertions(+), 3 deletions(-) rename keyboards/{ => kbdfans}/epoch80/info.json (100%) rename keyboards/{ => kbdfans}/epoch80/keymaps/default/keymap.c (100%) rename keyboards/{ => kbdfans}/epoch80/keymaps/iso/keymap.c (100%) rename keyboards/{ => kbdfans}/epoch80/keymaps/tsangan/keymap.c (100%) rename keyboards/{ => kbdfans}/epoch80/keymaps/via/keymap.c (100%) rename keyboards/{ => kbdfans}/epoch80/keymaps/via/rules.mk (100%) rename keyboards/{ => kbdfans}/epoch80/keymaps/wkl/keymap.c (100%) rename keyboards/{ => kbdfans}/epoch80/readme.md (92%) rename keyboards/{ => kbdfans}/epoch80/rules.mk (100%) rename keyboards/{ => kbdfans}/jm60/board.h (100%) rename keyboards/{ => kbdfans}/jm60/chconf.h (100%) rename keyboards/{ => kbdfans}/jm60/config.h (100%) rename keyboards/{ => kbdfans}/jm60/info.json (100%) rename keyboards/{ => kbdfans}/jm60/jm60.c (100%) rename keyboards/{ => kbdfans}/jm60/keymaps/default/keymap.c (97%) create mode 100644 keyboards/kbdfans/jm60/keymaps/poker3/keymap.c rename keyboards/{ => kbdfans}/jm60/ld/jm60_bootloader.ld (100%) rename keyboards/{ => kbdfans}/jm60/mcuconf.h (100%) rename keyboards/{ => kbdfans}/jm60/readme.md (96%) rename keyboards/{ => kbdfans}/jm60/rules.mk (100%) diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson index af97c39f0ce..29a7a719f38 100644 --- a/data/mappings/keyboard_aliases.hjson +++ b/data/mappings/keyboard_aliases.hjson @@ -185,6 +185,9 @@ "eek": { "target": "eek/silk_down" }, + "epoch80": { + "target": "kbdfans/epoch80" + }, "era/klein": { "target": "era/sirind/klein_sd" }, @@ -311,6 +314,9 @@ "jj50": { "target": "kprepublic/jj50" }, + "jm60": { + "target": "kbdfans/jm60" + }, "jones": { "target": "jones/v03_1" }, diff --git a/keyboards/epoch80/info.json b/keyboards/kbdfans/epoch80/info.json similarity index 100% rename from keyboards/epoch80/info.json rename to keyboards/kbdfans/epoch80/info.json diff --git a/keyboards/epoch80/keymaps/default/keymap.c b/keyboards/kbdfans/epoch80/keymaps/default/keymap.c similarity index 100% rename from keyboards/epoch80/keymaps/default/keymap.c rename to keyboards/kbdfans/epoch80/keymaps/default/keymap.c diff --git a/keyboards/epoch80/keymaps/iso/keymap.c b/keyboards/kbdfans/epoch80/keymaps/iso/keymap.c similarity index 100% rename from keyboards/epoch80/keymaps/iso/keymap.c rename to keyboards/kbdfans/epoch80/keymaps/iso/keymap.c diff --git a/keyboards/epoch80/keymaps/tsangan/keymap.c b/keyboards/kbdfans/epoch80/keymaps/tsangan/keymap.c similarity index 100% rename from keyboards/epoch80/keymaps/tsangan/keymap.c rename to keyboards/kbdfans/epoch80/keymaps/tsangan/keymap.c diff --git a/keyboards/epoch80/keymaps/via/keymap.c b/keyboards/kbdfans/epoch80/keymaps/via/keymap.c similarity index 100% rename from keyboards/epoch80/keymaps/via/keymap.c rename to keyboards/kbdfans/epoch80/keymaps/via/keymap.c diff --git a/keyboards/epoch80/keymaps/via/rules.mk b/keyboards/kbdfans/epoch80/keymaps/via/rules.mk similarity index 100% rename from keyboards/epoch80/keymaps/via/rules.mk rename to keyboards/kbdfans/epoch80/keymaps/via/rules.mk diff --git a/keyboards/epoch80/keymaps/wkl/keymap.c b/keyboards/kbdfans/epoch80/keymaps/wkl/keymap.c similarity index 100% rename from keyboards/epoch80/keymaps/wkl/keymap.c rename to keyboards/kbdfans/epoch80/keymaps/wkl/keymap.c diff --git a/keyboards/epoch80/readme.md b/keyboards/kbdfans/epoch80/readme.md similarity index 92% rename from keyboards/epoch80/readme.md rename to keyboards/kbdfans/epoch80/readme.md index a78f9ce87ba..b029b5bd994 100644 --- a/keyboards/epoch80/readme.md +++ b/keyboards/kbdfans/epoch80/readme.md @@ -11,10 +11,10 @@ The board was also sold in a zFrontier groupbuy under the name Dolch.CR 80. Make example for this keyboard (after setting up your build environment): - make epoch80:default + make kbdfans/epoch80:default Flashing example for this keyboard: - make epoch80:default:flash + make kbdfans/epoch80:default:flash 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). diff --git a/keyboards/epoch80/rules.mk b/keyboards/kbdfans/epoch80/rules.mk similarity index 100% rename from keyboards/epoch80/rules.mk rename to keyboards/kbdfans/epoch80/rules.mk diff --git a/keyboards/jm60/board.h b/keyboards/kbdfans/jm60/board.h similarity index 100% rename from keyboards/jm60/board.h rename to keyboards/kbdfans/jm60/board.h diff --git a/keyboards/jm60/chconf.h b/keyboards/kbdfans/jm60/chconf.h similarity index 100% rename from keyboards/jm60/chconf.h rename to keyboards/kbdfans/jm60/chconf.h diff --git a/keyboards/jm60/config.h b/keyboards/kbdfans/jm60/config.h similarity index 100% rename from keyboards/jm60/config.h rename to keyboards/kbdfans/jm60/config.h diff --git a/keyboards/jm60/info.json b/keyboards/kbdfans/jm60/info.json similarity index 100% rename from keyboards/jm60/info.json rename to keyboards/kbdfans/jm60/info.json diff --git a/keyboards/jm60/jm60.c b/keyboards/kbdfans/jm60/jm60.c similarity index 100% rename from keyboards/jm60/jm60.c rename to keyboards/kbdfans/jm60/jm60.c diff --git a/keyboards/jm60/keymaps/default/keymap.c b/keyboards/kbdfans/jm60/keymaps/default/keymap.c similarity index 97% rename from keyboards/jm60/keymaps/default/keymap.c rename to keyboards/kbdfans/jm60/keymaps/default/keymap.c index 2bb26fccf6d..d063afa0fd3 100644 --- a/keyboards/jm60/keymaps/default/keymap.c +++ b/keyboards/kbdfans/jm60/keymaps/default/keymap.c @@ -1,3 +1,6 @@ +// Copyright QMK +// SPDX-License-Identifier: GPL-2.0+ + #include QMK_KEYBOARD_H enum layer_names { diff --git a/keyboards/kbdfans/jm60/keymaps/poker3/keymap.c b/keyboards/kbdfans/jm60/keymaps/poker3/keymap.c new file mode 100644 index 00000000000..ee1583eab73 --- /dev/null +++ b/keyboards/kbdfans/jm60/keymaps/poker3/keymap.c @@ -0,0 +1,24 @@ +#include QMK_KEYBOARD_H + +enum layer_names { + _BL, + _FL +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BL] = LAYOUT_60_ansi( + 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_BSPC, + 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, + MO(_FL), 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, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(_FL), KC_RCTL + ), + + [_FL] = LAYOUT_60_ansi( + 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_DEL, + _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, KC_PGUP, KC_UP, KC_PGDN, KC_PSCR, KC_SCRL, KC_PAUS, _______, + KC_CAPS, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS, KC_DEL, _______, + _______, KC_APP, _______, _______, _______, _______, KC_END, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/jm60/ld/jm60_bootloader.ld b/keyboards/kbdfans/jm60/ld/jm60_bootloader.ld similarity index 100% rename from keyboards/jm60/ld/jm60_bootloader.ld rename to keyboards/kbdfans/jm60/ld/jm60_bootloader.ld diff --git a/keyboards/jm60/mcuconf.h b/keyboards/kbdfans/jm60/mcuconf.h similarity index 100% rename from keyboards/jm60/mcuconf.h rename to keyboards/kbdfans/jm60/mcuconf.h diff --git a/keyboards/jm60/readme.md b/keyboards/kbdfans/jm60/readme.md similarity index 96% rename from keyboards/jm60/readme.md rename to keyboards/kbdfans/jm60/readme.md index bb790d6d07f..545124f3aaa 100644 --- a/keyboards/jm60/readme.md +++ b/keyboards/kbdfans/jm60/readme.md @@ -8,7 +8,7 @@ A compact 60% keyboard with full RGB led support. Make example for this keyboard (after setting up your build environment): - make jm60:default + make kbdfans/jm60: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). diff --git a/keyboards/jm60/rules.mk b/keyboards/kbdfans/jm60/rules.mk similarity index 100% rename from keyboards/jm60/rules.mk rename to keyboards/kbdfans/jm60/rules.mk