From 667923676dbf53671fdb0d54f4594625c79e311c Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 13:32:57 +0300 Subject: [PATCH 01/39] Initial upload. Initial upload. --- keyboards/elcantorhs/config.h | 24 ++++ keyboards/elcantorhs/halconf.h | 8 ++ keyboards/elcantorhs/info.json | 96 ++++++++++++++++ keyboards/elcantorhs/keymaps/default/keymap.c | 31 +++++ .../elcantorhs/keymaps/zeromist/keymap.c | 107 ++++++++++++++++++ keyboards/elcantorhs/mcuconf.h | 9 ++ keyboards/elcantorhs/readme.md | 30 +++++ keyboards/elcantorhs/rules.mk | 2 + 8 files changed, 307 insertions(+) create mode 100644 keyboards/elcantorhs/config.h create mode 100644 keyboards/elcantorhs/halconf.h create mode 100644 keyboards/elcantorhs/info.json create mode 100644 keyboards/elcantorhs/keymaps/default/keymap.c create mode 100644 keyboards/elcantorhs/keymaps/zeromist/keymap.c create mode 100644 keyboards/elcantorhs/mcuconf.h create mode 100644 keyboards/elcantorhs/readme.md create mode 100644 keyboards/elcantorhs/rules.mk diff --git a/keyboards/elcantorhs/config.h b/keyboards/elcantorhs/config.h new file mode 100644 index 000000000000..0b65007c131a --- /dev/null +++ b/keyboards/elcantorhs/config.h @@ -0,0 +1,24 @@ +// Copyright 2022 Diego Palacios (@diepala) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define SERIAL_USART_FULL_DUPLEX // Enable full duplex operation mode. +#define SERIAL_USART_TX_PIN B6 // USART TX pin +#define SERIAL_USART_RX_PIN B7 // USART RX pin + +/* + * 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 diff --git a/keyboards/elcantorhs/halconf.h b/keyboards/elcantorhs/halconf.h new file mode 100644 index 000000000000..8214c4bc6d51 --- /dev/null +++ b/keyboards/elcantorhs/halconf.h @@ -0,0 +1,8 @@ +// Copyright 2022 Diego Palacios (@diepala) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define HAL_USE_SERIAL TRUE + +#include_next diff --git a/keyboards/elcantorhs/info.json b/keyboards/elcantorhs/info.json new file mode 100644 index 000000000000..3e96f8c35ce7 --- /dev/null +++ b/keyboards/elcantorhs/info.json @@ -0,0 +1,96 @@ +{ + "manufacturer": "Diego Palacios", + "keyboard_name": "cantor", + "maintainer": "diepala", + "bootloader": "stm32-dfu", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "processor": "STM32F401", + "board": "BLACKPILL_STM32_F401", + "url": "https://github.com/diepala/cantor", + "usb": { + "device_version": "1.0.0", + "pid": "0x0000", + "vid": "0xFEED" + }, + "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": { + "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] + ] + } + } + }, + "community_layouts": ["split_3x6_3"], + "layouts": { + "LAYOUT_split_3x6_3": { + "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 000000000000..2c00405e9c82 --- /dev/null +++ b/keyboards/elcantorhs/keymaps/default/keymap.c @@ -0,0 +1,31 @@ +// Copyright 2022 Diego Palacios (@diepala) +// SPDX-License-Identifier: GPL-2.0 + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_split_3x6_3( + 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_split_3x6_3( + 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_split_3x6_3( + 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_split_3x6_3( + 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/zeromist/keymap.c b/keyboards/elcantorhs/keymaps/zeromist/keymap.c new file mode 100644 index 000000000000..993020200b96 --- /dev/null +++ b/keyboards/elcantorhs/keymaps/zeromist/keymap.c @@ -0,0 +1,107 @@ +// Copyright 2022 Diego Palacios (@diepala) +// SPDX-License-Identifier: GPL-2.0 + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┐ + * │Tab│ Q │ W │ E │ R │ T │ │ Y │ U │ I │ O │ P │Bsp│ + * ├───┼───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┼───┤ + * │ESC│ A │ S │ D │ F │ G │ │ H │ J │ K │ L │ ; │ ' │ + * ├───┼───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┼───┤ + * │Sft│ Z │ X │ C │ V │ B │ │ N │ M │ , │ . │ / │Sft│ + * └───┴───┴───┴───┴───┴───┘ └───┴───┴───┴───┴───┴───┘ + * ┌────┐ ┌───┐ + * │LCTL├───────┐ ┌─────┤Alt│ + * └────┤GUI/Bsp├───────┐ ┌───┤TO(1)├───┘ + * └───────┤ALT/ENT│ │SPC├─────┘ + * └───────┘ └───┘ + */ + [0] = LAYOUT_split_3x6_3( + //-------------------------------------------------------------------------- --------------------------------------------------------------------------------- + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + //-------------------------------------------------------------------------- --------------------------------------------------------------------------------- + KC_ESCAPE, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + //-------------------------------------------------------------------------- --------------------------------------------------------------------------------- + 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, MT(MOD_LGUI, KC_BSPC), MT(MOD_LALT, KC_ENT), KC_SPC, TO(1), KC_RALT + //-------------------------------------------------------------------------- --------------------------------------------------------------------------------- + ), + /* + * ┌───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┐ + * │`~ │ 1 │ 2 │ 3 │ 4 │ 5 │ │ 6 │ 7 │ 8 │ 9 │ 0 │Bsp│ + * ├───┼───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┼───┤ + * │ │ ! │ @ │ # │ $ │ % │ │ ^ │ & │ * │ ( │ ) │ | │ + * ├───┼───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┼───┤ + * │Sft│ += │ -_│ + │ { │ } │ │ [ │ ] │ ; │ : │ \ │ │ + * └───┴───┴───┴───┴───┴───┘ └───┴───┴───┴───┴───┴───┘ + * ┌────────┐ ┌─────┐ + * │ MLCKSCN ├─────┐ ┌────┤TO(3)│ + * └────────┤TO(0)├───┐ ┌───┤TO(2)├─────┘ + * └─────┤ < │ │ > ├────┘ + * └───┘ └───┘ + */ + [1] = LAYOUT_split_3x6_3( + //-------------------------------------------------------------- --------------------------------------------------------------------------------- + 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_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, + //-------------------------------------------------------------- --------------------------------------------------------------------------------- + KC_LSFT, KC_EQL, KC_MINS, KC_PLUS, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_SCLN, KC_COLN, KC_BSLS, KC_RSFT, + //-------------------------------------------------------------- --------------------------------------------------------------------------------- + KC_TRNS, TO(0), KC_LT, KC_GT, TO(2), TO(3) + //-------------------------------------------------------------- --------------------------------------------------------------------------------- + ), + /* + * ┌────┬──────┬──────┬──────┬──────────┬──────┐ ┌──────┬──────┬──────┬───────┬──────┬───┐ + * │MSTP│ Play │ PRVS │ Next │ │ CAPS │ │ PgDn │ PgUp │ INS │ Print │ │Bsp│ + * ├────┼──────┼──────┼───────┼─────────┼──────┤ ├──────┼──────┼──────┼───────┼──────┼───┤ + * │ │ HOME │ END │ LCTRL+C │ LCTRL+V │ │ │ Left │ Down │ Up │ Right │ Del │ │ + * ├────┼──────┼──────┼───────┼────────┼──────┤ ├──────┼──────┼──────┼───────┼──────┼───┤ + * │Sft │ UNDO │ CUT │ COPY │ PASTE │ RApp │ │ Vol- │ Vol+ │ Mute │ │ RGui │ │ + * └────┴──────┴──────┴──────┴───────┴──────┘ └──────┴──────┴──────┴───────┴──────┴───┘ + * ┌─────┐ ┌─────┐ + * │LCTRL├─────┐ ┌─────┤TO(3)│ + * └─────┤TO(0)├───┐ ┌───┤TO(0)├─────┘ + * └─────┤ALT│ │SPC├─────┘ + * └───┘ └───┘ + */ + [2] = LAYOUT_split_3x6_3( + //-------------------------------------------------------------- --------------------------------------------------------------------------------- + KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT, KC_NO, KC_CAPS, KC_PGDN, KC_PGUP, KC_INS, KC_PSCR, KC_NO, KC_BSPC, + //-------------------------------------------------------------- --------------------------------------------------------------------------------- + KC_NO, KC_HOME, KC_END, C(KC_C), C(KC_V), KC_NO, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_DEL, KC_NO, + //-------------------------------------------------------------- --------------------------------------------------------------------------------- + KC_TAB, KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_APP, KC_VOLD, KC_VOLU, KC_MUTE, KC_NO, KC_NO, KC_RSFT, + //-------------------------------------------------------------- --------------------------------------------------------------------------------- + KC_LCTL, TO(0), KC_LALT, KC_TRNS, KC_TRNS, TO(3) + //-------------------------------------------------------------- --------------------------------------------------------------------------------- + ), + /* + * ┌──┬────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬─────┬─────┐ + * │ │ F1 │ F2 │ F3 │ F4 │ F5 │ │ F6 │ F7 │ F8 │ F9 │ F10 │ F11 │ + * ├──┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼─────┼─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ F12 │ + * ├──┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼─────┼─────┤ + * │ │ │ │ │ │ │ │ │ │ │ │ │ │ + * └──┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴─────┴─────┘ + * ┌───┐ ┌───┐ + * │ ├─────┐ ┌─────┤ │ + * └───┤TO(0)├───┐ ┌───┤ ├───┘ + * └─────┤ENT│ │ ├─────┘ + * └───┘ └───┘ + */ + [3] = LAYOUT_split_3x6_3( + //-------------------------------------------------------------- --------------------------------------------------------------------------------- + KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, + //-------------------------------------------------------------- --------------------------------------------------------------------------------- + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_F12, + //-------------------------------------------------------------- --------------------------------------------------------------------------------- + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + //-------------------------------------------------------------- --------------------------------------------------------------------------------- + KC_NO, TO(0), KC_NO, KC_NO, KC_NO, KC_NO + //-------------------------------------------------------------- --------------------------------------------------------------------------------- + ) +}; diff --git a/keyboards/elcantorhs/mcuconf.h b/keyboards/elcantorhs/mcuconf.h new file mode 100644 index 000000000000..9274e1b9cabb --- /dev/null +++ b/keyboards/elcantorhs/mcuconf.h @@ -0,0 +1,9 @@ +// Copyright 2022 Diego Palacios (@diepala) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include_next + +#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 000000000000..9a45d7befc7b --- /dev/null +++ b/keyboards/elcantorhs/readme.md @@ -0,0 +1,30 @@ +# cantor + +![cantor](https://i.imgur.com/Uvxm3zVh.jpg) + +The Cantor keyboard is a 42 key diodeless split keyboard, designed with simplicity in mind. It is inspired on the popular [corne](https://github.com/foostan/crkbd), [ferris](https://github.com/pierrechevalier83/ferris) and [sweep](https://github.com/davidphilipbarr/Sweep) keyboards, aiming to provide a more ergonomic (stronger column stagger) corne-like layout with a simple, easy to assemble and cheap design. + +* Keyboard Maintainer: [Diego Palacios](https://github.com/diepala) +* Hardware Supported: Blackpill STM32F401 +* Hardware Availability: https://github.com/diepala/cantor + +Make example for this keyboard (after setting up your build environment): + + make cantor:default + +Flashing example for this keyboard: + + make cantor: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 000000000000..6bd8b9bf770e --- /dev/null +++ b/keyboards/elcantorhs/rules.mk @@ -0,0 +1,2 @@ +SPLIT_KEYBOARD = yes +SERIAL_DRIVER = usart From ea3e1693c34da3b8205ee0fedd2f783821dbeb66 Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 13:38:10 +0300 Subject: [PATCH 02/39] Update readme.md --- keyboards/elcantorhs/readme.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/keyboards/elcantorhs/readme.md b/keyboards/elcantorhs/readme.md index 9a45d7befc7b..0399da7fdd20 100644 --- a/keyboards/elcantorhs/readme.md +++ b/keyboards/elcantorhs/readme.md @@ -1,20 +1,20 @@ # cantor -![cantor](https://i.imgur.com/Uvxm3zVh.jpg) +![El Cantor HS](https://) -The Cantor keyboard is a 42 key diodeless split keyboard, designed with simplicity in mind. It is inspired on the popular [corne](https://github.com/foostan/crkbd), [ferris](https://github.com/pierrechevalier83/ferris) and [sweep](https://github.com/davidphilipbarr/Sweep) keyboards, aiming to provide a more ergonomic (stronger column stagger) corne-like layout with a simple, easy to assemble and cheap design. +The El Cantor HS keyboard is a 43 key diodeless split keyboard, designed with simplicity in mind. It is inspired on the popular [cantor](https://github.com/diepala/cantor), [corne](https://github.com/foostan/crkbd), [ferris](https://github.com/pierrechevalier83/ferris) and [sweep](https://github.com/davidphilipbarr/Sweep) keyboards, aiming to provide a more ergonomic (stronger column stagger) corne-like layout with a simple, easy to assemble and cheap design. -* Keyboard Maintainer: [Diego Palacios](https://github.com/diepala) +* Keyboard Maintainer: [azhizhinov](https://github.com/azhizhinov) * Hardware Supported: Blackpill STM32F401 * Hardware Availability: https://github.com/diepala/cantor Make example for this keyboard (after setting up your build environment): - make cantor:default + make elcantorhs:default Flashing example for this keyboard: - make cantor:default:flash + 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). From fd88601ce3894f8d273603aa9c7d907848f58e54 Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 14:44:46 +0300 Subject: [PATCH 03/39] Delete keyboards/elcantorhs/keymaps/zeromist directory --- .../elcantorhs/keymaps/zeromist/keymap.c | 107 ------------------ 1 file changed, 107 deletions(-) delete mode 100644 keyboards/elcantorhs/keymaps/zeromist/keymap.c diff --git a/keyboards/elcantorhs/keymaps/zeromist/keymap.c b/keyboards/elcantorhs/keymaps/zeromist/keymap.c deleted file mode 100644 index 993020200b96..000000000000 --- a/keyboards/elcantorhs/keymaps/zeromist/keymap.c +++ /dev/null @@ -1,107 +0,0 @@ -// Copyright 2022 Diego Palacios (@diepala) -// SPDX-License-Identifier: GPL-2.0 - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* - * ┌───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┐ - * │Tab│ Q │ W │ E │ R │ T │ │ Y │ U │ I │ O │ P │Bsp│ - * ├───┼───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┼───┤ - * │ESC│ A │ S │ D │ F │ G │ │ H │ J │ K │ L │ ; │ ' │ - * ├───┼───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┼───┤ - * │Sft│ Z │ X │ C │ V │ B │ │ N │ M │ , │ . │ / │Sft│ - * └───┴───┴───┴───┴───┴───┘ └───┴───┴───┴───┴───┴───┘ - * ┌────┐ ┌───┐ - * │LCTL├───────┐ ┌─────┤Alt│ - * └────┤GUI/Bsp├───────┐ ┌───┤TO(1)├───┘ - * └───────┤ALT/ENT│ │SPC├─────┘ - * └───────┘ └───┘ - */ - [0] = LAYOUT_split_3x6_3( - //-------------------------------------------------------------------------- --------------------------------------------------------------------------------- - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - //-------------------------------------------------------------------------- --------------------------------------------------------------------------------- - KC_ESCAPE, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - //-------------------------------------------------------------------------- --------------------------------------------------------------------------------- - 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, MT(MOD_LGUI, KC_BSPC), MT(MOD_LALT, KC_ENT), KC_SPC, TO(1), KC_RALT - //-------------------------------------------------------------------------- --------------------------------------------------------------------------------- - ), - /* - * ┌───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┐ - * │`~ │ 1 │ 2 │ 3 │ 4 │ 5 │ │ 6 │ 7 │ 8 │ 9 │ 0 │Bsp│ - * ├───┼───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┼───┤ - * │ │ ! │ @ │ # │ $ │ % │ │ ^ │ & │ * │ ( │ ) │ | │ - * ├───┼───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┼───┤ - * │Sft│ += │ -_│ + │ { │ } │ │ [ │ ] │ ; │ : │ \ │ │ - * └───┴───┴───┴───┴───┴───┘ └───┴───┴───┴───┴───┴───┘ - * ┌────────┐ ┌─────┐ - * │ MLCKSCN ├─────┐ ┌────┤TO(3)│ - * └────────┤TO(0)├───┐ ┌───┤TO(2)├─────┘ - * └─────┤ < │ │ > ├────┘ - * └───┘ └───┘ - */ - [1] = LAYOUT_split_3x6_3( - //-------------------------------------------------------------- --------------------------------------------------------------------------------- - 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_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, - //-------------------------------------------------------------- --------------------------------------------------------------------------------- - KC_LSFT, KC_EQL, KC_MINS, KC_PLUS, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_SCLN, KC_COLN, KC_BSLS, KC_RSFT, - //-------------------------------------------------------------- --------------------------------------------------------------------------------- - KC_TRNS, TO(0), KC_LT, KC_GT, TO(2), TO(3) - //-------------------------------------------------------------- --------------------------------------------------------------------------------- - ), - /* - * ┌────┬──────┬──────┬──────┬──────────┬──────┐ ┌──────┬──────┬──────┬───────┬──────┬───┐ - * │MSTP│ Play │ PRVS │ Next │ │ CAPS │ │ PgDn │ PgUp │ INS │ Print │ │Bsp│ - * ├────┼──────┼──────┼───────┼─────────┼──────┤ ├──────┼──────┼──────┼───────┼──────┼───┤ - * │ │ HOME │ END │ LCTRL+C │ LCTRL+V │ │ │ Left │ Down │ Up │ Right │ Del │ │ - * ├────┼──────┼──────┼───────┼────────┼──────┤ ├──────┼──────┼──────┼───────┼──────┼───┤ - * │Sft │ UNDO │ CUT │ COPY │ PASTE │ RApp │ │ Vol- │ Vol+ │ Mute │ │ RGui │ │ - * └────┴──────┴──────┴──────┴───────┴──────┘ └──────┴──────┴──────┴───────┴──────┴───┘ - * ┌─────┐ ┌─────┐ - * │LCTRL├─────┐ ┌─────┤TO(3)│ - * └─────┤TO(0)├───┐ ┌───┤TO(0)├─────┘ - * └─────┤ALT│ │SPC├─────┘ - * └───┘ └───┘ - */ - [2] = LAYOUT_split_3x6_3( - //-------------------------------------------------------------- --------------------------------------------------------------------------------- - KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT, KC_NO, KC_CAPS, KC_PGDN, KC_PGUP, KC_INS, KC_PSCR, KC_NO, KC_BSPC, - //-------------------------------------------------------------- --------------------------------------------------------------------------------- - KC_NO, KC_HOME, KC_END, C(KC_C), C(KC_V), KC_NO, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_DEL, KC_NO, - //-------------------------------------------------------------- --------------------------------------------------------------------------------- - KC_TAB, KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_APP, KC_VOLD, KC_VOLU, KC_MUTE, KC_NO, KC_NO, KC_RSFT, - //-------------------------------------------------------------- --------------------------------------------------------------------------------- - KC_LCTL, TO(0), KC_LALT, KC_TRNS, KC_TRNS, TO(3) - //-------------------------------------------------------------- --------------------------------------------------------------------------------- - ), - /* - * ┌──┬────┬────┬────┬────┬────┐ ┌────┬────┬────┬────┬─────┬─────┐ - * │ │ F1 │ F2 │ F3 │ F4 │ F5 │ │ F6 │ F7 │ F8 │ F9 │ F10 │ F11 │ - * ├──┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼─────┼─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ F12 │ - * ├──┼────┼────┼────┼────┼────┤ ├────┼────┼────┼────┼─────┼─────┤ - * │ │ │ │ │ │ │ │ │ │ │ │ │ │ - * └──┴────┴────┴────┴────┴────┘ └────┴────┴────┴────┴─────┴─────┘ - * ┌───┐ ┌───┐ - * │ ├─────┐ ┌─────┤ │ - * └───┤TO(0)├───┐ ┌───┤ ├───┘ - * └─────┤ENT│ │ ├─────┘ - * └───┘ └───┘ - */ - [3] = LAYOUT_split_3x6_3( - //-------------------------------------------------------------- --------------------------------------------------------------------------------- - KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, - //-------------------------------------------------------------- --------------------------------------------------------------------------------- - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_F12, - //-------------------------------------------------------------- --------------------------------------------------------------------------------- - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - //-------------------------------------------------------------- --------------------------------------------------------------------------------- - KC_NO, TO(0), KC_NO, KC_NO, KC_NO, KC_NO - //-------------------------------------------------------------- --------------------------------------------------------------------------------- - ) -}; From 6fdc789f9dd4f5af108d7b45dd65ef96066e6fce Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 14:47:32 +0300 Subject: [PATCH 04/39] Adding folder for VIA. --- keyboards/elcantorhs/keymaps/via/rules.mk | 1 + 1 file changed, 1 insertion(+) create mode 100644 keyboards/elcantorhs/keymaps/via/rules.mk diff --git a/keyboards/elcantorhs/keymaps/via/rules.mk b/keyboards/elcantorhs/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/elcantorhs/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes From 805c3e1148f3d0209a27aeb75026e99ea7f87b1e Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 14:48:41 +0300 Subject: [PATCH 05/39] Update readme.md --- keyboards/elcantorhs/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/elcantorhs/readme.md b/keyboards/elcantorhs/readme.md index 0399da7fdd20..33ce989e86bc 100644 --- a/keyboards/elcantorhs/readme.md +++ b/keyboards/elcantorhs/readme.md @@ -1,4 +1,4 @@ -# cantor +# El Cantor HS ![El Cantor HS](https://) From 0228367c845bb7dfc8b29257aeb3683677916c04 Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 14:50:02 +0300 Subject: [PATCH 06/39] Update readme.md --- keyboards/elcantorhs/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/elcantorhs/readme.md b/keyboards/elcantorhs/readme.md index 33ce989e86bc..e60a01a3230f 100644 --- a/keyboards/elcantorhs/readme.md +++ b/keyboards/elcantorhs/readme.md @@ -1,6 +1,6 @@ # El Cantor HS -![El Cantor HS](https://) +![El Cantor HS](https://github.com/azhizhinov/ELCANTORHS/blob/main/Pictures/20231122.AZHIZHINOV.ELCANTORHS.00.png) The El Cantor HS keyboard is a 43 key diodeless split keyboard, designed with simplicity in mind. It is inspired on the popular [cantor](https://github.com/diepala/cantor), [corne](https://github.com/foostan/crkbd), [ferris](https://github.com/pierrechevalier83/ferris) and [sweep](https://github.com/davidphilipbarr/Sweep) keyboards, aiming to provide a more ergonomic (stronger column stagger) corne-like layout with a simple, easy to assemble and cheap design. From 9a9be3342e0046172bacd25336a9ee1ffa4591da Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 14:51:33 +0300 Subject: [PATCH 07/39] Update readme.md --- keyboards/elcantorhs/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/elcantorhs/readme.md b/keyboards/elcantorhs/readme.md index e60a01a3230f..48cad1b8b558 100644 --- a/keyboards/elcantorhs/readme.md +++ b/keyboards/elcantorhs/readme.md @@ -2,7 +2,7 @@ ![El Cantor HS](https://github.com/azhizhinov/ELCANTORHS/blob/main/Pictures/20231122.AZHIZHINOV.ELCANTORHS.00.png) -The El Cantor HS keyboard is a 43 key diodeless split keyboard, designed with simplicity in mind. It is inspired on the popular [cantor](https://github.com/diepala/cantor), [corne](https://github.com/foostan/crkbd), [ferris](https://github.com/pierrechevalier83/ferris) and [sweep](https://github.com/davidphilipbarr/Sweep) keyboards, aiming to provide a more ergonomic (stronger column stagger) corne-like layout with a simple, easy to assemble and cheap design. +The El Cantor HS keyboard is a 43 key diodeless split keyboard with support for hotswap sockets, designed with simplicity in mind. It is inspired on the popular [cantor](https://github.com/diepala/cantor), [corne](https://github.com/foostan/crkbd), [ferris](https://github.com/pierrechevalier83/ferris) and [sweep](https://github.com/davidphilipbarr/Sweep) keyboards, aiming to provide a more ergonomic (stronger column stagger) corne-like layout with a simple, easy to assemble and cheap design. * Keyboard Maintainer: [azhizhinov](https://github.com/azhizhinov) * Hardware Supported: Blackpill STM32F401 From 1eba38cf0759a04d0c19b39b9b6451118e628123 Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 14:52:58 +0300 Subject: [PATCH 08/39] Update readme.md --- keyboards/elcantorhs/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/elcantorhs/readme.md b/keyboards/elcantorhs/readme.md index 48cad1b8b558..1b041534c4e7 100644 --- a/keyboards/elcantorhs/readme.md +++ b/keyboards/elcantorhs/readme.md @@ -2,7 +2,7 @@ ![El Cantor HS](https://github.com/azhizhinov/ELCANTORHS/blob/main/Pictures/20231122.AZHIZHINOV.ELCANTORHS.00.png) -The El Cantor HS keyboard is a 43 key diodeless split keyboard with support for hotswap sockets, designed with simplicity in mind. It is inspired on the popular [cantor](https://github.com/diepala/cantor), [corne](https://github.com/foostan/crkbd), [ferris](https://github.com/pierrechevalier83/ferris) and [sweep](https://github.com/davidphilipbarr/Sweep) keyboards, aiming to provide a more ergonomic (stronger column stagger) corne-like layout with a simple, easy to assemble and cheap design. +The El Cantor HS keyboard is a 43 key diodeless split keyboard with support for hotswap sockets, designed with simplicity in mind. It is based on the popular [cantor](https://github.com/diepala/cantor), wich is inspired on the popular [corne](https://github.com/foostan/crkbd), [ferris](https://github.com/pierrechevalier83/ferris) and [sweep](https://github.com/davidphilipbarr/Sweep) keyboards, aiming to provide a more ergonomic (stronger column stagger) corne-like layout with a simple, easy to assemble and cheap design. * Keyboard Maintainer: [azhizhinov](https://github.com/azhizhinov) * Hardware Supported: Blackpill STM32F401 From 5fb1ddb101ccfe9e479a5e2a38045adc464d76bf Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 14:57:47 +0300 Subject: [PATCH 09/39] Update readme.md --- keyboards/elcantorhs/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/elcantorhs/readme.md b/keyboards/elcantorhs/readme.md index 1b041534c4e7..a99057f3e4e2 100644 --- a/keyboards/elcantorhs/readme.md +++ b/keyboards/elcantorhs/readme.md @@ -2,7 +2,7 @@ ![El Cantor HS](https://github.com/azhizhinov/ELCANTORHS/blob/main/Pictures/20231122.AZHIZHINOV.ELCANTORHS.00.png) -The El Cantor HS keyboard is a 43 key diodeless split keyboard with support for hotswap sockets, designed with simplicity in mind. It is based on the popular [cantor](https://github.com/diepala/cantor), wich is inspired on the popular [corne](https://github.com/foostan/crkbd), [ferris](https://github.com/pierrechevalier83/ferris) and [sweep](https://github.com/davidphilipbarr/Sweep) keyboards, aiming to provide a more ergonomic (stronger column stagger) corne-like layout with a simple, easy to assemble and cheap design. +The El Cantor HS keyboard is a 43 key diodeless split keyboard with support for hotswap sockets, designed with simplicity in mind. It is based on the popular [cantor](https://github.com/diepala/cantor), which is inspired on the popular [corne](https://github.com/foostan/crkbd), [ferris](https://github.com/pierrechevalier83/ferris) and [sweep](https://github.com/davidphilipbarr/Sweep) keyboards, aiming to provide a more ergonomic (stronger column stagger) corne-like layout with a simple, easy to assemble and cheap design. * Keyboard Maintainer: [azhizhinov](https://github.com/azhizhinov) * Hardware Supported: Blackpill STM32F401 From f9516b1d0d3510e4dc21a3aae49019e8888cb2eb Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 15:14:59 +0300 Subject: [PATCH 10/39] Update keymap.c --- keyboards/elcantorhs/keymaps/default/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/elcantorhs/keymaps/default/keymap.c b/keyboards/elcantorhs/keymaps/default/keymap.c index 2c00405e9c82..e6afa6038ae0 100644 --- a/keyboards/elcantorhs/keymaps/default/keymap.c +++ b/keyboards/elcantorhs/keymaps/default/keymap.c @@ -4,25 +4,25 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_split_3x6_3( + [0] = LAYOUT_split_3x6_4( 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_split_3x6_3( + [1] = LAYOUT_split_3x6_4( 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_split_3x6_3( + [2] = LAYOUT_split_3x6_4( 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_split_3x6_3( + [3] = LAYOUT_split_3x6_4( 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, From cbef8fe8be60ff9fd72941f5dd25963caf1cab5f Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 15:21:15 +0300 Subject: [PATCH 11/39] Update info.json --- keyboards/elcantorhs/info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/elcantorhs/info.json b/keyboards/elcantorhs/info.json index 3e96f8c35ce7..6fb47f461c93 100644 --- a/keyboards/elcantorhs/info.json +++ b/keyboards/elcantorhs/info.json @@ -1,7 +1,7 @@ { - "manufacturer": "Diego Palacios", - "keyboard_name": "cantor", - "maintainer": "diepala", + "manufacturer": "azhizhinov", + "keyboard_name": "elcantorhs", + "maintainer": "azhizhinov", "bootloader": "stm32-dfu", "features": { "bootmagic": true, From c9b13afd5d8c2d0ae01f14f31e87fa951057135c Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 15:22:56 +0300 Subject: [PATCH 12/39] Update info.json --- keyboards/elcantorhs/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/elcantorhs/info.json b/keyboards/elcantorhs/info.json index 6fb47f461c93..1f075235d5b1 100644 --- a/keyboards/elcantorhs/info.json +++ b/keyboards/elcantorhs/info.json @@ -42,7 +42,7 @@ } } }, - "community_layouts": ["split_3x6_3"], + "community_layouts": ["split_3x6_4"], "layouts": { "LAYOUT_split_3x6_3": { "layout": [ From 185e28a5dbe6f5d50ee3ee0f9f5d5470cd3bbe06 Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 15:41:52 +0300 Subject: [PATCH 13/39] Update info.json --- keyboards/elcantorhs/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/elcantorhs/info.json b/keyboards/elcantorhs/info.json index 1f075235d5b1..f456a6f95f3a 100644 --- a/keyboards/elcantorhs/info.json +++ b/keyboards/elcantorhs/info.json @@ -44,7 +44,7 @@ }, "community_layouts": ["split_3x6_4"], "layouts": { - "LAYOUT_split_3x6_3": { + "LAYOUT_split_3x6_4": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0.25}, {"matrix": [0, 1], "x": 1, "y": 0.25}, From 6792458d5a60048d0af5f3de89e9186db262793f Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 15:45:37 +0300 Subject: [PATCH 14/39] Update info.json --- keyboards/elcantorhs/info.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/elcantorhs/info.json b/keyboards/elcantorhs/info.json index f456a6f95f3a..8fb0387156a0 100644 --- a/keyboards/elcantorhs/info.json +++ b/keyboards/elcantorhs/info.json @@ -42,9 +42,8 @@ } } }, - "community_layouts": ["split_3x6_4"], "layouts": { - "LAYOUT_split_3x6_4": { + "LAYOUT": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0.25}, {"matrix": [0, 1], "x": 1, "y": 0.25}, From c2232dbd9587441bdb4c41480da8701f68e6f273 Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 15:46:21 +0300 Subject: [PATCH 15/39] Update keymap.c --- keyboards/elcantorhs/keymaps/default/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/elcantorhs/keymaps/default/keymap.c b/keyboards/elcantorhs/keymaps/default/keymap.c index e6afa6038ae0..9bf079e6afbb 100644 --- a/keyboards/elcantorhs/keymaps/default/keymap.c +++ b/keyboards/elcantorhs/keymaps/default/keymap.c @@ -4,25 +4,25 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_split_3x6_4( + [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_split_3x6_4( + [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_split_3x6_4( + [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_split_3x6_4( + [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, From 080b2f064223f633cb714d899b3290cebe93a1c2 Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 17:04:49 +0300 Subject: [PATCH 16/39] Update keymap.c --- keyboards/elcantorhs/keymaps/default/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/elcantorhs/keymaps/default/keymap.c b/keyboards/elcantorhs/keymaps/default/keymap.c index 9bf079e6afbb..4d350bd5de4e 100644 --- a/keyboards/elcantorhs/keymaps/default/keymap.c +++ b/keyboards/elcantorhs/keymaps/default/keymap.c @@ -1,5 +1,5 @@ -// Copyright 2022 Diego Palacios (@diepala) -// SPDX-License-Identifier: GPL-2.0 +// Copyright 2023 azhizhinov (@azhizhinov) +// SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H From 4834cf2e7b7be42ba2c6e4a42352f0526108aa6d Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 18:30:07 +0300 Subject: [PATCH 17/39] Update keymap.c --- keyboards/elcantorhs/keymaps/default/keymap.c | 72 +++++++++++-------- 1 file changed, 41 insertions(+), 31 deletions(-) diff --git a/keyboards/elcantorhs/keymaps/default/keymap.c b/keyboards/elcantorhs/keymaps/default/keymap.c index 4d350bd5de4e..9078d73c81e8 100644 --- a/keyboards/elcantorhs/keymaps/default/keymap.c +++ b/keyboards/elcantorhs/keymaps/default/keymap.c @@ -1,31 +1,41 @@ -// Copyright 2023 azhizhinov (@azhizhinov) -// SPDX-License-Identifier: GPL-2.0-or-later - -#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) - ) -}; +/* +Copyright 2023 azhizhinov (@azhizhinov) +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 . +*/ +#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) + ) +}; From 6f9bbec407946dcfa6d6149c46b9a94328716b6a Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 18:31:08 +0300 Subject: [PATCH 18/39] Update config.h --- keyboards/elcantorhs/config.h | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/keyboards/elcantorhs/config.h b/keyboards/elcantorhs/config.h index 0b65007c131a..fad5de710bc1 100644 --- a/keyboards/elcantorhs/config.h +++ b/keyboards/elcantorhs/config.h @@ -1,6 +1,16 @@ -// Copyright 2022 Diego Palacios (@diepala) -// SPDX-License-Identifier: GPL-2.0-or-later - +/* +Copyright 2023 azhizhinov (@azhizhinov) +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 . +*/ #pragma once #define SERIAL_USART_FULL_DUPLEX // Enable full duplex operation mode. From a7b6dc8feb447a8e9d1ef321d64f09300f0b0bb2 Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 18:31:29 +0300 Subject: [PATCH 19/39] Update halconf.h --- keyboards/elcantorhs/halconf.h | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/keyboards/elcantorhs/halconf.h b/keyboards/elcantorhs/halconf.h index 8214c4bc6d51..de9c370b1a0c 100644 --- a/keyboards/elcantorhs/halconf.h +++ b/keyboards/elcantorhs/halconf.h @@ -1,6 +1,16 @@ -// Copyright 2022 Diego Palacios (@diepala) -// SPDX-License-Identifier: GPL-2.0-or-later - +/* +Copyright 2023 azhizhinov (@azhizhinov) +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 . +*/ #pragma once #define HAL_USE_SERIAL TRUE From 5b231bf38dd657def2447d7e1d8912517e49ec23 Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 18:32:13 +0300 Subject: [PATCH 20/39] Update mcuconf.h --- keyboards/elcantorhs/mcuconf.h | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/keyboards/elcantorhs/mcuconf.h b/keyboards/elcantorhs/mcuconf.h index 9274e1b9cabb..ab795a45094c 100644 --- a/keyboards/elcantorhs/mcuconf.h +++ b/keyboards/elcantorhs/mcuconf.h @@ -1,6 +1,16 @@ -// Copyright 2022 Diego Palacios (@diepala) -// SPDX-License-Identifier: GPL-2.0-or-later - +/* +Copyright 2023 azhizhinov (@azhizhinov) +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 . +*/ #pragma once #include_next From 70f88babec83eb1a504c8b45f497ed07d0ea6d5a Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 18:40:34 +0300 Subject: [PATCH 21/39] Create keymap.c --- keyboards/elcantorhs/keymaps/via/keymap.c | 41 +++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 keyboards/elcantorhs/keymaps/via/keymap.c diff --git a/keyboards/elcantorhs/keymaps/via/keymap.c b/keyboards/elcantorhs/keymaps/via/keymap.c new file mode 100644 index 000000000000..9078d73c81e8 --- /dev/null +++ b/keyboards/elcantorhs/keymaps/via/keymap.c @@ -0,0 +1,41 @@ +/* +Copyright 2023 azhizhinov (@azhizhinov) +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 . +*/ +#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) + ) +}; From 45dd419c1a667313888ec539da258592d746c480 Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 19:01:13 +0300 Subject: [PATCH 22/39] Update info.json --- keyboards/elcantorhs/info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/elcantorhs/info.json b/keyboards/elcantorhs/info.json index 8fb0387156a0..afef61f763af 100644 --- a/keyboards/elcantorhs/info.json +++ b/keyboards/elcantorhs/info.json @@ -1,6 +1,6 @@ { "manufacturer": "azhizhinov", - "keyboard_name": "elcantorhs", + "keyboard_name": "EL-CANTOR-HS", "maintainer": "azhizhinov", "bootloader": "stm32-dfu", "features": { @@ -16,8 +16,8 @@ "url": "https://github.com/diepala/cantor", "usb": { "device_version": "1.0.0", - "pid": "0x0000", - "vid": "0xFEED" + "pid": "0x0001", + "vid": "0x415A" }, "matrix_pins": { "direct": [ From 396cf4c049a2b90179d535d307ddfa2b5c4ba620 Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 21:13:51 +0300 Subject: [PATCH 23/39] Update keyboards/elcantorhs/readme.md Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/elcantorhs/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/elcantorhs/readme.md b/keyboards/elcantorhs/readme.md index a99057f3e4e2..ba064f40ee88 100644 --- a/keyboards/elcantorhs/readme.md +++ b/keyboards/elcantorhs/readme.md @@ -6,7 +6,7 @@ The El Cantor HS keyboard is a 43 key diodeless split keyboard with support for * Keyboard Maintainer: [azhizhinov](https://github.com/azhizhinov) * Hardware Supported: Blackpill STM32F401 -* Hardware Availability: https://github.com/diepala/cantor +* Hardware Availability: https://github.com/azhizhinov/ELCANTORHS Make example for this keyboard (after setting up your build environment): From acd9f67363959f946666e8dd2f8bb6943da2145a Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 21:14:25 +0300 Subject: [PATCH 24/39] Update keyboards/elcantorhs/info.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/elcantorhs/info.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/elcantorhs/info.json b/keyboards/elcantorhs/info.json index afef61f763af..bb6f0304a5c5 100644 --- a/keyboards/elcantorhs/info.json +++ b/keyboards/elcantorhs/info.json @@ -11,8 +11,7 @@ "mousekey": true, "nkro": true }, - "processor": "STM32F401", - "board": "BLACKPILL_STM32_F401", + "development_board": "blackpill_f401", "url": "https://github.com/diepala/cantor", "usb": { "device_version": "1.0.0", From 1c1681bdd06b7dc2987215f67edba3a79292bc25 Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 21:14:38 +0300 Subject: [PATCH 25/39] Update keyboards/elcantorhs/info.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/elcantorhs/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/elcantorhs/info.json b/keyboards/elcantorhs/info.json index bb6f0304a5c5..84367a294e7d 100644 --- a/keyboards/elcantorhs/info.json +++ b/keyboards/elcantorhs/info.json @@ -12,7 +12,7 @@ "nkro": true }, "development_board": "blackpill_f401", - "url": "https://github.com/diepala/cantor", + "url": "https://github.com/azhizhinov/ELCANTORHS", "usb": { "device_version": "1.0.0", "pid": "0x0001", From d4bb68670588e185a1fb4d9836bdc755a6492a52 Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 21:15:01 +0300 Subject: [PATCH 26/39] Update keyboards/elcantorhs/info.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/elcantorhs/info.json | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/elcantorhs/info.json b/keyboards/elcantorhs/info.json index 84367a294e7d..213281b4a3f3 100644 --- a/keyboards/elcantorhs/info.json +++ b/keyboards/elcantorhs/info.json @@ -27,6 +27,7 @@ ] }, "split": { + "enabled": true, "bootmagic": { "matrix": [4, 5] }, From 4d53a9990e41057f5f053ae172b1029775ff30fa Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 21:15:16 +0300 Subject: [PATCH 27/39] Update keyboards/elcantorhs/rules.mk Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/elcantorhs/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/elcantorhs/rules.mk b/keyboards/elcantorhs/rules.mk index 6bd8b9bf770e..c6e298832137 100644 --- a/keyboards/elcantorhs/rules.mk +++ b/keyboards/elcantorhs/rules.mk @@ -1,2 +1 @@ -SPLIT_KEYBOARD = yes SERIAL_DRIVER = usart From ed3bd55ad355c309a4ec27c257b3106932291d47 Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 21:15:24 +0300 Subject: [PATCH 28/39] Update keyboards/elcantorhs/info.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/elcantorhs/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/elcantorhs/info.json b/keyboards/elcantorhs/info.json index 213281b4a3f3..606fb08ee5af 100644 --- a/keyboards/elcantorhs/info.json +++ b/keyboards/elcantorhs/info.json @@ -2,7 +2,6 @@ "manufacturer": "azhizhinov", "keyboard_name": "EL-CANTOR-HS", "maintainer": "azhizhinov", - "bootloader": "stm32-dfu", "features": { "bootmagic": true, "command": false, From 4802011dfa16354fbd546220a46f0fdd688b9f7c Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 21:15:48 +0300 Subject: [PATCH 29/39] Update keyboards/elcantorhs/config.h Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/elcantorhs/config.h | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/keyboards/elcantorhs/config.h b/keyboards/elcantorhs/config.h index fad5de710bc1..f75371ee230e 100644 --- a/keyboards/elcantorhs/config.h +++ b/keyboards/elcantorhs/config.h @@ -16,19 +16,3 @@ along with this program. If not, see . #define SERIAL_USART_FULL_DUPLEX // Enable full duplex operation mode. #define SERIAL_USART_TX_PIN B6 // USART TX pin #define SERIAL_USART_RX_PIN B7 // USART RX pin - -/* - * 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 From 687242b3b4b9e3b62c520eebff22c54a4da2f725 Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 21:22:24 +0300 Subject: [PATCH 30/39] Update readme.md --- keyboards/elcantorhs/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/elcantorhs/readme.md b/keyboards/elcantorhs/readme.md index ba064f40ee88..429e26543dee 100644 --- a/keyboards/elcantorhs/readme.md +++ b/keyboards/elcantorhs/readme.md @@ -1,6 +1,6 @@ # El Cantor HS -![El Cantor HS](https://github.com/azhizhinov/ELCANTORHS/blob/main/Pictures/20231122.AZHIZHINOV.ELCANTORHS.00.png) +![El Cantor HS](https://thumb.cloud.mail.ru/weblink/thumb/xw1/VtFZ/jwSN7r6BB) The El Cantor HS keyboard is a 43 key diodeless split keyboard with support for hotswap sockets, designed with simplicity in mind. It is based on the popular [cantor](https://github.com/diepala/cantor), which is inspired on the popular [corne](https://github.com/foostan/crkbd), [ferris](https://github.com/pierrechevalier83/ferris) and [sweep](https://github.com/davidphilipbarr/Sweep) keyboards, aiming to provide a more ergonomic (stronger column stagger) corne-like layout with a simple, easy to assemble and cheap design. From 51751b18ff5017ae51a9b996882121d6a41910c8 Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 21:23:10 +0300 Subject: [PATCH 31/39] Update keyboards/elcantorhs/info.json Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/elcantorhs/info.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/elcantorhs/info.json b/keyboards/elcantorhs/info.json index 606fb08ee5af..7905a1233a02 100644 --- a/keyboards/elcantorhs/info.json +++ b/keyboards/elcantorhs/info.json @@ -4,8 +4,6 @@ "maintainer": "azhizhinov", "features": { "bootmagic": true, - "command": false, - "console": false, "extrakey": true, "mousekey": true, "nkro": true From 03ac7e004e298fa309fc537d8c89ec63daf830cd Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 21:28:21 +0300 Subject: [PATCH 32/39] Update config.h --- keyboards/elcantorhs/config.h | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/keyboards/elcantorhs/config.h b/keyboards/elcantorhs/config.h index f75371ee230e..62895fe49fe2 100644 --- a/keyboards/elcantorhs/config.h +++ b/keyboards/elcantorhs/config.h @@ -1,16 +1,6 @@ -/* -Copyright 2023 azhizhinov (@azhizhinov) -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 . -*/ +// Copyright 2021 azhizhinov (@azhizhinov) +// SPDX-License-Identifier: GPL-2.0-or-later + #pragma once #define SERIAL_USART_FULL_DUPLEX // Enable full duplex operation mode. From 7b8a11cf73774bebd6cd5a2227fd2574958d03b6 Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 21:30:49 +0300 Subject: [PATCH 33/39] Update halconf.h --- keyboards/elcantorhs/halconf.h | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/keyboards/elcantorhs/halconf.h b/keyboards/elcantorhs/halconf.h index de9c370b1a0c..12ebaa809802 100644 --- a/keyboards/elcantorhs/halconf.h +++ b/keyboards/elcantorhs/halconf.h @@ -1,16 +1,6 @@ -/* -Copyright 2023 azhizhinov (@azhizhinov) -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 . -*/ +// Copyright 2021 azhizhinov (@azhizhinov) +// SPDX-License-Identifier: GPL-2.0-or-later + #pragma once #define HAL_USE_SERIAL TRUE From c5a9e3ac40a14018e8ea6cae9e4c965f908b2274 Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 21:31:25 +0300 Subject: [PATCH 34/39] Update keymap.c --- keyboards/elcantorhs/keymaps/default/keymap.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/keyboards/elcantorhs/keymaps/default/keymap.c b/keyboards/elcantorhs/keymaps/default/keymap.c index 9078d73c81e8..49d5e4d178ea 100644 --- a/keyboards/elcantorhs/keymaps/default/keymap.c +++ b/keyboards/elcantorhs/keymaps/default/keymap.c @@ -1,16 +1,5 @@ -/* -Copyright 2023 azhizhinov (@azhizhinov) -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 . -*/ +// 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] = { From b846d72db026b2e20a0b526dace0349763bd8e38 Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 21:31:52 +0300 Subject: [PATCH 35/39] Update keymap.c --- keyboards/elcantorhs/keymaps/via/keymap.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/keyboards/elcantorhs/keymaps/via/keymap.c b/keyboards/elcantorhs/keymaps/via/keymap.c index 9078d73c81e8..49d5e4d178ea 100644 --- a/keyboards/elcantorhs/keymaps/via/keymap.c +++ b/keyboards/elcantorhs/keymaps/via/keymap.c @@ -1,16 +1,5 @@ -/* -Copyright 2023 azhizhinov (@azhizhinov) -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 . -*/ +// 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] = { From 0793b50afb0087dbc473e787dfe567f82e6ad2da Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 22 Nov 2023 21:32:25 +0300 Subject: [PATCH 36/39] Update mcuconf.h --- keyboards/elcantorhs/mcuconf.h | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/keyboards/elcantorhs/mcuconf.h b/keyboards/elcantorhs/mcuconf.h index ab795a45094c..c56b76d8ddb9 100644 --- a/keyboards/elcantorhs/mcuconf.h +++ b/keyboards/elcantorhs/mcuconf.h @@ -1,16 +1,5 @@ -/* -Copyright 2023 azhizhinov (@azhizhinov) -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 . -*/ +// Copyright 2021 azhizhinov (@azhizhinov) +// SPDX-License-Identifier: GPL-2.0-or-late #pragma once #include_next From 64f5b02c7943bd944544c9a3b3e1c51d5eb10960 Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Thu, 23 Nov 2023 13:47:49 +0300 Subject: [PATCH 37/39] Update keyboards/elcantorhs/readme.md Yep. Can't say better. :-) Co-authored-by: Duncan Sutherland --- keyboards/elcantorhs/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/elcantorhs/readme.md b/keyboards/elcantorhs/readme.md index 429e26543dee..b0cf18816127 100644 --- a/keyboards/elcantorhs/readme.md +++ b/keyboards/elcantorhs/readme.md @@ -2,7 +2,7 @@ ![El Cantor HS](https://thumb.cloud.mail.ru/weblink/thumb/xw1/VtFZ/jwSN7r6BB) -The El Cantor HS keyboard is a 43 key diodeless split keyboard with support for hotswap sockets, designed with simplicity in mind. It is based on the popular [cantor](https://github.com/diepala/cantor), which is inspired on the popular [corne](https://github.com/foostan/crkbd), [ferris](https://github.com/pierrechevalier83/ferris) and [sweep](https://github.com/davidphilipbarr/Sweep) keyboards, aiming to provide a more ergonomic (stronger column stagger) corne-like layout with a simple, easy to assemble and cheap design. +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 From 3b6414390352f130e8cb254add954c42c3ae216e Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Wed, 29 Nov 2023 08:39:07 +0300 Subject: [PATCH 38/39] Update readme.md --- keyboards/elcantorhs/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/elcantorhs/readme.md b/keyboards/elcantorhs/readme.md index b0cf18816127..1fd538805216 100644 --- a/keyboards/elcantorhs/readme.md +++ b/keyboards/elcantorhs/readme.md @@ -1,6 +1,6 @@ # El Cantor HS -![El Cantor HS](https://thumb.cloud.mail.ru/weblink/thumb/xw1/VtFZ/jwSN7r6BB) +![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. From 6e5a6e9863e9adf0f482b6d4fd4d93890c2b322a Mon Sep 17 00:00:00 2001 From: azhizhinov Date: Tue, 12 Dec 2023 09:13:40 +0300 Subject: [PATCH 39/39] Update keyboards/elcantorhs/config.h Co-authored-by: Drashna Jaelre --- keyboards/elcantorhs/config.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/elcantorhs/config.h b/keyboards/elcantorhs/config.h index 62895fe49fe2..ba8ae794c96f 100644 --- a/keyboards/elcantorhs/config.h +++ b/keyboards/elcantorhs/config.h @@ -3,6 +3,6 @@ #pragma once -#define SERIAL_USART_FULL_DUPLEX // Enable full duplex operation mode. -#define SERIAL_USART_TX_PIN B6 // USART TX pin -#define SERIAL_USART_RX_PIN B7 // USART RX pin +#define SERIAL_USART_FULL_DUPLEX +#define SERIAL_USART_TX_PIN B6 +#define SERIAL_USART_RX_PIN B7