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

4 files changed, 127 insertions, 0 deletions

diff --git a/keyboards/pteropus/info.json b/keyboards/pteropus/info.json
new file mode 100644
index 0000000000..019b6c7526
--- /dev/null
+++ b/keyboards/pteropus/info.json
@@ -0,0 +1,69 @@
+{
+    "manufacturer": "hulahermit",
+    "keyboard_name": "pteropus",
+    "maintainer": "hulahermit",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["A8", "B15", "B14", "B13", "B12", "B5", "B4", "B3", "A15", "A14"],
+        "rows": ["B10", "B2", "B1", "B0"]
+    },
+    "processor": "STM32F072",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "community_layouts": ["split_3x5_3"],
+    "layouts": {
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0.25 },
+                { "matrix": [0, 1], "x": 1, "y": 0.125 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0.125 },
+                { "matrix": [0, 4], "x": 4, "y": 0.25 },
+                { "matrix": [0, 5], "x": 8, "y": 0.25 },
+                { "matrix": [0, 6], "x": 9, "y": 0.125 },
+                { "matrix": [0, 7], "x": 10, "y": 0 },
+                { "matrix": [0, 8], "x": 11, "y": 0.125 },
+                { "matrix": [0, 9], "x": 12, "y": 0.25 },
+                { "matrix": [1, 0], "x": 0, "y": 1.25 },
+                { "matrix": [1, 1], "x": 1, "y": 1.125 },
+                { "matrix": [1, 2], "x": 2, "y": 1 },
+                { "matrix": [1, 3], "x": 3, "y": 1.125 },
+                { "matrix": [1, 4], "x": 4, "y": 1.25 },
+                { "matrix": [1, 5], "x": 8, "y": 1.25 },
+                { "matrix": [1, 6], "x": 9, "y": 1.125 },
+                { "matrix": [1, 7], "x": 10, "y": 1 },
+                { "matrix": [1, 8], "x": 11, "y": 1.125 },
+                { "matrix": [1, 9], "x": 12, "y": 1.25 },
+                { "matrix": [2, 0], "x": 0, "y": 1.25 },
+                { "matrix": [2, 1], "x": 1, "y": 1.125 },
+                { "matrix": [2, 2], "x": 2, "y": 1 },
+                { "matrix": [2, 3], "x": 3, "y": 1.125 },
+                { "matrix": [2, 4], "x": 4, "y": 1.25 },
+                { "matrix": [2, 5], "x": 8, "y": 1.25 },
+                { "matrix": [2, 6], "x": 9, "y": 1.125 },
+                { "matrix": [2, 7], "x": 10, "y": 1 },
+                { "matrix": [2, 8], "x": 11, "y": 1.125 },
+                { "matrix": [2, 9], "x": 12, "y": 1.25 },
+                { "matrix": [3, 2], "x": 3, "y": 3.25 },
+                { "matrix": [3, 3], "x": 4, "y": 3.5 },
+                { "matrix": [3, 4], "x": 5, "y": 3.75 },
+                { "matrix": [3, 5], "x": 7, "y": 3.75 },
+                { "matrix": [3, 6], "x": 8, "y": 3.5 },
+                { "matrix": [3, 7], "x": 9, "y": 3.25 }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/pteropus/keymaps/default/keymap.c b/keyboards/pteropus/keymaps/default/keymap.c
new file mode 100644
index 0000000000..460295f41c
--- /dev/null
+++ b/keyboards/pteropus/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+     /*
+      * ┌───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┐
+      * │ Q │ W │ E │ R │ T │       │ Y │ U │ I │ O │ P │
+      * ├───┼───┼───┼───┼───┤       ├───┼───┼───┼───┼───┤
+      * │ A │ S │ D │ F │ G │       │ H │ J │ K │ L │ ; │
+      * ├───┼───┼───┼───┼───┤       ├───┼───┼───┼───┼───┤
+      * │ Z │ X │ C │ V │ B │       │ N │ M │ , │ . │ / │
+      * └───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┘
+      *           ┌───┐                   ┌───┐
+      *           │GUI├───┐           ┌───┤Alt│
+      *           └───┤Bsp├───┐   ┌───┤Ent├───┘
+      *               └───┤   │   │   ├───┘
+      *                   └───┘   └───┘
+      */
+    [0] = LAYOUT_split_3x5_3(
+        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                               KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
+        KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,
+        KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                               KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
+                                   KC_LGUI, KC_BSPC, KC_SPC,           KC_SPC,  KC_ENT,  KC_RALT
+    ),
+};
diff --git a/keyboards/pteropus/readme.md b/keyboards/pteropus/readme.md
new file mode 100644
index 0000000000..7471e08e8b
--- /dev/null
+++ b/keyboards/pteropus/readme.md
@@ -0,0 +1,30 @@
+# pteropus keyboard
+
+![pteropus](https://i.imgur.com/5AACuSXh.jpg)
+
+Another Miryoku inspired 36-key non-split keyboard
+
+* Keyboard Maintainer: [hulahermit](https://github.com/hulahermit)
+* Hardware Supported: Embeded type-c connector with STM32F072 microcontroller
+* Hardware Availability: [pteropus](https://github.com/hulahermit/pteropus_keyboard)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make pteropus:default
+    make pteropus:manna-harbour_miryoku
+
+Flashing example for this keyboard:
+
+    make pteropus:default:flash
+    make pteropus:manna-harbour_miryoku: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:
+
+* **Bootmagic reset**: Hold down the top-left key and plug in the keyboard.
+* **Physical reset**: Hold the `BOOT` button down, then press the `RESET` button. Alternately, plug the keyboard in while holding down the `BOOT` button.
+  The `BOOT` button can be released after a few seconds.
+* **Keycode in layout**: There is no key mapped to `QK_BOOT` in the pre-created keymap, but you may assign this key in any keymaps you create.
diff --git a/keyboards/pteropus/rules.mk b/keyboards/pteropus/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/pteropus/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank