Merge remote-tracking branch 'origin/master' into develop

master
QMK Bot 2021-09-25 08:31:52 +00:00
commit a857956a3c
6 changed files with 4 additions and 5 deletions

View File

@ -49,8 +49,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Enable double tab */
#define TAPPING_TERM 175
#define COMBO_COUNT 1
#define BACKLIGHT_PIN B7
#define BACKLIGHT_BREATHING
#define BACKLIGHT_LEVELS 5

View File

@ -0,0 +1,3 @@
#pragma once
#define COMBO_COUNT 1

View File

@ -0,0 +1 @@
COMBO_ENABLE = yes

View File

@ -15,6 +15,5 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
NKRO_ENABLE = no # USB Nkey Rollover - not yet supported in LUFA
UNICODE_ENABLE = yes # Enable support for arrow keys icon on the second layer.
COMBO_ENABLE = yes # Enable combo for special function when using multiple keys at once.
NKRO_ENABLE = yes
BACKLIGHT_ENABLE = yes

View File

@ -13,7 +13,6 @@ MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = no # Audio control and System control
CONSOLE_ENABLE = yes # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
COMBO_ENABLE = no # Key combo feature
NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output

View File

@ -21,5 +21,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
UNICODE_ENABLE = no # Unicode
AUDIO_ENABLE = no # Audio output
#COMBO_ENABLE = yes
#SRC += .nicola.c \