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

9 files changed, 208 insertions, 0 deletions

diff --git a/keyboards/elcantorhs/config.h b/keyboards/elcantorhs/config.h
new file mode 100644
index 0000000000..ba8ae794c9
--- /dev/null
+++ b/keyboards/elcantorhs/config.h
@@ -0,0 +1,8 @@
+// Copyright 2021 azhizhinov (@azhizhinov)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define SERIAL_USART_FULL_DUPLEX
+#define SERIAL_USART_TX_PIN B6
+#define SERIAL_USART_RX_PIN B7
diff --git a/keyboards/elcantorhs/halconf.h b/keyboards/elcantorhs/halconf.h
new file mode 100644
index 0000000000..12ebaa8098
--- /dev/null
+++ b/keyboards/elcantorhs/halconf.h
@@ -0,0 +1,8 @@
+// Copyright 2021 azhizhinov (@azhizhinov)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_SERIAL TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/elcantorhs/info.json b/keyboards/elcantorhs/info.json
new file mode 100644
index 0000000000..7905a1233a
--- /dev/null
+++ b/keyboards/elcantorhs/info.json
@@ -0,0 +1,92 @@
+{
+    "manufacturer": "azhizhinov",
+    "keyboard_name": "EL-CANTOR-HS",
+    "maintainer": "azhizhinov",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "development_board": "blackpill_f401",
+    "url": "https://github.com/azhizhinov/ELCANTORHS",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0001",
+        "vid": "0x415A"
+    },
+    "matrix_pins": {
+        "direct": [
+            ["B1", "B10", "A8", "B15", "B14", "B13"],
+            ["B9", "B8", "B5", "B4", "B3", "A15"],
+            ["A3", "A4", "A5", "A6", "A7", "B0"],
+            ["B12","A2", "A1", "A0", null, null]
+        ]
+    },
+    "split": {
+        "enabled": true,
+        "bootmagic": {
+            "matrix": [4, 5]
+        },
+        "matrix_pins": {
+            "right": {
+                "direct": [
+                    ["B13", "B14", "B15", "A8", "B10", "B1"],
+                    ["A15", "B3", "B4", "B5", "B8", "B9"],
+                    ["B0", "A7", "A6", "A5", "A4", "A3"],
+                    ["A0", "A1", "A2", "B12", null, null]
+                ]
+            }
+        }
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.125},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [4, 0], "x": 8, "y": 0.25},
+                {"matrix": [4, 1], "x": 9, "y": 0.125},
+                {"matrix": [4, 2], "x": 10, "y": 0},
+                {"matrix": [4, 3], "x": 11, "y": 0.125},
+                {"matrix": [4, 4], "x": 12, "y": 0.25},
+                {"matrix": [4, 5], "x": 13, "y": 0.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.125},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [5, 0], "x": 8, "y": 1.25},
+                {"matrix": [5, 1], "x": 9, "y": 1.125},
+                {"matrix": [5, 2], "x": 10, "y": 1},
+                {"matrix": [5, 3], "x": 11, "y": 1.125},
+                {"matrix": [5, 4], "x": 12, "y": 1.25},
+                {"matrix": [5, 5], "x": 13, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.125},
+                {"matrix": [2, 5], "x": 5, "y": 2.25},
+                {"matrix": [6, 0], "x": 8, "y": 2.25},
+                {"matrix": [6, 1], "x": 9, "y": 2.125},
+                {"matrix": [6, 2], "x": 10, "y": 2},
+                {"matrix": [6, 3], "x": 11, "y": 2.125},
+                {"matrix": [6, 4], "x": 12, "y": 2.25},
+                {"matrix": [6, 5], "x": 13, "y": 2.25},
+                {"matrix": [3, 0], "x": 2.5, "y": 3},
+                {"matrix": [3, 1], "x": 3.5, "y": 3.25},
+                {"matrix": [3, 2], "x": 4.5, "y": 3.5},
+                {"matrix": [3, 3], "x": 5.5, "y": 3.75},
+                {"matrix": [7, 0], "x": 7.5, "y": 3.75},
+                {"matrix": [7, 1], "x": 8.5, "y": 3.5},
+                {"matrix": [7, 2], "x": 9.5, "y": 3.25},
+                {"matrix": [7, 3], "x": 10.5, "y": 3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/elcantorhs/keymaps/default/keymap.c b/keyboards/elcantorhs/keymaps/default/keymap.c
new file mode 100644
index 0000000000..49d5e4d178
--- /dev/null
+++ b/keyboards/elcantorhs/keymaps/default/keymap.c
@@ -0,0 +1,30 @@
+// Copyright 2021 azhizhinov (@azhizhinov)
+// SPDX-License-Identifier: GPL-2.0-or-late
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_GRV,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
+        KC_ESC,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,        KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+        KC_TAB,   KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,        KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RBRC,
+                      KC_LALT, KC_LSFT, MO(1), KC_BSPC,        KC_ENT, MO(2), KC_SPC, RCTL(KC_BSPC)
+    ),
+    [1] = LAYOUT(
+        KC_GRV,   KC_1,    KC_2,   KC_3,   KC_4,   KC_5,       KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+        KC_LCTL,  KC_NO,   KC_NO,  KC_NO,  KC_NO,  KC_NO,      KC_LEFT, KC_UP,   KC_RGHT, KC_NO,   KC_HOME, KC_NO,
+        KC_LSFT,  KC_CAPS, KC_NO,  KC_NO,  KC_NO,  KC_NO,      KC_NO,   KC_DOWN, KC_NO,   KC_NO,   KC_END,  KC_RALT,
+                       KC_LALT, KC_LGUI, KC_TRNS, KC_ESC,      KC_ENT, MO(3), KC_SPC, RCTL(KC_BSPC)
+    ),
+    [2] = LAYOUT(
+        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_LCTL, KC_BSPC, KC_C,  KC_NO, KC_NO,   KC_NO,        KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_NO,  KC_NO,
+        KC_LSFT, KC_X,    KC_V,  KC_S,  KC_L,    KC_NO,        KC_UNDS, KC_PLUS, KC_PMNS, KC_NO,  KC_NO,  KC_RALT,
+                       KC_LALT, KC_LGUI, MO(3), KC_ESC,        KC_ENT, KC_TRNS, KC_SPC, RCTL(KC_BSPC)
+    ),
+    [3] = LAYOUT(
+        KC_TAB,  KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC,     KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+        KC_LCTL, KC_NO,   KC_NO, KC_NO,   KC_NO,  KC_NO,       KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, KC_GRV,
+        KC_LSFT, KC_CAPS, KC_NO, KC_NO,   KC_NO,  KC_NO,       KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_RALT,
+                       KC_LALT,  KC_LGUI, KC_TRNS, KC_ESC,     KC_ENT,  KC_TRNS, KC_SPC, RCTL(KC_BSPC)
+    )
+};
diff --git a/keyboards/elcantorhs/keymaps/via/keymap.c b/keyboards/elcantorhs/keymaps/via/keymap.c
new file mode 100644
index 0000000000..49d5e4d178
--- /dev/null
+++ b/keyboards/elcantorhs/keymaps/via/keymap.c
@@ -0,0 +1,30 @@
+// Copyright 2021 azhizhinov (@azhizhinov)
+// SPDX-License-Identifier: GPL-2.0-or-late
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_GRV,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
+        KC_ESC,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,        KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+        KC_TAB,   KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,        KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RBRC,
+                      KC_LALT, KC_LSFT, MO(1), KC_BSPC,        KC_ENT, MO(2), KC_SPC, RCTL(KC_BSPC)
+    ),
+    [1] = LAYOUT(
+        KC_GRV,   KC_1,    KC_2,   KC_3,   KC_4,   KC_5,       KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+        KC_LCTL,  KC_NO,   KC_NO,  KC_NO,  KC_NO,  KC_NO,      KC_LEFT, KC_UP,   KC_RGHT, KC_NO,   KC_HOME, KC_NO,
+        KC_LSFT,  KC_CAPS, KC_NO,  KC_NO,  KC_NO,  KC_NO,      KC_NO,   KC_DOWN, KC_NO,   KC_NO,   KC_END,  KC_RALT,
+                       KC_LALT, KC_LGUI, KC_TRNS, KC_ESC,      KC_ENT, MO(3), KC_SPC, RCTL(KC_BSPC)
+    ),
+    [2] = LAYOUT(
+        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_LCTL, KC_BSPC, KC_C,  KC_NO, KC_NO,   KC_NO,        KC_NO,   KC_NO,   KC_NO,   KC_NO,  KC_NO,  KC_NO,
+        KC_LSFT, KC_X,    KC_V,  KC_S,  KC_L,    KC_NO,        KC_UNDS, KC_PLUS, KC_PMNS, KC_NO,  KC_NO,  KC_RALT,
+                       KC_LALT, KC_LGUI, MO(3), KC_ESC,        KC_ENT, KC_TRNS, KC_SPC, RCTL(KC_BSPC)
+    ),
+    [3] = LAYOUT(
+        KC_TAB,  KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC,     KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+        KC_LCTL, KC_NO,   KC_NO, KC_NO,   KC_NO,  KC_NO,       KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, KC_GRV,
+        KC_LSFT, KC_CAPS, KC_NO, KC_NO,   KC_NO,  KC_NO,       KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_RALT,
+                       KC_LALT,  KC_LGUI, KC_TRNS, KC_ESC,     KC_ENT,  KC_TRNS, KC_SPC, RCTL(KC_BSPC)
+    )
+};
diff --git a/keyboards/elcantorhs/keymaps/via/rules.mk b/keyboards/elcantorhs/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/elcantorhs/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/elcantorhs/mcuconf.h b/keyboards/elcantorhs/mcuconf.h
new file mode 100644
index 0000000000..c56b76d8dd
--- /dev/null
+++ b/keyboards/elcantorhs/mcuconf.h
@@ -0,0 +1,8 @@
+// Copyright 2021 azhizhinov (@azhizhinov)
+// SPDX-License-Identifier: GPL-2.0-or-late
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 TRUE
diff --git a/keyboards/elcantorhs/readme.md b/keyboards/elcantorhs/readme.md
new file mode 100644
index 0000000000..1fd5388052
--- /dev/null
+++ b/keyboards/elcantorhs/readme.md
@@ -0,0 +1,30 @@
+# El Cantor HS
+
+![El Cantor HS](https://imagestack.de/i/905c30a38469.png)
+
+The El Cantor HS keyboard is a 44 key diodeless split keyboard with support for hotswap sockets, designed with simplicity in mind. Based on the popular [Cantor](https://github.com/diepala/cantor) keyboard, this keyboard features a stronger, Corne like, column stagger whilst aiming to simplify assembly and improve cost efficiency.
+
+* Keyboard Maintainer: [azhizhinov](https://github.com/azhizhinov)
+* Hardware Supported: Blackpill STM32F401
+* Hardware Availability: https://github.com/azhizhinov/ELCANTORHS
+
+Make example for this keyboard (after setting up your build environment):
+
+    make elcantorhs:default
+
+Flashing example for this keyboard:
+
+    make elcantorhs: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 top left key and plug in the keyboard. For the right side, hold the top right key and plug the keyboard.
+* **Physical reset button**: 
+  * Press and hold the BOOT0 button.
+  * Press and release the NRST button.
+  * Release the BOOT0 button.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/elcantorhs/rules.mk b/keyboards/elcantorhs/rules.mk
new file mode 100644
index 0000000000..c6e2988321
--- /dev/null
+++ b/keyboards/elcantorhs/rules.mk
@@ -0,0 +1 @@
+SERIAL_DRIVER = usart