Merge branch 'master' into taamas

6 files changed, 221 insertions, 0 deletions

diff --git a/keyboards/ms_sculpt/config.h b/keyboards/ms_sculpt/config.h
new file mode 100644
index 0000000000..710fc756af
--- /dev/null
+++ b/keyboards/ms_sculpt/config.h
@@ -0,0 +1,16 @@
+// Copyright 2022 Jean Bernard (@jn-bernard)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+#define BOOTMAGIC_LITE_ROW 4
+#define BOOTMAGIC_LITE_COLUMN 13
+
+/* key matrix size */
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 18
diff --git a/keyboards/ms_sculpt/info.json b/keyboards/ms_sculpt/info.json
new file mode 100644
index 0000000000..4eaf4b0a75
--- /dev/null
+++ b/keyboards/ms_sculpt/info.json
@@ -0,0 +1,129 @@
+{
+    "manufacturer": "Jean Bernard",
+    "keyboard_name": "ms_sculpt",
+    "maintainer": "jn-bernard",
+    "bootloader": "stm32-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": false,
+        "mousekey": false,
+        "nkro": false
+    },
+    "matrix_pins": {
+        "rows": ["B10", "B1", "B0", "A7", "A6", "A5", "A4", "A3"],
+        "cols": ["A2","B8","A0","C15","C14","A14","A13","B7","B6","B5","B4","B3","A15","A10","A8","B15","B14","B12"],
+        "ghost": true,
+        "io_delay": 5
+    },
+    "processor": "STM32F401",
+    "url": "",
+    "usb": {
+        "polling_interval": 1,
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "layouts": {
+        "LAYOUT_iso": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0, "w":1, "h":0.8},
+                {"label":"F1", "x":1, "y":0, "w":1, "h":0.8},
+                {"label":"F2", "x":2, "y":0, "w":1, "h":0.8},
+                {"label":"F3", "x":3, "y":0, "w":1, "h":0.8},
+                {"label":"F4", "x":4, "y":0, "w":1, "h":0.8},
+                {"label":"F5", "x":5, "y":0, "w":1, "h":0.8},
+                {"label":"F6", "x":6, "y":0, "w":1, "h":0.8},
+                {"label":"F7", "x":8, "y":0, "w":0.975, "h":0.8},
+                {"label":"F8", "x":8.975, "y":0, "w":0.975, "h":0.8},
+                {"label":"F9", "x":9.95, "y":0, "w":0.975, "h":0.8},
+                {"label":"F10", "x":10.925, "y":0, "w":0.975, "h":0.8},
+                {"label":"F11", "x":11.9, "y":0, "w":0.975, "h":0.8},
+                {"label":"F12", "x":12.875, "y":0, "w":0.975, "h":0.8},
+                {"label":"Print Screen", "x":13.85, "y":0, "w":0.975, "h":0.8},
+                {"label":"Scroll Lock", "x":14.825, "y":0, "w":0.975, "h":0.8},
+                {"label":"Pause", "x":15.8, "y":0, "w":0.975, "h":0.8},
+                {"label":"Calculator", "x":16.775, "y":0, "w":0.975, "h":0.8},
+
+                {"label":"`~", "x":0, "y":0.8},
+                {"label":"1!", "x":1, "y":0.8},
+                {"label":"2@", "x":2, "y":0.8},
+                {"label":"3#", "x":3, "y":0.8},
+                {"label":"4$", "x":4, "y":0.8},
+                {"label":"5%", "x":5, "y":0.8},
+                {"label":"6^", "x":6, "y":0.8},
+                {"label":"7&", "x":8, "y":0.8, "w":1.5},
+                {"label":"8*", "x":9.5, "y":0.8},
+                {"label":"9(", "x":10.5, "y":0.8},
+                {"label":"0)", "x":11.5, "y":0.8},
+                {"label":"-_", "x":12.5, "y":0.8},
+                {"label":"=+", "x":13.5, "y":0.8},
+                {"label":"Backspace", "x":14.5, "y":0.8, "w":2.25},
+                {"label":"Delete", "x":16.75, "y":0.8, "h":2},
+                {"label":"Home", "x":17.75, "y":0.8},
+
+                {"label":"Tab", "x":0, "y":1.8, "w":1.25},
+                {"label":"Q", "x":1.25, "y":1.8},
+                {"label":"W", "x":2.25, "y":1.8},
+                {"label":"E", "x":3.25, "y":1.8},
+                {"label":"R", "x":4.25, "y":1.8},
+                {"label":"T", "x":5.25, "y":1.8, "w":1.75},
+                {"label":"Y", "x":8, "y":1.8, "w":1.25},
+                {"label":"U", "x":9.25, "y":1.8},
+                {"label":"I", "x":10.25, "y":1.8},
+                {"label":"O", "x":11.25, "y":1.8},
+                {"label":"P", "x":12.25, "y":1.8},
+                {"label":"[{", "x":13.25, "y":1.8},
+                {"label":"]}", "x":14.25, "y":1.8},
+                {"label":"End", "x":17.75, "y":1.8},
+
+                {"label":"Shift", "x":0, "y":2.8, "w":1.5},
+                {"label":"A", "x":1.5, "y":2.8},
+                {"label":"S", "x":2.5, "y":2.8},
+                {"label":"D", "x":3.5, "y":2.8},
+                {"label":"F", "x":4.5, "y":2.8},
+                {"label":"G", "x":5.5, "y":2.8, "w":1.5},
+                {"label":"H", "x":8, "y":2.8, "w":1.5},
+                {"label":"J", "x":9.5, "y":2.8},
+                {"label":"K", "x":10.5, "y":2.8},
+                {"label":"L", "x":11.5, "y":2.8},
+                {"label":";:", "x":12.5, "y":2.8},
+                {"label":"'@", "x":13.5, "y":2.8},
+                {"label":"#~", "x":14.5, "y":2.8},
+                {"label":"Enter", "x":15.5, "y":1.8, "w":1.25, "h":2},
+                {"label":"Insert", "x":16.75, "y":2.8},
+                {"label":"Page Up", "x":17.75, "y":2.8},
+
+                {"label":"Shift", "x":0, "y":3.8},
+                {"label":"\\|", "x":1, "y":3.8},
+                {"label":"Z", "x":2, "y":3.8},
+                {"label":"X", "x":3, "y":3.8},
+                {"label":"C", "x":4, "y":3.8},
+                {"label":"V", "x":5, "y":3.8},
+                {"label":"B", "x":6, "y":3.8},
+                {"label":"N", "x":8, "y":3.8, "w":2},
+                {"label":"M", "x":10, "y":3.8},
+                {"label":",<", "x":11, "y":3.8},
+                {"label":".>", "x":12, "y":3.8},
+                {"label":"/?", "x":13, "y":3.8},
+                {"label":"Shift", "x":14, "y":3.8, "w":2.75},
+                {"label":"\u2191", "x":16.75, "y":3.8},
+                {"label":"Page Down", "x":17.75, "y":3.8},
+
+                {"label":"Ctrl", "x":0, "y":4.8, "w":1.5},
+                {"label":"GUI", "x":1.5, "y":4.8, "w":1.5},
+                {"label":"Alt", "x":3, "y":4.8, "w":1.5},
+                {"label":"Space", "x":4.5, "y":4.8, "w":3},
+                {"label":"Space", "x":7.5, "y":4.8, "w":3},
+                {"label":"AltGr", "x":10.5, "y":4.8, "w":1.5},
+                {"label":"App", "x":12, "y":4.8, "w":1.5},
+                {"label":"Ctrl", "x":13.5, "y":4.8, "w":2.25},
+                {"label":"\u2190", "x":15.75, "y":4.8},
+                {"label":"\u2192", "x":16.75, "y":4.8},
+                {"label":"\u2193", "x":17.75, "y":4.8}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ms_sculpt/keymaps/default/keymap.c b/keyboards/ms_sculpt/keymaps/default/keymap.c
new file mode 100644
index 0000000000..b82c37a773
--- /dev/null
+++ b/keyboards/ms_sculpt/keymaps/default/keymap.c
@@ -0,0 +1,21 @@
+// Copyright 2022 Jean Bernard (@jn-bernard)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum custom_layers {
+    _BASE,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+  [_BASE] = LAYOUT_iso( \
+    /*  0      1        2        3        4        5         6        7       8        9         10      11          12         13         14        15       16  */
+    KC_ESC,  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_PSCREEN, KC_SLCK, KC_PAUSE, KC_CALC, \
+    KC_GRV,  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_HOME,  \
+    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_END, \
+    KC_LSFT, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,    KC_NUHS, KC_ENT,  KC_INS,  KC_PGUP, \
+    KC_LSFT, KC_NUBS, 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_PGDN, \
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,  KC_SPC,           KC_RALT, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT  \
+  ),
+};
diff --git a/keyboards/ms_sculpt/ms_sculpt.h b/keyboards/ms_sculpt/ms_sculpt.h
new file mode 100644
index 0000000000..056f7d5b5d
--- /dev/null
+++ b/keyboards/ms_sculpt/ms_sculpt.h
@@ -0,0 +1,25 @@
+// Copyright 2022 Jean Bernard (@jn-bernard)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_iso( \
+    k4D, k7C, k7B, k1B, k4B, k1A, k1F, k79, k77, k75, k78, k73, k13, k71, k31, k01, k23, \
+    k7D, k0D, k0C, k2D, k1D, k7A, k7F, k09, k07, k05, k04, k15, k74, k08, k03, k21, \
+    k0A, k0B, k1C, k2B, k2A, k2F, k19, k29, k27, k25, k24, k14, k17, k51, \
+    k2C, k3D, k4C, k3B, k3A, k4A, k49, k39, k37, k35, k34, k45, k65, k33, k18, k11, \
+    k5E, k6C, k5D, k5C, k5B, k5A, k6A, k69, k59, k57, k55, k44, k52, k63, k53, \
+    k6H, k3F, k4G, k6B, k68, k46, k43, k60, k48, k64, k61	\
+) \
+{ \
+    {KC_NO, k01,   KC_NO, k03, k04,   k05,   KC_NO, k07,   k08,   k09, k0A, k0B, k0C,   k0D,   KC_NO, KC_NO, KC_NO, KC_NO}, \
+    {KC_NO, k11,   KC_NO, k13, k14,   k15,   KC_NO, k17,   k18,   k19, k1A, k1B, k1C,   k1D,   KC_NO, k1F,   KC_NO, KC_NO}, \
+    {KC_NO, k21,   KC_NO, k23, k24,   k25,   KC_NO, k27,   KC_NO, k29, k2A, k2B, k2C,   k2D,   KC_NO, k2F,   KC_NO, KC_NO}, \
+    {KC_NO, k31,   KC_NO, k33, k34,   k35,   KC_NO, k37,   KC_NO, k39, k3A, k3B, k6C,   k3D,   KC_NO, k3F,   KC_NO, KC_NO}, \
+    {KC_NO, KC_NO, KC_NO, k43, k44,   k45,   k46,   KC_NO, k48,   k49, k4A, k4B, k4C,   k4D,   KC_NO, KC_NO, k4G,   KC_NO}, \
+    {KC_NO, k51,   k52,   k53, k65,   k55,   KC_NO, k57,   KC_NO, k59, k5A, k5B, k5C,   k5D,   k5E,   KC_NO, KC_NO, KC_NO}, \
+    {k60,   k61,   KC_NO, k63, k64,   KC_NO, KC_NO, KC_NO, k68,   k69, k6A, k6B, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k6H}, \
+    {KC_NO, k71,   KC_NO, k73, k74,   k75,   KC_NO, k77,   k78,   k79, k7A, k7B, k7C,   k7D,   KC_NO, k7F,   KC_NO, KC_NO} \
+}
diff --git a/keyboards/ms_sculpt/readme.md b/keyboards/ms_sculpt/readme.md
new file mode 100644
index 0000000000..45db8173b2
--- /dev/null
+++ b/keyboards/ms_sculpt/readme.md
@@ -0,0 +1,27 @@
+# ms_sculpt
+
+![ms_sculpt_with_cold_dry_joints](https://user-images.githubusercontent.com/105235786/168012266-4e235bf5-8d34-4731-ab17-2308a9d9a29e.jpg)
+
+MS Sculpt Keyboard ISO-layout wired to STM32F401 / blackpill
+
+* Keyboard Maintainer: [Jean Bernard](https://github.com/jn-bernard)
+* Hardware Supported: MS Sculpt Keyboard ISO-layout, STM32F401
+* Hardware Availability: Ebay
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ms_sculpt:default
+
+Flashing example for this keyboard:
+
+    make ms_sculpt:default:flash
+
+## 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
+
+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).
diff --git a/keyboards/ms_sculpt/rules.mk b/keyboards/ms_sculpt/rules.mk
new file mode 100644
index 0000000000..d64abe822d
--- /dev/null
+++ b/keyboards/ms_sculpt/rules.mk
@@ -0,0 +1,3 @@
+# This file intentionally left blank
+DEBOUNCE_TYPE = sym_eager_pk
+DEBOUNCE = 3