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

6 files changed, 153 insertions, 0 deletions

diff --git a/keyboards/kibou/harbour/info.json b/keyboards/kibou/harbour/info.json
new file mode 100644
index 0000000000..ae5fe10d68
--- /dev/null
+++ b/keyboards/kibou/harbour/info.json
@@ -0,0 +1,102 @@
+{
+    "manufacturer": "kibou",
+    "keyboard_name": "harbour",
+    "maintainer": "kibou",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "ROW2COL",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["C9", "A8", "A15", "C10", "C11", "B5", "B6", "B7", "A0", "A1", "A2", "C3", "C2", "C1", "A3", "A4"],
+        "rows": ["C12", "D2", "B3", "B4", "C13"]
+    },
+    "processor": "STM32F401",
+    "url": "https://kibou.store/",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0xA002",
+        "vid": "0x586A"
+    },
+    "indicators": {
+        "caps_lock": "C8"
+    },
+    "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,2], "x": 1.5, "y": 1 }, 
+                { "matrix": [1,3], "x": 2.5, "y": 1 }, 
+                { "matrix": [1,4], "x": 3.5, "y": 1 }, 
+                { "matrix": [1,5], "x": 4.5, "y": 1 }, 
+                { "matrix": [1,6], "x": 5.5, "y": 1 }, 
+                { "matrix": [1,7], "x": 6.5, "y": 1 }, 
+                { "matrix": [1,8], "x": 7.5, "y": 1 }, 
+                { "matrix": [1,9], "x": 8.5, "y": 1 }, 
+                { "matrix": [1,10], "x": 9.5, "y": 1 }, 
+                { "matrix": [1,11], "x": 10.5, "y": 1 }, 
+                { "matrix": [1,12], "x": 11.5, "y": 1 }, 
+                { "matrix": [1,13], "x": 12.5, "y": 1 }, 
+                { "matrix": [1,14], "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,2], "x": 1.75, "y": 2 }, 
+                { "matrix": [2,3], "x": 2.75, "y": 2 }, 
+                { "matrix": [2,4], "x": 3.75, "y": 2 }, 
+                { "matrix": [2,5], "x": 4.75, "y": 2 }, 
+                { "matrix": [2,6], "x": 5.75, "y": 2 }, 
+                { "matrix": [2,7], "x": 6.75, "y": 2 }, 
+                { "matrix": [2,8], "x": 7.75, "y": 2 }, 
+                { "matrix": [2,9], "x": 8.75, "y": 2 }, 
+                { "matrix": [2,10], "x": 9.75, "y": 2 }, 
+                { "matrix": [2,11], "x": 10.75, "y": 2 }, 
+                { "matrix": [2,12], "x": 11.75, "y": 2 }, 
+                { "matrix": [2,14], "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,2], "x": 2.25, "y": 3 }, 
+                { "matrix": [3,3], "x": 3.25, "y": 3 }, 
+                { "matrix": [3,4], "x": 4.25, "y": 3 }, 
+                { "matrix": [3,5], "x": 5.25, "y": 3 }, 
+                { "matrix": [3,6], "x": 6.25, "y": 3 }, 
+                { "matrix": [3,7], "x": 7.25, "y": 3 }, 
+                { "matrix": [3,8], "x": 8.25, "y": 3 }, 
+                { "matrix": [3,9], "x": 9.25, "y": 3 }, 
+                { "matrix": [3,10], "x": 10.25, "y": 3 }, 
+                { "matrix": [3,11], "x": 11.25, "y": 3 }, 
+                { "matrix": [3,13], "x": 12.25, "y": 3, "w": 1.75 }, 
+                { "matrix": [3,14], "x": 14, "y": 3 }, 
+                { "matrix": [3,15], "x": 15, "y": 3 }, 
+                { "matrix": [4,0], "x": 0, "y": 4, "w": 1.5 }, 
+                { "matrix": [4,2], "x": 1.5, "y": 4 }, 
+                { "matrix": [4,3], "x": 2.5, "y": 4, "w": 1.5 }, 
+                { "matrix": [4,7], "x": 4, "y": 4, "w": 7 }, 
+                { "matrix": [4,11], "x": 11, "y": 4, "w": 1.75 }, 
+                { "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/harbour/keymaps/default/keymap.c b/keyboards/kibou/harbour/keymaps/default/keymap.c
new file mode 100644
index 0000000000..7586fc24e0
--- /dev/null
+++ b/keyboards/kibou/harbour/keymaps/default/keymap.c
@@ -0,0 +1,13 @@
+// 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_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_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_INS, 
+		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_PGUP, 
+		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_PGDN, 
+		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, KC_LEFT, KC_DOWN, KC_RGHT)
+};
diff --git a/keyboards/kibou/harbour/keymaps/via/keymap.c b/keyboards/kibou/harbour/keymaps/via/keymap.c
new file mode 100644
index 0000000000..7586fc24e0
--- /dev/null
+++ b/keyboards/kibou/harbour/keymaps/via/keymap.c
@@ -0,0 +1,13 @@
+// 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_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_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_INS, 
+		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_PGUP, 
+		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_PGDN, 
+		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, KC_LEFT, KC_DOWN, KC_RGHT)
+};
diff --git a/keyboards/kibou/harbour/keymaps/via/rules.mk b/keyboards/kibou/harbour/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/kibou/harbour/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/kibou/harbour/readme.md b/keyboards/kibou/harbour/readme.md
new file mode 100644
index 0000000000..f957e31795
--- /dev/null
+++ b/keyboards/kibou/harbour/readme.md
@@ -0,0 +1,23 @@
+# harbour
+
+* Keyboard Maintainer: [kibou](https://kibou.store/)
+* Hardware Supported: harbour PCBs, STM32F401
+* Hardware Availability: https://kibou.store/
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kibou/harbour:default
+
+Flashing example for this keyboard:
+
+    make kibou/harbour: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/harbour/rules.mk b/keyboards/kibou/harbour/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/kibou/harbour/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank