[Keymap] Drashna updates for 0.19 (#19175)
* Fix up bastardkb boards since blackpill support is officially added. * Check for blackpill version, not elite c. * Add checks in chibiOS config since multiple ARM controllers supported. * Rework rules.mk for keymaps to better handle arm vs avr support * Start moving away from `matrix_*_*` functions. * `housekeeping_task_*` instead of `matrix_scan_*` * `keyboard_(pre|post)_init_*` instead of `matrix_init_*` * Add ℂℴmⅈℂ unicode input method. * Clean up unicode code to be more compact and flexible. * Remove/move Pro Micro LED commands to userspace and better filter them * Fixup OLED code * Use newer quantum keycode functions/preprocessors rather than manual bit manipulation * Make unicode mode render much more compact/simple. * Make qmk secrets more self contained * Remove custom implementation of split watchdogmiryoku-merge-master
Drashna Jaelre
3 years ago
committed by
GitHub
parent
8a8000b4ec
commit
4a87af0e9a
@ -1,28 +1,45 @@
|
|||||||
# MCU name
|
RGB_MATRIX_ENABLE = no
|
||||||
MCU = STM32F411
|
CUSTOM_UNICODE_ENABLE = no
|
||||||
BOARD = BLACKPILL_STM32_F411
|
CUSTOM_POINTING_DEVICE = no
|
||||||
|
CUSTOM_SPLIT_TRANSPORT_SYNC = no
|
||||||
|
|
||||||
# Bootloader selection
|
|
||||||
# BOOTLOADER = stm32-dfu
|
|
||||||
BOOTLOADER := tinyuf2
|
|
||||||
|
|
||||||
LTO_ENABLE := no
|
ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/3x5/blackpill)
|
||||||
|
# Bootloader selection
|
||||||
|
BOOTLOADER := tinyuf2
|
||||||
|
|
||||||
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
|
LTO_ENABLE := no
|
||||||
KEYBOARD_SHARED_EP = yes
|
|
||||||
MOUSE_SHARED_EP = yes
|
|
||||||
|
|
||||||
EEPROM_DRIVER = spi
|
AUDIO_SUPPORTED = yes
|
||||||
WS2812_DRIVER = pwm
|
AUDIO_ENABLE = yes
|
||||||
SERIAL_DRIVER = usart
|
AUDIO_DRIVER = pwm_hardware
|
||||||
AUDIO_DRIVER = pwm_hardware
|
|
||||||
|
|
||||||
AUDIO_SUPPORTED = yes
|
OVERLOAD_FEATURES = yes
|
||||||
AUDIO_ENABLE = yes
|
endif
|
||||||
MOUSEKEY_ENABLE = yes
|
|
||||||
NKRO_ENABLE = yes
|
|
||||||
CONSOLE_ENABLE = yes
|
|
||||||
|
|
||||||
AUTOCORRECT_ENABLE = yes
|
ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/3x5/v2/stemcell)
|
||||||
|
OVERLOAD_FEATURES = yes
|
||||||
|
endif
|
||||||
|
ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/3x5/v2/splinky)
|
||||||
|
OVERLOAD_FEATURES = yes
|
||||||
|
endif
|
||||||
|
|
||||||
DEBOUNCE_TYPE = asym_eager_defer_pk
|
|
||||||
|
ifeq ($(strip $(OVERLOAD_FEATURES)), yes)
|
||||||
|
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
|
||||||
|
KEYBOARD_SHARED_EP = yes
|
||||||
|
MOUSE_SHARED_EP = yes
|
||||||
|
|
||||||
|
MOUSEKEY_ENABLE = yes
|
||||||
|
NKRO_ENABLE = yes
|
||||||
|
CONSOLE_ENABLE = yes
|
||||||
|
RGB_MATRIX_ENABLE = yes
|
||||||
|
|
||||||
|
AUTOCORRECT_ENABLE = yes
|
||||||
|
|
||||||
|
CUSTOM_UNICODE_ENABLE = yes
|
||||||
|
CUSTOM_POINTING_DEVICE = yes
|
||||||
|
CUSTOM_SPLIT_TRANSPORT_SYNC = yes
|
||||||
|
|
||||||
|
DEBOUNCE_TYPE = asym_eager_defer_pk
|
||||||
|
endif
|
||||||
|
|||||||
@ -1,26 +0,0 @@
|
|||||||
/* Copyright 2020 Nick Brassel (tzarc)
|
|
||||||
*
|
|
||||||
* 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 3 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 <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#define HAL_USE_PWM TRUE
|
|
||||||
#define HAL_USE_PAL TRUE
|
|
||||||
#define HAL_USE_SERIAL TRUE
|
|
||||||
// #define HAL_USE_I2C TRUE
|
|
||||||
#define HAL_USE_SPI TRUE
|
|
||||||
#define SPI_USE_WAIT TRUE
|
|
||||||
#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
|
|
||||||
|
|
||||||
#include_next <halconf.h>
|
|
||||||
@ -1,34 +1,56 @@
|
|||||||
# MCU name
|
CUSTOM_UNICODE_ENABLE = no
|
||||||
MCU = STM32F411
|
CUSTOM_POINTING_DEVICE = no
|
||||||
BOARD = BLACKPILL_STM32_F411
|
CUSTOM_SPLIT_TRANSPORT_SYNC = no
|
||||||
|
|
||||||
# Bootloader selection
|
ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/4x6/blackpill)
|
||||||
BOOTLOADER := tinyuf2
|
# MCU name
|
||||||
|
# Bootloader selection
|
||||||
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
|
BOOTLOADER := tinyuf2
|
||||||
MOUSEKEY_ENABLE = yes # Mouse keys
|
|
||||||
EXTRAKEY_ENABLE = yes # Audio control and System control
|
AUDIO_ENABLE = yes # Audio output
|
||||||
CONSOLE_ENABLE = yes # Console for debug
|
AUDIO_SUPPORTED = yes # is set to no in kb, needs to be forcibly enabled
|
||||||
COMMAND_ENABLE = no # Commands for debug and configuration
|
AUDIO_DRIVER = pwm_hardware
|
||||||
NKRO_ENABLE = yes # Enable N-Key Rollover
|
|
||||||
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
|
BACKLIGHT_DRIVER = pwm
|
||||||
AUDIO_ENABLE = yes # Audio output
|
|
||||||
AUDIO_SUPPORTED = yes # is set to no in kb, needs to be forcibly enabled
|
OVERLOAD_FEATURES = yes
|
||||||
|
endif
|
||||||
KEYBOARD_SHARED_EP = yes
|
|
||||||
MOUSE_SHARED_EP = yes
|
ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/4x6/v2/stemcell)
|
||||||
|
OVERLOAD_FEATURES = yes
|
||||||
EEPROM_DRIVER = spi
|
endif
|
||||||
WS2812_DRIVER = pwm
|
ifeq ($(strip $(KEYBOARD)), bastardkb/charybdis/4x6/v2/splinky)
|
||||||
SERIAL_DRIVER = usart
|
OVERLOAD_FEATURES = yes
|
||||||
AUDIO_DRIVER = pwm_hardware
|
endif
|
||||||
BACKLIGHT_DRIVER = pwm
|
ifeq ($(strip $(MCU)), atmega32u4)
|
||||||
|
LTO_ENABLE = yes
|
||||||
AUTOCORRECT_ENABLE = yes
|
BOOTLOADER = qmk-hid
|
||||||
CAPS_WORD_ENABLE = yes
|
BOOTLOADER_SIZE = 512
|
||||||
SWAP_HANDS_ENABLE = yes
|
endif
|
||||||
TAP_DANCE_ENABLE = yes
|
|
||||||
DEBOUNCE_TYPE = asym_eager_defer_pk
|
ifeq ($(strip $(OVERLOAD_FEATURES)), yes)
|
||||||
WPM_ENABLE = yes
|
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
|
||||||
LTO_ENABLE = no
|
MOUSEKEY_ENABLE = yes # Mouse keys
|
||||||
# OPT = 3
|
EXTRAKEY_ENABLE = yes # Audio control and System control
|
||||||
|
CONSOLE_ENABLE = yes # Console for debug
|
||||||
|
COMMAND_ENABLE = no # Commands for debug and configuration
|
||||||
|
NKRO_ENABLE = yes # Enable N-Key Rollover
|
||||||
|
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
|
||||||
|
|
||||||
|
KEYBOARD_SHARED_EP = yes
|
||||||
|
MOUSE_SHARED_EP = yes
|
||||||
|
|
||||||
|
AUTOCORRECT_ENABLE = yes
|
||||||
|
CAPS_WORD_ENABLE = yes
|
||||||
|
SWAP_HANDS_ENABLE = yes
|
||||||
|
TAP_DANCE_ENABLE = yes
|
||||||
|
DEBOUNCE_TYPE = asym_eager_defer_pk
|
||||||
|
WPM_ENABLE = yes
|
||||||
|
LTO_ENABLE = no
|
||||||
|
# OPT = 3
|
||||||
|
|
||||||
|
CUSTOM_UNICODE_ENABLE = yes
|
||||||
|
CUSTOM_POINTING_DEVICE = yes
|
||||||
|
CUSTOM_SPLIT_TRANSPORT_SYNC = yes
|
||||||
|
|
||||||
|
endif
|
||||||
|
|||||||
@ -0,0 +1,23 @@
|
|||||||
|
/**
|
||||||
|
* Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
|
||||||
|
#define HAL_USE_SPI TRUE
|
||||||
|
#define HAL_USE_I2C TRUE
|
||||||
|
|
||||||
|
#include_next "halconf.h"
|
||||||
@ -0,0 +1,26 @@
|
|||||||
|
/**
|
||||||
|
* Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
|
||||||
|
*
|
||||||
|
* 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_next "mcuconf.h"
|
||||||
|
|
||||||
|
#undef RP_SPI_USE_SPI1
|
||||||
|
#define RP_SPI_USE_SPI1 TRUE
|
||||||
|
|
||||||
|
#undef RP_I2C_USE_I2C1
|
||||||
|
#define RP_I2C_USE_I2C1 TRUE
|
||||||
@ -1,40 +1,52 @@
|
|||||||
COMMAND_ENABLE = no
|
AUTOCORRECT_ENABLE = no
|
||||||
RGBLIGHT_ENABLE = yes
|
AUDIO_ENABLE = no
|
||||||
RGBLIGHT_STARTUP_ANIMATION = yes
|
ENCODER_ENABLE = no
|
||||||
AUDIO_ENABLE = yes
|
CUSTOM_BOOTMAGIC_ENABLE = no
|
||||||
|
CUSTOM_UNICODE_ENABLE = no
|
||||||
HAPTIC_ENABLE = no
|
HAPTIC_ENABLE = no
|
||||||
TAP_DANCE_ENABLE = yes
|
OLED_ENABLE = no
|
||||||
OLED_ENABLE = yes
|
OLED_DRIVER = custom
|
||||||
WPM_ENABLE = yes
|
RGBLIGHT_ENABLE = no
|
||||||
ENCODER_ENABLE = yes
|
SWAP_HANDS_ENABLE = no
|
||||||
ENCODER_MAP_ENABLE = yes
|
TAP_DANCE_ENABLE = no
|
||||||
AUTOCORRECT_ENABLE = yes
|
WPM_ENABLE = no
|
||||||
CAPS_WORD_ENABLE = yes
|
|
||||||
DEFERRED_EXEC_ENABLE = yes
|
|
||||||
|
|
||||||
ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/elite_c)
|
ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/elite_c)
|
||||||
RGBLIGHT_ENABLE = no
|
BOOTLOADER = qmk-hid
|
||||||
AUDIO_ENABLE = no
|
BOOTLOADER_SIZE = 512
|
||||||
HAPTIC_ENABLE = no
|
CUSTOM_SPLIT_TRANSPORT_SYNC = no
|
||||||
TAP_DANCE_ENABLE = no
|
LTO_ENABLE = yes
|
||||||
OLED_ENABLE = no
|
endif
|
||||||
WPM_ENABLE = no
|
ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/arduinomicro)
|
||||||
ENCODER_ENABLE = no
|
BOOTLOADER = qmk-hid
|
||||||
AUTOCORRECT_ENABLE = no
|
BOOTLOADER_SIZE = 512
|
||||||
LTO_SUPPORTED = yes
|
CUSTOM_SPLIT_TRANSPORT_SYNC = no
|
||||||
SWAP_HANDS_ENABLE = no
|
LTO_ENABLE = yes
|
||||||
CUSTOM_UNICODE_ENABLE = no
|
|
||||||
CAPS_WORD_ENABLE = no
|
|
||||||
BOOTLOADER = qmk-hid
|
|
||||||
BOOTLOADER_SIZE = 512
|
|
||||||
endif
|
endif
|
||||||
ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/teensy2pp)
|
ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/teensy2pp)
|
||||||
AUTOCORRECT_ENABLE = no
|
AUTOCORRECT_ENABLE = no
|
||||||
CAPS_WORD_ENABLE = yes
|
OVERLOAD_FEATURES = yes
|
||||||
|
LTO_ENABLE = yes
|
||||||
endif
|
endif
|
||||||
ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/f411)
|
ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/f411)
|
||||||
BOOTLOADER = tinyuf2
|
BOOTLOADER = tinyuf2
|
||||||
|
AUTOCORRECT_ENABLE = yes
|
||||||
|
LTO_SUPPORTED = no
|
||||||
|
OVERLOAD_FEATURES = yes
|
||||||
endif
|
endif
|
||||||
# DEBOUNCE_TYPE = sym_eager_pk
|
# DEBOUNCE_TYPE = sym_eager_pk
|
||||||
|
|
||||||
OLED_DRIVER = custom
|
ifeq ($(strip $(OVERLOAD_FEATURES)), yes)
|
||||||
|
AUDIO_ENABLE = yes
|
||||||
|
CAPS_WORD_ENABLE = yes
|
||||||
|
CUSTOM_BOOTMAGIC_ENABLE = yes
|
||||||
|
CUSTOM_UNICODE_ENABLE = yes
|
||||||
|
ENCODER_ENABLE = yes
|
||||||
|
ENCODER_MAP_ENABLE = yes
|
||||||
|
OLED_ENABLE = yes
|
||||||
|
RGBLIGHT_ENABLE = yes
|
||||||
|
RGBLIGHT_STARTUP_ANIMATION = yes
|
||||||
|
TAP_DANCE_ENABLE = yes
|
||||||
|
SWAP_HANDS_ENABLE = yes
|
||||||
|
WPM_ENABLE = yes
|
||||||
|
endif
|
||||||
|
|||||||
Loading…
Reference in New Issue