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

6 files changed, 168 insertions, 0 deletions

diff --git a/keyboards/kibou/suisei/info.json b/keyboards/kibou/suisei/info.json
new file mode 100644
index 0000000000..a33bb12abd
--- /dev/null
+++ b/keyboards/kibou/suisei/info.json
@@ -0,0 +1,101 @@
+{
+    "manufacturer": "kibou",
+    "keyboard_name": "suisei",
+    "maintainer": "kibou",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["B2", "A10", "A9", "A8", "B15", "B14", "B13", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "C13", "B9"],
+        "rows": ["B11", "B10", "B0", "A1", "A0"]
+    },
+    "processor": "STM32F072",
+    "url": "https://kibou.store/",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0065",
+        "vid": "0x586A"
+    },
+    "indicators": {
+        "caps_lock": "B1"
+    },
+    "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":5, "y":0}, 
+                {"matrix": [0,6], "x":6, "y":0}, 
+                {"matrix": [0,7], "x":7, "y":0}, 
+                {"matrix": [0,8], "x":8, "y":0}, 
+                {"matrix": [0,9], "x":9, "y":0}, 
+                {"matrix": [0,10], "x":10, "y":0}, 
+                {"matrix": [0,11], "x":11, "y":0}, 
+                {"matrix": [0,12], "x":12, "y":0}, 
+                {"matrix": [0,13], "x":13, "y":0}, 
+                {"matrix": [0,14], "x":14, "y":0}, 
+                {"matrix": [0,15], "x":15, "y":0}, 
+                {"matrix": [1,0], "x":0, "y":1, "w":1.5}, 
+                {"matrix": [1,1], "x":1.5, "y":1}, 
+                {"matrix": [1,2], "x":2.5, "y":1}, 
+                {"matrix": [1,3], "x":3.5, "y":1}, 
+                {"matrix": [1,4], "x":4.5, "y":1}, 
+                {"matrix": [1,5], "x":5.5, "y":1}, 
+                {"matrix": [1,6], "x":6.5, "y":1}, 
+                {"matrix": [1,7], "x":7.5, "y":1}, 
+                {"matrix": [1,8], "x":8.5, "y":1}, 
+                {"matrix": [1,9], "x":9.5, "y":1}, 
+                {"matrix": [1,10], "x":10.5, "y":1}, 
+                {"matrix": [1,11], "x":11.5, "y":1}, 
+                {"matrix": [1,12], "x":12.5, "y":1}, 
+                {"matrix": [1,13], "x":13.5, "y":1, "w":1.5}, 
+                {"matrix": [1,15], "x":15, "y":1}, 
+                {"matrix": [2,0], "x":0, "y":2, "w":1.75}, 
+                {"matrix": [2,1], "x":1.75, "y":2}, 
+                {"matrix": [2,2], "x":2.75, "y":2}, 
+                {"matrix": [2,3], "x":3.75, "y":2}, 
+                {"matrix": [2,4], "x":4.75, "y":2}, 
+                {"matrix": [2,5], "x":5.75, "y":2}, 
+                {"matrix": [2,6], "x":6.75, "y":2}, 
+                {"matrix": [2,7], "x":7.75, "y":2}, 
+                {"matrix": [2,8], "x":8.75, "y":2}, 
+                {"matrix": [2,9], "x":9.75, "y":2}, 
+                {"matrix": [2,10], "x":10.75, "y":2}, 
+                {"matrix": [2,11], "x":11.75, "y":2}, 
+                {"matrix": [2,12], "x":12.75, "y":2, "w":2.25}, 
+                {"matrix": [2,15], "x":15, "y":2}, 
+                {"matrix": [3,0], "x":0, "y":3, "w":2.25}, 
+                {"matrix": [3,1], "x":2.25, "y":3}, 
+                {"matrix": [3,2], "x":3.25, "y":3}, 
+                {"matrix": [3,3], "x":4.25, "y":3}, 
+                {"matrix": [3,4], "x":5.25, "y":3}, 
+                {"matrix": [3,5], "x":6.25, "y":3}, 
+                {"matrix": [3,6], "x":7.25, "y":3}, 
+                {"matrix": [3,7], "x":8.25, "y":3}, 
+                {"matrix": [3,8], "x":9.25, "y":3}, 
+                {"matrix": [3,9], "x":10.25, "y":3}, 
+                {"matrix": [3,10], "x":11.25, "y":3}, 
+                {"matrix": [3,11], "x":12.25, "y":3, "w":1.75}, 
+                {"matrix": [3,14], "x":14.0, "y":3}, 
+                {"matrix": [3,15], "x":15.0, "y":3}, 
+                {"matrix": [4,0], "x":0, "y":4, "w":1.5}, 
+                {"matrix": [4,2], "x":2.25, "y":4, "w":1.5}, 
+                {"matrix": [4,5], "x":3.75, "y":4, "w":7}, 
+                {"matrix": [4,10], "x":10.75, "y":4, "w":1.5}, 
+                {"matrix": [4,13], "x":13, "y":4}, 
+                {"matrix": [4,14], "x":14, "y":4}, 
+                {"matrix": [4,15], "x":15, "y":4}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/kibou/suisei/keymaps/default/keymap.c b/keyboards/kibou/suisei/keymaps/default/keymap.c
new file mode 100644
index 0000000000..2c9d04c6c1
--- /dev/null
+++ b/keyboards/kibou/suisei/keymaps/default/keymap.c
@@ -0,0 +1,21 @@
+// 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_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_SPC, KC_DEL, 
+	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, KC_PGUP, 
+	KC_CAPS, 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_PGDN, 
+	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_UP, MO(1), 
+	KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+	[1] = LAYOUT(
+    KC_NO, 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_NO, KC_NO, KC_NO, 
+	KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
+	KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
+	KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, _______, 
+	KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
+    )
+};
diff --git a/keyboards/kibou/suisei/keymaps/via/keymap.c b/keyboards/kibou/suisei/keymaps/via/keymap.c
new file mode 100644
index 0000000000..2c9d04c6c1
--- /dev/null
+++ b/keyboards/kibou/suisei/keymaps/via/keymap.c
@@ -0,0 +1,21 @@
+// 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_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_SPC, KC_DEL, 
+	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, KC_PGUP, 
+	KC_CAPS, 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_PGDN, 
+	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_UP, MO(1), 
+	KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+	[1] = LAYOUT(
+    KC_NO, 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_NO, KC_NO, KC_NO, 
+	KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
+	KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
+	KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, _______, 
+	KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
+    )
+};
diff --git a/keyboards/kibou/suisei/keymaps/via/rules.mk b/keyboards/kibou/suisei/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/kibou/suisei/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/kibou/suisei/readme.md b/keyboards/kibou/suisei/readme.md
new file mode 100644
index 0000000000..6c3d135caf
--- /dev/null
+++ b/keyboards/kibou/suisei/readme.md
@@ -0,0 +1,23 @@
+# suisei
+
+* Keyboard Maintainer: [kibou](https://kibou.store/)
+* Hardware Supported: suisei PCBs, STM32F072
+* Hardware Availability: https://kibou.store/
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kibou/suisei:default
+
+Flashing example for this keyboard:
+
+    make kibou/suisei: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/kibou/suisei/rules.mk b/keyboards/kibou/suisei/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/kibou/suisei/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank