diff options
Diffstat (limited to 'keyboards/keebio/choconum')
-rw-r--r-- | keyboards/keebio/choconum/choconum.c | 1 | ||||
-rw-r--r-- | keyboards/keebio/choconum/choconum.h | 49 | ||||
-rw-r--r-- | keyboards/keebio/choconum/config.h | 51 | ||||
-rw-r--r-- | keyboards/keebio/choconum/info.json | 86 | ||||
-rw-r--r-- | keyboards/keebio/choconum/rules.mk | 8 |
5 files changed, 49 insertions, 146 deletions
diff --git a/keyboards/keebio/choconum/choconum.c b/keyboards/keebio/choconum/choconum.c deleted file mode 100644 index 5360a716d7..0000000000 --- a/keyboards/keebio/choconum/choconum.c +++ /dev/null @@ -1 +0,0 @@ -#include "choconum.h" diff --git a/keyboards/keebio/choconum/choconum.h b/keyboards/keebio/choconum/choconum.h deleted file mode 100644 index e77c5886ec..0000000000 --- a/keyboards/keebio/choconum/choconum.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2020 Keebio - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_5x4( \ - KA1, KA2, KA3, KA4, \ - KB1, KB2, KB3, KB4, \ - KC1, KC2, KC3, KC4, \ - KD1, KD2, KD3, KD4, \ - KE1, KE2, KE3, KE4 \ -) \ -{ \ - { KA1, KA2, KA3, KA4 }, \ - { KB1, KB2, KB3, KB4 }, \ - { KC1, KC2, KC3, KC4 }, \ - { KD1, KD2, KD3, KD4 }, \ - { KE1, KE2, KE3, KE4 } \ -} - -#define LAYOUT_numpad_5x4( \ - KA1, KA2, KA3, KA4, \ - KB1, KB2, KB3, KB4, \ - KC1, KC2, KC3, \ - KD1, KD2, KD3, KD4, \ - KE1, KE3 \ -) \ -{ \ - { KA1, KA2, KA3, KA4 }, \ - { KB1, KB2, KB3, KB4 }, \ - { KC1, KC2, KC3, KC_NO }, \ - { KD1, KD2, KD3, KD4 }, \ - { KE1, KC_NO, KE3, KC_NO } \ -} diff --git a/keyboards/keebio/choconum/config.h b/keyboards/keebio/choconum/config.h index afad80daef..38e745515a 100644 --- a/keyboards/keebio/choconum/config.h +++ b/keyboards/keebio/choconum/config.h @@ -17,58 +17,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 4 -#define DIRECT_PINS { \ - { B2, B10, B3, B4 }, \ - { B1, B11, A15, B5 }, \ - { B0, A5, B7, F0 }, \ - { A7, A6, B8, B6 }, \ - { A4, A3, B9, F1 } \ -} - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -#define DEBOUNCE 5 - -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. - * This is userful for the Windows task manager shortcut (ctrl+shift+esc). - */ -// #define GRAVE_ESC_CTRL_OVERRIDE - -/* - * Force NKRO - * - * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved - * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the - * makefile for this to work.) - * - * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) - * until the next keyboard reset. - * - * NKRO may prevent your keystrokes from being detected in the BIOS, but it is - * fully operational during normal computer usage. - * - * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) - * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by - * bootmagic, NKRO mode will always be enabled until it is toggled again during a - * power-up. - * - */ -//#define FORCE_NKRO - /* * Feature disable options * These options are also useful to firmware size reduction. @@ -84,7 +37,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT - -/* Bootmagic Lite key configuration */ -// #define BOOTMAGIC_LITE_ROW 0 -// #define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/keebio/choconum/info.json b/keyboards/keebio/choconum/info.json index b6408f31cd..856549eb96 100644 --- a/keyboards/keebio/choconum/info.json +++ b/keyboards/keebio/choconum/info.json @@ -8,58 +8,70 @@ "pid": "0x1154", "device_version": "1.0.0" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", + "matrix_pins": { + "direct": [ + ["B2", "B10", "B3", "B4"], + ["B1", "B11", "A15", "B5"], + ["B0", "A5", "B7", "F0"], + ["A7", "A6", "B8", "B6"], + ["A4", "A3", "B9", "F1"] + ] + }, + "community_layouts": ["ortho_5x4", "numpad_5x4"], "layouts": { "LAYOUT_numpad_5x4": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":2, "y":0, "matrix": [0, 2]}, + {"x":3, "y":0, "matrix": [0, 3]}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1, "h":2}, + {"x":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]}, + {"x":3, "y":1, "h":2, "matrix": [1, 3]}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, + {"x":0, "y":2, "matrix": [2, 0]}, + {"x":1, "y":2, "matrix": [2, 1]}, + {"x":2, "y":2, "matrix": [2, 2]}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3, "h":2}, + {"x":0, "y":3, "matrix": [3, 0]}, + {"x":1, "y":3, "matrix": [3, 1]}, + {"x":2, "y":3, "matrix": [3, 2]}, + {"x":3, "y":3, "h":2, "matrix": [3, 3]}, - {"x":0, "y":4,"w":2}, - {"x":2, "y":4} + {"x":0, "y":4,"w":2, "matrix": [4, 0]}, + {"x":2, "y":4, "matrix": [4, 2]} ] }, "LAYOUT_ortho_5x4": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":2, "y":0, "matrix": [0, 2]}, + {"x":3, "y":0, "matrix": [0, 3]}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, + {"x":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]}, + {"x":3, "y":1, "matrix": [1, 3]}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, + {"x":0, "y":2, "matrix": [2, 0]}, + {"x":1, "y":2, "matrix": [2, 1]}, + {"x":2, "y":2, "matrix": [2, 2]}, + {"x":3, "y":2, "matrix": [2, 3]}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, + {"x":0, "y":3, "matrix": [3, 0]}, + {"x":1, "y":3, "matrix": [3, 1]}, + {"x":2, "y":3, "matrix": [3, 2]}, + {"x":3, "y":3, "matrix": [3, 3]}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":4} + {"x":0, "y":4, "matrix": [4, 0]}, + {"x":1, "y":4, "matrix": [4, 1]}, + {"x":2, "y":4, "matrix": [4, 2]}, + {"x":3, "y":4, "matrix": [4, 3]} ] } } diff --git a/keyboards/keebio/choconum/rules.mk b/keyboards/keebio/choconum/rules.mk index 59fec7c94b..f3805c2acc 100644 --- a/keyboards/keebio/choconum/rules.mk +++ b/keyboards/keebio/choconum/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # @@ -17,7 +11,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -LAYOUTS = ortho_5x4 numpad_5x4 - # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE |