Merge remote-tracking branch 'origin/master' into develop
QMK Bot
commit
f5b3f12544
|
|
@ -0,0 +1,46 @@
|
|||
// Copyright 2022 Diego Palacios (@diepala)
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "config_common.h"
|
||||
|
||||
/* key matrix size */
|
||||
#define MATRIX_ROWS 8
|
||||
#define MATRIX_COLS 6
|
||||
|
||||
#define DIRECT_PINS {{B1, B10, A8, B15, B14, B13}, \
|
||||
{B9, B8, B5, B4, B3, A15}, \
|
||||
{A3, A4, A5, A6, A7, B0}, \
|
||||
{A2, A1, A0, NO_PIN, NO_PIN, NO_PIN}}
|
||||
#define DIRECT_PINS_RIGHT {{B13, B14, B15, A8, B10, B1}, \
|
||||
{A15, B3, B4, B5, B8, B9}, \
|
||||
{B0, A7, A6, A5, A4, A3}, \
|
||||
{A0, A1, A2, NO_PIN, NO_PIN, NO_PIN}}
|
||||
|
||||
#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
|
||||
|
||||
/* Top left key on left half */
|
||||
#define BOOTMAGIC_LITE_ROW 0
|
||||
#define BOOTMAGIC_LITE_COLUMN 0
|
||||
/* Top right key on right half */
|
||||
#define BOOTMAGIC_LITE_ROW_RIGHT 4
|
||||
#define BOOTMAGIC_LITE_COLUMN_RIGHT 5
|
||||
|
||||
/*
|
||||
* 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
|
||||
|
|
@ -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 <halconf.h>
|
||||
|
|
@ -0,0 +1,70 @@
|
|||
{
|
||||
"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",
|
||||
"url": "https://github.com/diepala/cantor",
|
||||
"usb": {
|
||||
"device_version": "1.0.0",
|
||||
"pid": "0x0000",
|
||||
"vid": "0xFEED"
|
||||
},
|
||||
"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": 3.5, "y": 3.25 },
|
||||
{ "matrix": [3, 1], "x": 4.5, "y": 3.5 },
|
||||
{ "matrix": [3, 2], "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 }
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
// 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│
|
||||
* ├───┼───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┼───┤
|
||||
* │Ctl│ A │ S │ D │ F │ G │ │ H │ J │ K │ L │ ; │ ' │
|
||||
* ├───┼───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┼───┤
|
||||
* │Sft│ Z │ X │ C │ V │ B │ │ N │ M │ , │ . │ / │Sft│
|
||||
* └───┴───┴───┴───┴───┴───┘ └───┴───┴───┴───┴───┴───┘
|
||||
* ┌───┐ ┌───┐
|
||||
* │GUI├───┐ ┌───┤Alt│
|
||||
* └───┤ ├───┐ ┌───┤ ├───┘
|
||||
* └───┤Bsp│ │Ent├───┘
|
||||
* └───┘ └───┘
|
||||
*/
|
||||
[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_LCTL, 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_LGUI, KC_SPC, KC_BSPC, KC_ENT, KC_SPC, KC_RALT
|
||||
)
|
||||
};
|
||||
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
// Copyright 2022 Diego Palacios (@diepala)
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#pragma once
|
||||
|
||||
#include_next <mcuconf.h>
|
||||
|
||||
#undef STM32_SERIAL_USE_USART1
|
||||
#define STM32_SERIAL_USE_USART1 TRUE
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
# cantor
|
||||
|
||||
|
||||
|
||||
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 `RESET` if it is available
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
SPLIT_KEYBOARD = yes
|
||||
SERIAL_DRIVER = usart
|
||||
Loading…
Reference in New Issue