summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorフィルターペーパー <76888457+filterpaper@users.noreply.github.com>2024-02-19 19:18:20 +0800
committerGitHub <noreply@github.com>2024-02-19 11:18:20 +0000
commitbc7d1cc39744d0d2c6053aecc8294c6fe8e165cf (patch)
treebab9b768935731345d8a9eb368c3159adc96c579 /keyboards
parente26e12402b7a5a619a95999f5c8a2a73defcd9b3 (diff)
Refactor: group kbdfans keyboards (#22764)
Move two kbdfans keyboard into kbdfans folder
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/kbdfans/epoch80/info.json (renamed from keyboards/epoch80/info.json)0
-rw-r--r--keyboards/kbdfans/epoch80/keymaps/default/keymap.c (renamed from keyboards/epoch80/keymaps/default/keymap.c)0
-rw-r--r--keyboards/kbdfans/epoch80/keymaps/iso/keymap.c (renamed from keyboards/epoch80/keymaps/iso/keymap.c)0
-rw-r--r--keyboards/kbdfans/epoch80/keymaps/tsangan/keymap.c (renamed from keyboards/epoch80/keymaps/tsangan/keymap.c)0
-rw-r--r--keyboards/kbdfans/epoch80/keymaps/via/keymap.c (renamed from keyboards/epoch80/keymaps/via/keymap.c)0
-rw-r--r--keyboards/kbdfans/epoch80/keymaps/via/rules.mk (renamed from keyboards/epoch80/keymaps/via/rules.mk)0
-rw-r--r--keyboards/kbdfans/epoch80/keymaps/wkl/keymap.c (renamed from keyboards/epoch80/keymaps/wkl/keymap.c)0
-rw-r--r--keyboards/kbdfans/epoch80/readme.md (renamed from keyboards/epoch80/readme.md)4
-rw-r--r--keyboards/kbdfans/epoch80/rules.mk (renamed from keyboards/epoch80/rules.mk)0
-rw-r--r--keyboards/kbdfans/jm60/board.h (renamed from keyboards/jm60/board.h)0
-rw-r--r--keyboards/kbdfans/jm60/chconf.h (renamed from keyboards/jm60/chconf.h)0
-rw-r--r--keyboards/kbdfans/jm60/config.h (renamed from keyboards/jm60/config.h)0
-rw-r--r--keyboards/kbdfans/jm60/info.json (renamed from keyboards/jm60/info.json)0
-rw-r--r--keyboards/kbdfans/jm60/jm60.c (renamed from keyboards/jm60/jm60.c)0
-rw-r--r--keyboards/kbdfans/jm60/keymaps/default/keymap.c (renamed from keyboards/jm60/keymaps/default/keymap.c)3
-rw-r--r--keyboards/kbdfans/jm60/keymaps/poker3/keymap.c24
-rw-r--r--keyboards/kbdfans/jm60/ld/jm60_bootloader.ld (renamed from keyboards/jm60/ld/jm60_bootloader.ld)0
-rw-r--r--keyboards/kbdfans/jm60/mcuconf.h (renamed from keyboards/jm60/mcuconf.h)0
-rw-r--r--keyboards/kbdfans/jm60/readme.md (renamed from keyboards/jm60/readme.md)2
-rw-r--r--keyboards/kbdfans/jm60/rules.mk (renamed from keyboards/jm60/rules.mk)0
20 files changed, 30 insertions, 3 deletions
diff --git a/keyboards/epoch80/info.json b/keyboards/kbdfans/epoch80/info.json
index 7a67933c2f..7a67933c2f 100644
--- a/keyboards/epoch80/info.json
+++ b/keyboards/kbdfans/epoch80/info.json
diff --git a/keyboards/epoch80/keymaps/default/keymap.c b/keyboards/kbdfans/epoch80/keymaps/default/keymap.c
index 8fa715e675..8fa715e675 100644
--- a/keyboards/epoch80/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/epoch80/keymaps/default/keymap.c
diff --git a/keyboards/epoch80/keymaps/iso/keymap.c b/keyboards/kbdfans/epoch80/keymaps/iso/keymap.c
index 5e6eec8eca..5e6eec8eca 100644
--- a/keyboards/epoch80/keymaps/iso/keymap.c
+++ b/keyboards/kbdfans/epoch80/keymaps/iso/keymap.c
diff --git a/keyboards/epoch80/keymaps/tsangan/keymap.c b/keyboards/kbdfans/epoch80/keymaps/tsangan/keymap.c
index 9b74a7fdcf..9b74a7fdcf 100644
--- a/keyboards/epoch80/keymaps/tsangan/keymap.c
+++ b/keyboards/kbdfans/epoch80/keymaps/tsangan/keymap.c
diff --git a/keyboards/epoch80/keymaps/via/keymap.c b/keyboards/kbdfans/epoch80/keymaps/via/keymap.c
index 032ee3aaac..032ee3aaac 100644
--- a/keyboards/epoch80/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/epoch80/keymaps/via/keymap.c
diff --git a/keyboards/epoch80/keymaps/via/rules.mk b/keyboards/kbdfans/epoch80/keymaps/via/rules.mk
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/epoch80/keymaps/via/rules.mk
+++ b/keyboards/kbdfans/epoch80/keymaps/via/rules.mk
diff --git a/keyboards/epoch80/keymaps/wkl/keymap.c b/keyboards/kbdfans/epoch80/keymaps/wkl/keymap.c
index e673ee248b..e673ee248b 100644
--- a/keyboards/epoch80/keymaps/wkl/keymap.c
+++ b/keyboards/kbdfans/epoch80/keymaps/wkl/keymap.c
diff --git a/keyboards/epoch80/readme.md b/keyboards/kbdfans/epoch80/readme.md
index a78f9ce87b..b029b5bd99 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
index 6fe874e748..6fe874e748 100644
--- a/keyboards/epoch80/rules.mk
+++ b/keyboards/kbdfans/epoch80/rules.mk
diff --git a/keyboards/jm60/board.h b/keyboards/kbdfans/jm60/board.h
index c1c37c0659..c1c37c0659 100644
--- a/keyboards/jm60/board.h
+++ b/keyboards/kbdfans/jm60/board.h
diff --git a/keyboards/jm60/chconf.h b/keyboards/kbdfans/jm60/chconf.h
index 5bceae30ab..5bceae30ab 100644
--- a/keyboards/jm60/chconf.h
+++ b/keyboards/kbdfans/jm60/chconf.h
diff --git a/keyboards/jm60/config.h b/keyboards/kbdfans/jm60/config.h
index 4b007cf387..4b007cf387 100644
--- a/keyboards/jm60/config.h
+++ b/keyboards/kbdfans/jm60/config.h
diff --git a/keyboards/jm60/info.json b/keyboards/kbdfans/jm60/info.json
index 496637383f..496637383f 100644
--- a/keyboards/jm60/info.json
+++ b/keyboards/kbdfans/jm60/info.json
diff --git a/keyboards/jm60/jm60.c b/keyboards/kbdfans/jm60/jm60.c
index cffb33d695..cffb33d695 100644
--- a/keyboards/jm60/jm60.c
+++ b/keyboards/kbdfans/jm60/jm60.c
diff --git a/keyboards/jm60/keymaps/default/keymap.c b/keyboards/kbdfans/jm60/keymaps/default/keymap.c
index 2bb26fccf6..d063afa0fd 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 0000000000..ee1583eab7
--- /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
index 2a0ab2e8e7..2a0ab2e8e7 100644
--- a/keyboards/jm60/ld/jm60_bootloader.ld
+++ b/keyboards/kbdfans/jm60/ld/jm60_bootloader.ld
diff --git a/keyboards/jm60/mcuconf.h b/keyboards/kbdfans/jm60/mcuconf.h
index 276829216e..276829216e 100644
--- a/keyboards/jm60/mcuconf.h
+++ b/keyboards/kbdfans/jm60/mcuconf.h
diff --git a/keyboards/jm60/readme.md b/keyboards/kbdfans/jm60/readme.md
index bb790d6d07..545124f3aa 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
index 5dbf13f5e7..5dbf13f5e7 100644
--- a/keyboards/jm60/rules.mk
+++ b/keyboards/kbdfans/jm60/rules.mk