Skip to content

Commit f5b3f12

Browse files
qmk-botqmk-bot
committed
Merge remote-tracking branch 'origin/master' into develop
2 parents afdf1c2 + e6071b8 commit f5b3f12

File tree

7 files changed

+193
-0
lines changed

7 files changed

+193
-0
lines changed

‎keyboards/cantor/config.h

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
// Copyright 2022 Diego Palacios (@diepala)
2+
// SPDX-License-Identifier: GPL-2.0-or-later
3+
4+
#pragma once
5+
6+
#include "config_common.h"
7+
8+
/* key matrix size */
9+
#define MATRIX_ROWS 8
10+
#define MATRIX_COLS 6
11+
12+
#define DIRECT_PINS {{B1, B10, A8, B15, B14, B13}, \
13+
{B9, B8, B5, B4, B3, A15}, \
14+
{A3, A4, A5, A6, A7, B0}, \
15+
{A2, A1, A0, NO_PIN, NO_PIN, NO_PIN}}
16+
#define DIRECT_PINS_RIGHT {{B13, B14, B15, A8, B10, B1}, \
17+
{A15, B3, B4, B5, B8, B9}, \
18+
{B0, A7, A6, A5, A4, A3}, \
19+
{A0, A1, A2, NO_PIN, NO_PIN, NO_PIN}}
20+
21+
#define SERIAL_USART_FULL_DUPLEX // Enable full duplex operation mode.
22+
#define SERIAL_USART_TX_PIN B6 // USART TX pin
23+
#define SERIAL_USART_RX_PIN B7 // USART RX pin
24+
25+
/* Top left key on left half */
26+
#define BOOTMAGIC_LITE_ROW 0
27+
#define BOOTMAGIC_LITE_COLUMN 0
28+
/* Top right key on right half */
29+
#define BOOTMAGIC_LITE_ROW_RIGHT 4
30+
#define BOOTMAGIC_LITE_COLUMN_RIGHT 5
31+
32+
/*
33+
* Feature disable options
34+
* These options are also useful to firmware size reduction.
35+
*/
36+
37+
/* disable debug print */
38+
//#define NO_DEBUG
39+
40+
/* disable print */
41+
//#define NO_PRINT
42+
43+
/* disable action features */
44+
//#define NO_ACTION_LAYER
45+
//#define NO_ACTION_TAPPING
46+
//#define NO_ACTION_ONESHOT

‎keyboards/cantor/halconf.h

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// Copyright 2022 Diego Palacios (@diepala)
2+
// SPDX-License-Identifier: GPL-2.0-or-later
3+
4+
#pragma once
5+
6+
#define HAL_USE_SERIAL TRUE
7+
8+
#include_next <halconf.h>

‎keyboards/cantor/info.json

+70
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
{
2+
"manufacturer": "Diego Palacios",
3+
"keyboard_name": "cantor",
4+
"maintainer": "diepala",
5+
"bootloader": "stm32-dfu",
6+
"features": {
7+
"bootmagic": true,
8+
"command": false,
9+
"console": false,
10+
"extrakey": true,
11+
"mousekey": true,
12+
"nkro": true
13+
},
14+
"processor": "STM32F401",
15+
"url": "https://github.com/diepala/cantor",
16+
"usb": {
17+
"device_version": "1.0.0",
18+
"pid": "0x0000",
19+
"vid": "0xFEED"
20+
},
21+
"community_layouts": ["split_3x6_3"],
22+
"layouts": {
23+
"LAYOUT_split_3x6_3": {
24+
"layout": [
25+
{ "matrix": [0, 0], "x": 0, "y": 0.25 },
26+
{ "matrix": [0, 1], "x": 1, "y": 0.25 },
27+
{ "matrix": [0, 2], "x": 2, "y": 0.125 },
28+
{ "matrix": [0, 3], "x": 3, "y": 0 },
29+
{ "matrix": [0, 4], "x": 4, "y": 0.125 },
30+
{ "matrix": [0, 5], "x": 5, "y": 0.25 },
31+
{ "matrix": [4, 0], "x": 8, "y": 0.25 },
32+
{ "matrix": [4, 1], "x": 9, "y": 0.125 },
33+
{ "matrix": [4, 2], "x": 10, "y": 0 },
34+
{ "matrix": [4, 3], "x": 11, "y": 0.125 },
35+
{ "matrix": [4, 4], "x": 12, "y": 0.25 },
36+
{ "matrix": [4, 5], "x": 13, "y": 0.25 },
37+
{ "matrix": [1, 0], "x": 0, "y": 1.25 },
38+
{ "matrix": [1, 1], "x": 1, "y": 1.25 },
39+
{ "matrix": [1, 2], "x": 2, "y": 1.125 },
40+
{ "matrix": [1, 3], "x": 3, "y": 1 },
41+
{ "matrix": [1, 4], "x": 4, "y": 1.125 },
42+
{ "matrix": [1, 5], "x": 5, "y": 1.25 },
43+
{ "matrix": [5, 0], "x": 8, "y": 1.25 },
44+
{ "matrix": [5, 1], "x": 9, "y": 1.125 },
45+
{ "matrix": [5, 2], "x": 10, "y": 1 },
46+
{ "matrix": [5, 3], "x": 11, "y": 1.125 },
47+
{ "matrix": [5, 4], "x": 12, "y": 1.25 },
48+
{ "matrix": [5, 5], "x": 13, "y": 1.25 },
49+
{ "matrix": [2, 0], "x": 0, "y": 2.25 },
50+
{ "matrix": [2, 1], "x": 1, "y": 2.25 },
51+
{ "matrix": [2, 2], "x": 2, "y": 2.125 },
52+
{ "matrix": [2, 3], "x": 3, "y": 2 },
53+
{ "matrix": [2, 4], "x": 4, "y": 2.125 },
54+
{ "matrix": [2, 5], "x": 5, "y": 2.25 },
55+
{ "matrix": [6, 0], "x": 8, "y": 2.25 },
56+
{ "matrix": [6, 1], "x": 9, "y": 2.125 },
57+
{ "matrix": [6, 2], "x": 10, "y": 2 },
58+
{ "matrix": [6, 3], "x": 11, "y": 2.125 },
59+
{ "matrix": [6, 4], "x": 12, "y": 2.25 },
60+
{ "matrix": [6, 5], "x": 13, "y": 2.25 },
61+
{ "matrix": [3, 0], "x": 3.5, "y": 3.25 },
62+
{ "matrix": [3, 1], "x": 4.5, "y": 3.5 },
63+
{ "matrix": [3, 2], "x": 5.5, "y": 3.75 },
64+
{ "matrix": [7, 0], "x": 7.5, "y": 3.75 },
65+
{ "matrix": [7, 1], "x": 8.5, "y": 3.5 },
66+
{ "matrix": [7, 2], "x": 9.5, "y": 3.25 }
67+
]
68+
}
69+
}
70+
}

