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

6 files changed, 174 insertions, 0 deletions

diff --git a/keyboards/kibou/fukuro/info.json b/keyboards/kibou/fukuro/info.json
new file mode 100644
index 0000000000..fa50cca964
--- /dev/null
+++ b/keyboards/kibou/fukuro/info.json
@@ -0,0 +1,97 @@
+{
+    "manufacturer": "Kibou",
+    "keyboard_name": "Fukuro",
+    "maintainer": "Kibou",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["A8", "B10", "B2", "B1", "B0", "A7", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A1"],
+        "rows": ["A9", "A10", "C13", "A0", "A6"]
+    },
+    "processor": "STM32F072",
+    "url": "",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0003",
+        "vid": "0x586A"
+    },
+    "indicators": {
+        "caps_lock": "A2"
+    },
+    "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":[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,14], "x":13.5, "y":1, "w":1.5},
+              {"matrix":[2,0], "x":0, "y":2, "w":1.74},
+              {"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,13], "x":12.75, "y":2, "w":2.25},
+              {"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,12], "x":12.25, "y":3, "w":1.75},
+              {"matrix":[3,14], "x":14, "y":3},
+              {"matrix":[4,0], "x":0, "y":4, "w":1.5},
+              {"matrix":[4,1], "x":1.5, "y":4},
+              {"matrix":[4,2], "x":2.5, "y":4, "w":1.5},
+              {"matrix":[4,5], "x":4, "y":4, "w":6},
+              {"matrix":[4,9], "x":10, "y":4, "w":1.5},
+              {"matrix":[4,10], "x":11.5, "y":4},
+              {"matrix":[4,14], "x":13.5, "y":4, "w":1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kibou/fukuro/keymaps/default/keymap.c b/keyboards/kibou/fukuro/keymaps/default/keymap.c
new file mode 100644
index 0000000000..874d94ea1c
--- /dev/null
+++ b/keyboards/kibou/fukuro/keymaps/default/keymap.c
@@ -0,0 +1,19 @@
+// 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_BSLS, 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_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, MO(1),
+      KC_LCTL, KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_MENU),
+  [1] = LAYOUT(
+      KC_TRNS, 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_TRNS, KC_TRNS, 
+      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/fukuro/keymaps/via/keymap.c b/keyboards/kibou/fukuro/keymaps/via/keymap.c
new file mode 100644
index 0000000000..4e4569a995
--- /dev/null
+++ b/keyboards/kibou/fukuro/keymaps/via/keymap.c
@@ -0,0 +1,33 @@
+/*
+Copyright 2023 Kibou
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#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_BSLS, 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_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, MO(1),
+      KC_LCTL, KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_MENU),
+    [1] = LAYOUT(
+      KC_TRNS, 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_TRNS, KC_TRNS, 
+      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/fukuro/keymaps/via/rules.mk b/keyboards/kibou/fukuro/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/kibou/fukuro/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/kibou/fukuro/readme.md b/keyboards/kibou/fukuro/readme.md
new file mode 100644
index 0000000000..9cb12a9e40
--- /dev/null
+++ b/keyboards/kibou/fukuro/readme.md
@@ -0,0 +1,23 @@
+# fukuro
+
+* Keyboard Maintainer: [Kibou.](https://kibou.store/)  
+* Hardware Supported: fukuro PCBs, STM32F072
+* Hardware Availability: https://kibou.store/
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kibou/fukuro:default
+
+Flashing example for this keyboard:
+
+    make kibou/fukuro: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/fukuro/rules.mk b/keyboards/kibou/fukuro/rules.mk
new file mode 100644
index 0000000000..7ff128fa69
--- /dev/null
+++ b/keyboards/kibou/fukuro/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file