Added Cantor keyboard (qmk#16552)

Bastardkb · Jul 2, 2022 · b7aa904 · b7aa904
1 parent c5cf331
commit b7aa904
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 2 deletions.
diff --git a/keyboards/cantor/config.h b/keyboards/cantor/config.h
@@ -5,6 +5,7 @@
 
 #include "config_common.h"
 
+<<<<<<< HEAD
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
@@ -21,10 +22,13 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
+=======
+>>>>>>> e6071b891a (Added Cantor keyboard (#16552))
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 6
 
+<<<<<<< HEAD
 #define DIRECT_PINS       {{B1, B10, A8, B15, B14, B13}, \
                            {B9, B8,  B5, B4,  B3,  A15}, \
                            {A3, A4,  A5, A6,  A7,  B0}, \
@@ -33,6 +37,16 @@
                            {A15, B3,  B4,  B5, B8,  B9}, \
                            {B0,  A7,  A6,  A5, A4,  A3}, \
                            {A0,  A1,  A2,  NO_PIN, NO_PIN, NO_PIN}}
+=======
+#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}}
+>>>>>>> e6071b891a (Added Cantor keyboard (#16552))
 
 #define SERIAL_USART_FULL_DUPLEX   // Enable full duplex operation mode.
 #define SERIAL_USART_TX_PIN B6     // USART TX pin
@@ -44,3 +58,22 @@
 /* Top right key on right half */
 #define BOOTMAGIC_LITE_ROW_RIGHT    4
 #define BOOTMAGIC_LITE_COLUMN_RIGHT 5
+<<<<<<< HEAD
+=======
+
+/*
+ * 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
+>>>>>>> e6071b891a (Added Cantor keyboard (#16552))
diff --git a/keyboards/cantor/halconf.h b/keyboards/cantor/halconf.h
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 /* Copyright 2020 QMK
  *
  * This program is free software: you can redistribute it and/or modify
@@ -27,4 +28,14 @@
 
 //#define SERIAL_USB_BUFFERS_SIZE 256
 
-#include_next <halconf.h>
+#include_next <halconf.h>
+=======
+// Copyright 2022 Diego Palacios (@diepala)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_SERIAL TRUE
+
+#include_next <halconf.h>
+>>>>>>> e6071b891a (Added Cantor keyboard (#16552))
diff --git a/keyboards/cantor/info.json b/keyboards/cantor/info.json
@@ -3,9 +3,14 @@
     "keyboard_name": "cantor",
     "maintainer": "diepala",
     "bootloader": "stm32-dfu",
+<<<<<<< HEAD
     "diode_direction": "COL2ROW",
     "features": {
         "bootmagic_lite": true,
+=======
+    "features": {
+        "bootmagic": true,
+>>>>>>> e6071b891a (Added Cantor keyboard (#16552))
         "command": false,
         "console": false,
         "extrakey": true,
@@ -19,6 +24,10 @@
         "pid": "0x0000",
         "vid": "0xFEED"
     },
+<<<<<<< HEAD
+=======
+    "community_layouts": ["split_3x6_3"],
+>>>>>>> e6071b891a (Added Cantor keyboard (#16552))
     "layouts": {
         "LAYOUT_split_3x6_3": {
             "layout": [

diff --git a/keyboards/cantor/mcuconf.h b/keyboards/cantor/mcuconf.h
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 
 /* Copyright 2020 QMK
  *
@@ -19,13 +20,22 @@
  * This file was auto-generated by:
  *    `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f401/mcuconf.h -r platforms/chibios/BLACKPILL_STM32_F401/configs/mcuconf.h`
  */
+=======
+// Copyright 2022 Diego Palacios (@diepala)
+// SPDX-License-Identifier: GPL-2.0-or-later
+>>>>>>> e6071b891a (Added Cantor keyboard (#16552))
 
 #pragma once
 
 #include_next <mcuconf.h>
 
+<<<<<<< HEAD
 //#undef STM32_PWM_USE_TIM3
 //#define STM32_PWM_USE_TIM3 TRUE
 
 #undef STM32_SERIAL_USE_USART1
-#define STM32_SERIAL_USE_USART1 TRUE
+#define STM32_SERIAL_USE_USART1 TRUE
+=======
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 TRUE
+>>>>>>> e6071b891a (Added Cantor keyboard (#16552))
diff --git a/keyboards/cantor/readme.md b/keyboards/cantor/readme.md
@@ -1,6 +1,10 @@
 # cantor
 
+<<<<<<< HEAD
 ![cantor](https://i.imgur.com/Uvxm3zV.jpg)
+=======
+![cantor](https://i.imgur.com/Uvxm3zVh.jpg)
+>>>>>>> e6071b891a (Added Cantor keyboard (#16552))
 
 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.
 

diff --git a/keyboards/cantor/rules.mk b/keyboards/cantor/rules.mk
@@ -1,3 +1,6 @@
+<<<<<<< HEAD
 BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+=======
+>>>>>>> e6071b891a (Added Cantor keyboard (#16552))
 SPLIT_KEYBOARD = yes
 SERIAL_DRIVER = usart