‎keyboards/cantor/keymaps/default/keymap.c

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// Copyright 2022 Diego Palacios (@diepala)
2+
// SPDX-License-Identifier: GPL-2.0
3+
4+
#include QMK_KEYBOARD_H
5+
6+
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
7+
/*
8+
* ┌───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┐
9+
* │Tab│ Q │ W │ E │ R │ T │ │ Y │ U │ I │ O │ P │Bsp│
10+
* ├───┼───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┼───┤
11+
* │Ctl│ A │ S │ D │ F │ G │ │ H │ J │ K │ L │ ; │ ' │
12+
* ├───┼───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┼───┤
13+
* │Sft│ Z │ X │ C │ V │ B │ │ N │ M │ , │ . │ / │Sft│
14+
* └───┴───┴───┴───┴───┴───┘ └───┴───┴───┴───┴───┴───┘
15+
* ┌───┐ ┌───┐
16+
* │GUI├───┐ ┌───┤Alt│
17+
* └───┤ ├───┐ ┌───┤ ├───┘
18+
* └───┤Bsp│ │Ent├───┘
19+
* └───┘ └───┘
20+
*/
21+
[0] = LAYOUT_split_3x6_3(
22+
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
23+
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
24+
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
25+
KC_LGUI, KC_SPC, KC_BSPC, KC_ENT, KC_SPC, KC_RALT
26+
)
27+
};
28+

‎keyboards/cantor/mcuconf.h

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// Copyright 2022 Diego Palacios (@diepala)
2+
// SPDX-License-Identifier: GPL-2.0-or-later
3+
4+
#pragma once
5+
6+
#include_next <mcuconf.h>
7+
8+
#undef STM32_SERIAL_USE_USART1
9+
#define STM32_SERIAL_USE_USART1 TRUE

‎keyboards/cantor/readme.md

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# cantor
2+
3+
![cantor](https://i.imgur.com/Uvxm3zVh.jpg)
4+
5+
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.
6+
7+
* Keyboard Maintainer: [Diego Palacios](https://github.com/diepala)
8+
* Hardware Supported: Blackpill STM32F401
9+
* Hardware Availability: https://github.com/diepala/cantor
10+
11+
Make example for this keyboard (after setting up your build environment):
12+
13+
make cantor:default
14+
15+
Flashing example for this keyboard:
16+
17+
make cantor:default:flash
18+
19+
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).
20+
21+
## Bootloader
22+
23+
Enter the bootloader in 3 ways:
24+
25+
* **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.
26+
* **Physical reset button**:
27+
* Press and hold the BOOT0 button.
28+
* Press and release the NRST button.
29+
* Release the BOOT0 button.
30+
* **Keycode in layout**: Press the key mapped to `RESET` if it is available

‎keyboards/cantor/rules.mk

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
SPLIT_KEYBOARD = yes
2+
SERIAL_DRIVER = usart

0 commit comments

Comments
 (0)