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

6 files changed, 266 insertions, 0 deletions

diff --git a/keyboards/ydkb/ydpm40/config.h b/keyboards/ydkb/ydpm40/config.h
new file mode 100644
index 0000000000..f475b2967a
--- /dev/null
+++ b/keyboards/ydkb/ydpm40/config.h
@@ -0,0 +1,25 @@
+// Copyright 2022 anb (@anb)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+#define USB_CFG_IOPORTNAME      D
+#define USB_CFG_DMINUS_BIT      2
+#define USB_CFG_DPLUS_BIT       3
+#define USB_COUNT_SOF           0
diff --git a/keyboards/ydkb/ydpm40/info.json b/keyboards/ydkb/ydpm40/info.json
new file mode 100644
index 0000000000..8e2e941dcf
--- /dev/null
+++ b/keyboards/ydkb/ydpm40/info.json
@@ -0,0 +1,136 @@
+{
+    "manufacturer": "yang",
+    "keyboard_name": "ydkb/ydpm40",
+    "maintainer": "xofyarg",
+    "bootloader": "bootloadhid",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": false,
+        "command": false,
+        "console": false,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": false,
+    },
+    "matrix_pins": {
+        "cols": ["B0", "B1", "B2", "B3", "B4", "B5", "C5", "C4", "C3", "C2", "C1", "C0"],
+        "rows": ["D4", "D5", "D6", "D7"]
+    },
+    "processor": "atmega328p",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0240",
+        "vid": "0xFEED"
+    },
+    "build": {
+        "lto": true
+    },
+    "layouts": {
+        "LAYOUT_ortho": {
+            "layout": [
+                { "matrix": [0, 0],  "label": "Esc",     "x": 0,    "y": 0 },
+                { "matrix": [0, 1],  "label": "Q",       "x": 1,    "y": 0 },
+                { "matrix": [0, 2],  "label": "W",       "x": 2,    "y": 0 },
+                { "matrix": [0, 3],  "label": "E",       "x": 3,    "y": 0 },
+                { "matrix": [0, 4],  "label": "R",       "x": 4,    "y": 0 },
+                { "matrix": [0, 5],  "label": "T",       "x": 5,    "y": 0 },
+                { "matrix": [0, 6],  "label": "Y",       "x": 6,    "y": 0 },
+                { "matrix": [0, 7],  "label": "U",       "x": 7,    "y": 0 },
+                { "matrix": [0, 8],  "label": "I",       "x": 8,    "y": 0 },
+                { "matrix": [0, 9],  "label": "O",       "x": 9,    "y": 0 },
+                { "matrix": [0, 10], "label": "P",       "x": 10,   "y": 0 },
+                { "matrix": [0, 11], "label": "BS",      "x": 11,   "y": 0 },
+
+                { "matrix": [1, 0],  "label": "Caps",    "x": 0,    "y": 1 },
+                { "matrix": [1, 1],  "label": "A",       "x": 1,    "y": 1 },
+                { "matrix": [1, 2],  "label": "S",       "x": 2,    "y": 1 },
+                { "matrix": [1, 3],  "label": "D",       "x": 3,    "y": 1 },
+                { "matrix": [1, 4],  "label": "F",       "x": 4,    "y": 1 },
+                { "matrix": [1, 5],  "label": "G",       "x": 5,    "y": 1 },
+                { "matrix": [1, 6],  "label": "H",       "x": 6,    "y": 1 },
+                { "matrix": [1, 7],  "label": "J",       "x": 7,    "y": 1 },
+                { "matrix": [1, 8],  "label": "K",       "x": 8,    "y": 1 },
+                { "matrix": [1, 9],  "label": "L",       "x": 9,    "y": 1 },
+                { "matrix": [1, 10],  "label": ";:",     "x": 10,   "y": 1 },
+                { "matrix": [1, 11], "label": "Enter",   "x": 11,   "y": 1 },
+
+                { "matrix": [2, 0],  "label": "Shift",   "x": 0,    "y": 2 },
+                { "matrix": [2, 1],  "label": "Z",       "x": 1,    "y": 2 },
+                { "matrix": [2, 2],  "label": "X",       "x": 2,    "y": 2 },
+                { "matrix": [2, 3],  "label": "C",       "x": 3,    "y": 2 },
+                { "matrix": [2, 4],  "label": "V",       "x": 4,    "y": 2 },
+                { "matrix": [2, 5],  "label": "B",       "x": 5,    "y": 2 },
+                { "matrix": [2, 6],  "label": "N",       "x": 6,    "y": 2 },
+                { "matrix": [2, 7],  "label": "M",       "x": 7,    "y": 2 },
+                { "matrix": [2, 8],  "label": ",<",      "x": 8,    "y": 2 },
+                { "matrix": [2, 9],  "label": ".>",      "x": 9,    "y": 2 },
+                { "matrix": [2, 10], "label": "/?",      "x": 10,   "y": 2 },
+                { "matrix": [2, 11], "label": "RShift",  "x": 11,   "y": 2 },
+
+                { "matrix": [3, 0],  "label": "Ctrl",    "x": 0,    "y": 3 },
+                { "matrix": [3, 1],  "label": "Win",     "x": 1,    "y": 3 },
+                { "matrix": [3, 2],  "label": "Alt",     "x": 2,    "y": 3 },
+                { "matrix": [3, 3],  "label": "Menu",    "x": 3,    "y": 3 },
+                { "matrix": [3, 4],  "label": "Space",   "x": 4,    "y": 3, "w": 2 },
+                { "matrix": [3, 6],  "label": "Space",   "x": 6,    "y": 3, "w": 2 },
+                { "matrix": [3, 8],  "label": "Left",    "x": 8,    "y": 3 },
+                { "matrix": [3, 9],  "label": "Up",      "x": 9,    "y": 3 },
+                { "matrix": [3, 10], "label": "Down",    "x": 10,   "y": 3 },
+                { "matrix": [3, 11], "label": "Right",   "x": 11,   "y": 3 }
+            ]
+        },
+        "LAYOUT_stagger": {
+            "layout": [
+                { "matrix": [0, 0],  "label": "Esc",     "x": 0,    "y": 0 },
+                { "matrix": [0, 1],  "label": "Q",       "x": 1,    "y": 0 },
+                { "matrix": [0, 2],  "label": "W",       "x": 2,    "y": 0 },
+                { "matrix": [0, 3],  "label": "E",       "x": 3,    "y": 0 },
+                { "matrix": [0, 4],  "label": "R",       "x": 4,    "y": 0 },
+                { "matrix": [0, 5],  "label": "T",       "x": 5,    "y": 0 },
+                { "matrix": [0, 6],  "label": "Y",       "x": 6,    "y": 0 },
+                { "matrix": [0, 7],  "label": "U",       "x": 7,    "y": 0 },
+                { "matrix": [0, 8],  "label": "I",       "x": 8,    "y": 0 },
+                { "matrix": [0, 9],  "label": "O",       "x": 9,    "y": 0 },
+                { "matrix": [0, 10], "label": "P",       "x": 10,   "y": 0 },
+                { "matrix": [0, 11], "label": "BS",      "x": 11,   "y": 0 },
+
+                { "matrix": [1, 0],  "label": "Caps",    "x": 0,    "y": 1, "w": 1.5 },
+                { "matrix": [1, 1],  "label": "A",       "x": 1.5,  "y": 1 },
+                { "matrix": [1, 2],  "label": "S",       "x": 2.5,  "y": 1 },
+                { "matrix": [1, 3],  "label": "D",       "x": 3.5,  "y": 1 },
+                { "matrix": [1, 4],  "label": "F",       "x": 4.5,  "y": 1 },
+                { "matrix": [1, 5],  "label": "G",       "x": 5.5,  "y": 1 },
+                { "matrix": [1, 6],  "label": "H",       "x": 6.5,  "y": 1 },
+                { "matrix": [1, 7],  "label": "J",       "x": 7.5,  "y": 1 },
+                { "matrix": [1, 8],  "label": "K",       "x": 8.5,  "y": 1 },
+                { "matrix": [1, 9],  "label": "L",       "x": 9.5,  "y": 1 },
+                { "matrix": [1, 11], "label": "Enter",   "x": 10.5, "y": 1, "w": 1.5 },
+
+                { "matrix": [2, 0],  "label": "Shift",   "x": 0,    "y": 2 },
+                { "matrix": [2, 1],  "label": "Z",       "x": 1,    "y": 2 },
+                { "matrix": [2, 2],  "label": "X",       "x": 2,    "y": 2 },
+                { "matrix": [2, 3],  "label": "C",       "x": 3,    "y": 2 },
+                { "matrix": [2, 4],  "label": "V",       "x": 4,    "y": 2 },
+                { "matrix": [2, 5],  "label": "B",       "x": 5,    "y": 2 },
+                { "matrix": [2, 6],  "label": "N",       "x": 6,    "y": 2 },
+                { "matrix": [2, 7],  "label": "M",       "x": 7,    "y": 2 },
+                { "matrix": [2, 8],  "label": ",<",      "x": 8,    "y": 2 },
+                { "matrix": [2, 9],  "label": ".>",      "x": 9,    "y": 2 },
+                { "matrix": [2, 10], "label": "/?",      "x": 10,   "y": 2 },
+                { "matrix": [2, 11], "label": "RShift",  "x": 11,   "y": 2 },
+
+                { "matrix": [3, 0],  "label": "Ctrl",    "x": 0,    "y": 3 },
+                { "matrix": [3, 1],  "label": "Win",     "x": 1,    "y": 3 },
+                { "matrix": [3, 2],  "label": "Alt",     "x": 2,    "y": 3 },
+                { "matrix": [3, 3],  "label": "Menu",    "x": 3,    "y": 3, "w": 1.25 },
+                { "matrix": [3, 4],  "label": "Space",   "x": 4.25, "y": 3, "w": 1.75 },
+                { "matrix": [3, 6],  "label": "Space",   "x": 6,    "y": 3, "w": 1.75 },
+                { "matrix": [3, 8],  "label": "Left",    "x": 7.75, "y": 3, "w": 1.25 },
+                { "matrix": [3, 9],  "label": "Up",      "x": 9,    "y": 3 },
+                { "matrix": [3, 10], "label": "Down",    "x": 10,   "y": 3 },
+                { "matrix": [3, 11], "label": "Right",   "x": 11,   "y": 3 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/ydkb/ydpm40/keymaps/default/keymap.c b/keyboards/ydkb/ydpm40/keymaps/default/keymap.c
new file mode 100644
index 0000000000..28550c33ad
--- /dev/null
+++ b/keyboards/ydkb/ydpm40/keymaps/default/keymap.c
@@ -0,0 +1,41 @@
+/* Copyright 2022 xofyarg
+ *
+ * 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] = {
+/*
+┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐
+│Es││Q ││W ││E ││R ││T ││Y ││U ││I ││O ││P ││BS│
+└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘
+┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐
+│Ca││A ││S ││D ││F ││G ││H ││J ││K ││L ││;:││En│
+└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘
+┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐
+│Sh││Z ││X ││C ││V ││B ││N ││M ││,<││.>││/?││RS│
+└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘
+┌──┐┌──┐┌──┐┌──┐┌──────┐┌──────┐┌──┐┌──┐┌──┐┌──┐
+│Ct││Wi││Al││Me││Space ││Space ││Le││Up││Do││Ri│
+└──┘└──┘└──┘└──┘└──────┘└──────┘└──┘└──┘└──┘└──┘
+*/
+
+    [0] = LAYOUT_ortho(
+        KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+        KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, 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_RSFT,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_APP,  KC_SPC,           KC_SPC,           KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT
+    )
+};
diff --git a/keyboards/ydkb/ydpm40/keymaps/ydm40/keymap.c b/keyboards/ydkb/ydpm40/keymaps/ydm40/keymap.c
new file mode 100644
index 0000000000..eee5bc9774
--- /dev/null
+++ b/keyboards/ydkb/ydpm40/keymaps/ydm40/keymap.c
@@ -0,0 +1,41 @@
+/* Copyright 2022 xofyarg
+ *
+ * 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] = {
+/*
+┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐
+│Es││Q ││W ││E ││R ││T ││Y ││U ││I ││O ││P ││BS│
+└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘
+┌────┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌────┐
+│Caps││A ││S ││D ││F ││G ││H ││J ││K ││L ││Ente│
+└────┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└────┘
+┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐┌──┐
+│Sh││Z ││X ││C ││V ││B ││N ││M ││,<││.>││/?││RS│
+└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘└──┘
+┌──┐┌──┐┌──┐┌───┐┌─────┐┌─────┐┌───┐┌──┐┌──┐┌──┐
+│Ct││Wi││Al││Men││Space││Space││Lef││Up││Do││Ri│
+└──┘└──┘└──┘└───┘└─────┘└─────┘└───┘└──┘└──┘└──┘
+*/
+
+    [0] = LAYOUT_stagger(
+        KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+        KC_TAB,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    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_RSFT,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_APP,  KC_SPC,           KC_SPC,           KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT
+    )
+};
diff --git a/keyboards/ydkb/ydpm40/readme.md b/keyboards/ydkb/ydpm40/readme.md
new file mode 100644
index 0000000000..6a7bbe86e5
--- /dev/null
+++ b/keyboards/ydkb/ydpm40/readme.md
@@ -0,0 +1,22 @@
+# ydkb/ydpm40
+
+A pair of 40% keyboards, that share the same PCB, designed by yang. Among the two, ydp40 has a Planck-like layout, while ydm40 is more traditional.
+
+* Keyboard Maintainer: [xofyarg](https://github.com/xofyarg)
+* Hardware Supported: https://github.com/yangdigi/YDPM40-Keyboard-PCB
+* Hardware Availability: https://ydkb.world.taobao.com/
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ydkb/ydpm40:default
+
+Flashing example for this keyboard:
+
+    make ydkb/ydpm40: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
+
+The ATmega328P MCU comes with BootloadHID. To enter it, hold down the
+top left key and plug in the keyboard.
diff --git a/keyboards/ydkb/ydpm40/rules.mk b/keyboards/ydkb/ydpm40/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/ydkb/ydpm40/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank