Merge f3605e745a into c843ad1268

Co-authored-by: Joel Challis <git@zvecr.com>

keyboards/takashicompany/jourkey/keyboard.json

@@ -0,0 +1,51 @@
+{
+    "manufacturer": "takashicompany",
+    "keyboard_name": "Jourkey",
+    "maintainer": "takashicompany",
+    "development_board": "promicro",
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "D1", "pin_b": "D0"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "direct": [
+            ["D4", "C6", "D7", "E6", "B4", "F5", "F6", "F7", "B5", "B1", "B3", "B2", "B6"]
+        ]
+    },
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0062",
+        "vid": "0x7463"
+    },
+    "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": 4, "y": 0},
+                {"matrix": [0, 5], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [0, 6], "x": 1.5, "y": 1},
+                {"matrix": [0, 7], "x": 2.5, "y": 1},
+                {"matrix": [0, 8], "x": 3.5, "y": 1, "w": 1.5},
+                {"matrix": [0, 9], "x": 0, "y": 2, "w":1.75},
+                {"matrix": [0, 10], "x": 1.75, "y": 2},
+                {"matrix": [0, 11], "x": 2.75, "y": 2},
+                {"matrix": [0, 12], "x": 3.75, "y": 2, "w":1.25}
+            ]
+        }
+    }
+}

keyboards/takashicompany/jourkey/keymaps/default/keymap.c

@@ -0,0 +1,18 @@
+// 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_ESC, KC_1, KC_2, KC_3, KC_4,
+        KC_TAB, KC_Q, KC_W, KC_ENT,
+        KC_LCTL, KC_A, KC_S, KC_RSFT
+    )
+};
+
+#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

keyboards/takashicompany/jourkey/keymaps/default/rules.mk

@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes

keyboards/takashicompany/jourkey/readme.md

@@ -0,0 +1,41 @@
+# Joukey
+
+![takashicompany/jourkey](https://i.imgur.com/pCrTbKn.jpeg)
+
+Jourkey was designed as “a keyboard for taking pictures with scenery while traveling.
+
+The layout is like a smaller version of a traditional keyboard.
+Decorate it with your favorite keycaps and case to make it your travel companion.
+
+Of course, it can also be used as a macro pad.
+
+---
+
+Jourkeyは「旅先で景色と写真を撮るためのキーボード」としてデザインされました。
+
+従来のキーボードを小さくしたようなレイアウトです。
+お気に入りのキーキャップやケースでデコレーションして貴方の旅のお供になります。
+
+もちろん、マクロパッドとして使用することも可能です。
+
+* Keyboard Maintainer: [takashicompany](https://github.com/takashicompany)
+* Hardware Supported: Jourkey PCB, Pro Micro
+* Hardware Availability: https://github.com/takashicompany/jourkey
+
+Make example for this keyboard (after setting up your build environment):
+
+    make takashicompany/jourkey:default
+
+Flashing example for this keyboard:
+
+    make takashicompany/jourkey: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