Merge remote-tracking branch 'origin/master' into develop

7 files changed, 141 insertions, 0 deletions

diff --git a/keyboards/takashicompany/rookey/info.json b/keyboards/takashicompany/rookey/info.json
new file mode 100644
index 0000000000..9473345409
--- /dev/null
+++ b/keyboards/takashicompany/rookey/info.json
@@ -0,0 +1,50 @@
+{
+    "manufacturer": "takashicompany",
+    "keyboard_name": "Rookey",
+    "maintainer": "takashicompany",
+    "development_board": "promicro",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "B4", "pin_b": "E6"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5"]
+        ]
+    },
+    "url": "https://github.com/takashicompany/rookey",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0056",
+        "vid": "0x7463"
+    },
+    "dynamic_keymap": {
+        "layer_count": 16
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 0, "y": 1},
+                {"matrix": [0, 5], "x": 1, "y": 1},
+                {"matrix": [0, 6], "x": 2, "y": 1},
+                {"matrix": [0, 7], "x": 3, "y": 1},
+                {"matrix": [0, 8], "x": 4, "y": 2}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/takashicompany/rookey/keymaps/default/keymap.c b/keyboards/takashicompany/rookey/keymaps/default/keymap.c
new file mode 100644
index 0000000000..a224aaf7ea
--- /dev/null
+++ b/keyboards/takashicompany/rookey/keymaps/default/keymap.c
@@ -0,0 +1,24 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        LT(1, KC_Q), KC_W, KC_E, KC_R,
+        KC_A, KC_S, KC_D, KC_F,
+        KC_V
+    ),
+    [1] = LAYOUT(
+        _______, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] =   { ENCODER_CCW_CW(KC_1, KC_2) },
+    [1] =   { ENCODER_CCW_CW(KC_LEFT, KC_RIGHT) }
+};
+#endif
diff --git a/keyboards/takashicompany/rookey/keymaps/default/rules.mk b/keyboards/takashicompany/rookey/keymaps/default/rules.mk
new file mode 100644
index 0000000000..a40474b4d5
--- /dev/null
+++ b/keyboards/takashicompany/rookey/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/takashicompany/rookey/keymaps/via/keymap.c b/keyboards/takashicompany/rookey/keymaps/via/keymap.c
new file mode 100644
index 0000000000..4e18986145
--- /dev/null
+++ b/keyboards/takashicompany/rookey/keymaps/via/keymap.c
@@ -0,0 +1,20 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(
+        KC_Q, KC_W, KC_E, KC_R,
+        KC_A, KC_S, KC_D, KC_F,
+        KC_V
+    )
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+
+    [0]     =   { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN) }
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/takashicompany/rookey/keymaps/via/rules.mk b/keyboards/takashicompany/rookey/keymaps/via/rules.mk
new file mode 100644
index 0000000000..6ccd6d9194
--- /dev/null
+++ b/keyboards/takashicompany/rookey/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+ENCODER_MAP_ENABLE = yes
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/takashicompany/rookey/readme.md b/keyboards/takashicompany/rookey/readme.md
new file mode 100644
index 0000000000..f9393ca220
--- /dev/null
+++ b/keyboards/takashicompany/rookey/readme.md
@@ -0,0 +1,43 @@
+# Rookey
+
+![takashicompany/rookey](https://i.imgur.com/kLQDeZZh.jpg)
+
+Rookey, as the name implies, is a DIY keyboard "Rookie" creation.
+
+With its small number of parts and simple structure, it can be easily completed even by first-time assemblers.
+
+Despite its small size, it can be used as a 9-key macro pad, and a rotary encoder can also be attached.
+
+It can be used not only as a first unit, but also as a long-lasting unit.
+
+---
+
+Rookeyは名前の通り、DIYキーボードの"Rookie"のために作られた一作です。
+
+部品数が少なく、構造がシンプルなため初めて組み立てる人でも容易に完成させることができます。
+
+小さいながらも9キーのマクロパッドとして使用ができる上に、ロータリーエンコーダの取り付けも可能です。
+
+初めての一台としてはもちろん、永く使い続ける一台としても愛用することができます。
+
+* Keyboard Maintainer: [takashicompany](https://github.com/takashicompany)
+* Hardware Supported: Rookey PCB, Pro Micro
+* Hardware Availability: https://github.com/takashicompany/rookey
+
+Make example for this keyboard (after setting up your build environment):
+
+    make takashicompany/rookey:default
+
+Flashing example for this keyboard:
+
+    make takashicompany/rookey: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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/takashicompany/rookey/rules.mk b/keyboards/takashicompany/rookey/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/takashicompany/rookey/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank