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

7 files changed, 173 insertions, 0 deletions

diff --git a/keyboards/kbdfans/d45/keymaps/default/keymap.c b/keyboards/kbdfans/d45/keymaps/default/keymap.c
new file mode 100644
index 0000000000..b6d65cf180
--- /dev/null
+++ b/keyboards/kbdfans/d45/keymaps/default/keymap.c
@@ -0,0 +1,24 @@
+/* Copyright 2022 dztech kbdfans
+ *
+ * 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( /* Base */
+		    KC_ESC, 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_DEL,
+		    KC_F2,  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_HOME,
+		    KC_F3,  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,   KC_END,
+		    KC_F4,  KC_LCTL,   KC_LALT,            KC_SPC,       KC_SPC,         KC_RALT, KC_RCTL,                   KC_LEFT,  KC_DOWN, KC_RIGHT),
+ };
diff --git a/keyboards/kbdfans/d45/keymaps/via/keymap.c b/keyboards/kbdfans/d45/keymaps/via/keymap.c
new file mode 100644
index 0000000000..f21fc50328
--- /dev/null
+++ b/keyboards/kbdfans/d45/keymaps/via/keymap.c
@@ -0,0 +1,39 @@
+/* Copyright 2022 dztech kbdfans
+ *
+ * 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( /* Base */
+		    KC_ESC, 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_DEL,
+		    KC_F2,  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_HOME,
+		    KC_F3,  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,   KC_END,
+		    KC_F4,  KC_LCTL,   KC_LALT,            KC_SPC,       KC_SPC,         KC_RALT, KC_RCTL,                   KC_LEFT,  KC_DOWN, KC_RIGHT),
+		[1] = LAYOUT( /* FN */
+		    KC_ESC, 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_DEL,
+		    KC_F2,  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_HOME,
+		    KC_F3,  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,   KC_END,
+		    KC_F4,  KC_LCTL,   KC_LALT,            KC_SPC,       KC_SPC,         KC_RALT, KC_RCTL,                   KC_LEFT,  KC_DOWN, KC_RIGHT),
+ 		[2] = LAYOUT( /* FN */
+		    KC_ESC, 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_DEL,
+		    KC_F2,  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_HOME,
+		    KC_F3,  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,   KC_END,
+		    KC_F4,  KC_LCTL,   KC_LALT,            KC_SPC,       KC_SPC,         KC_RALT, KC_RCTL,                   KC_LEFT,  KC_DOWN, KC_RIGHT),
+		[3] = LAYOUT( /* FN */
+		    KC_ESC, 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_DEL,
+		    KC_F2,  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_HOME,
+		    KC_F3,  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,   KC_END,
+		    KC_F4,  KC_LCTL,   KC_LALT,            KC_SPC,       KC_SPC,         KC_RALT, KC_RCTL,                   KC_LEFT,  KC_DOWN, KC_RIGHT),
+ };
diff --git a/keyboards/kbdfans/d45/keymaps/via/rules.mk b/keyboards/kbdfans/d45/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/kbdfans/d45/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/kbdfans/d45/rules.mk b/keyboards/kbdfans/d45/rules.mk
new file mode 100644
index 0000000000..041e632f65
--- /dev/null
+++ b/keyboards/kbdfans/d45/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = kbdfans/d45/v2
diff --git a/keyboards/kbdfans/d45/v2/info.json b/keyboards/kbdfans/d45/v2/info.json
new file mode 100644
index 0000000000..e6b0f903b8
--- /dev/null
+++ b/keyboards/kbdfans/d45/v2/info.json
@@ -0,0 +1,87 @@
+{
+    "manufacturer": "kbdfans",
+    "maintainer": "moyi4681",
+    "keyboard_name": "D45V2",    
+    "bootloader": "rp2040",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["GP24", "GP13", "GP12", "GP11", "GP10", "GP9", "GP8", "GP7", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1", "GP0"],
+        "rows": ["GP25", "GP26", "GP23", "GP22"]
+    },
+    "processor": "RP2040",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0006",
+        "vid": "0x4B42"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "w": 1.5, "x": 1.25, "y": 0 },
+                { "matrix": [0, 2], "x": 2.75, "y": 0 },
+                { "matrix": [0, 3], "x": 3.75, "y": 0 },
+                { "matrix": [0, 4], "x": 4.75, "y": 0 },
+                { "matrix": [0, 5], "x": 5.75, "y": 0 },
+                { "matrix": [0, 6], "x": 6.75, "y": 0 },
+                { "matrix": [0, 7], "x": 7.75, "y": 0 },
+                { "matrix": [0, 8], "x": 8.75, "y": 0 },
+                { "matrix": [0, 9], "x": 9.75, "y": 0 },
+                { "matrix": [0, 10], "x": 10.75, "y": 0 },
+                { "matrix": [0, 11], "x": 11.75, "y": 0 },
+                { "matrix": [0, 12], "x": 12.75, "y": 0 },
+                { "matrix": [0, 13], "x": 13.75, "y": 0 },
+                { "matrix": [3, 13], "w": 1.5, "x": 14.75, "y": 0 },
+                { "matrix": [0, 14], "x": 16.75, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "w": 1.75, "x": 1.25, "y": 1 },
+                { "matrix": [1, 2], "x": 3, "y": 1 },
+                { "matrix": [1, 3], "x": 4, "y": 1 },
+                { "matrix": [1, 4], "x": 5, "y": 1 },
+                { "matrix": [1, 5], "x": 6, "y": 1 },
+                { "matrix": [1, 6], "x": 7, "y": 1 },
+                { "matrix": [1, 7], "x": 8, "y": 1 },
+                { "matrix": [1, 8], "x": 9, "y": 1 },
+                { "matrix": [1, 9], "x": 10, "y": 1 },
+                { "matrix": [1, 10], "x": 11, "y": 1 },
+                { "matrix": [1, 11], "x": 12, "y": 1 },
+                { "matrix": [1, 12], "x": 13, "y": 1 },
+                { "matrix": [1, 13], "w": 2.25, "x": 14, "y": 1 },
+                { "matrix": [1, 14], "x": 16.75, "y": 1 },
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "w": 2.25, "x": 1.25, "y": 2 },
+                { "matrix": [2, 2], "x": 3.5, "y": 2 },
+                { "matrix": [2, 3], "x": 4.5, "y": 2 },
+                { "matrix": [2, 4], "x": 5.5, "y": 2 },
+                { "matrix": [2, 5], "x": 6.5, "y": 2 },
+                { "matrix": [2, 6], "x": 7.5, "y": 2 },
+                { "matrix": [2, 7], "x": 8.5, "y": 2 },
+                { "matrix": [2, 8], "x": 9.5, "y": 2 },
+                { "matrix": [2, 9], "x": 10.5, "y": 2 },
+                { "matrix": [2, 10], "x": 11.5, "y": 2 },
+                { "matrix": [2, 11], "x": 12.5, "y": 2 },
+                { "matrix": [2, 12], "w": 1.75, "x": 13.5, "y": 2 },
+                { "matrix": [2, 13], "x": 15.5, "y": 2.25 },
+                { "matrix": [2, 14], "x": 16.75, "y": 2 },
+                { "matrix": [3, 0], "x": 0, "y": 3 },
+                { "matrix": [3, 1], "x": 2.75, "y": 3 },
+                { "matrix": [3, 2], "w": 1.5, "x": 3.75, "y": 3 },
+                { "matrix": [3, 5], "w": 2.75, "x": 5.25, "y": 3 },
+                { "matrix": [3, 8], "w": 2.25, "x": 8, "y": 3 },
+                { "matrix": [3, 9], "w": 1.5, "x": 10.25, "y": 3 },
+                { "matrix": [3, 10], "x": 11.75, "y": 3 },
+                { "matrix": [3, 11], "x": 14.5, "y": 3.25 },
+                { "matrix": [3, 12], "x": 15.5, "y": 3.25 },
+                { "matrix": [3, 14], "x": 16.5, "y": 3.25 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/kbdfans/d45/v2/readme.md b/keyboards/kbdfans/d45/v2/readme.md
new file mode 100644
index 0000000000..768decc17a
--- /dev/null
+++ b/keyboards/kbdfans/d45/v2/readme.md
@@ -0,0 +1,20 @@
+# d45
+
+* Keyboard Maintainer: [moyi4681](https://github.com/moyi4681)
+* Hardware Supported: KBDFANS
+* Hardware Availability: [kbdfans](https://kbdfans.myshopify.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kbdfans/d45:default
+
+
+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**: Double tap the reset button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/kbdfans/d45/v2/rules.mk b/keyboards/kbdfans/d45/v2/rules.mk
new file mode 100644
index 0000000000..7ff128fa69
--- /dev/null
+++ b/keyboards/kbdfans/d45/v2/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file