Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
504c00c2e1
@ -23,7 +23,6 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
|
|||||||
NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
|
NKRO_ENABLE = no # 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
|
#BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
|
||||||
UNICODE_ENABLE = yes # Unicode
|
UNICODE_ENABLE = yes # Unicode
|
||||||
#BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID
|
|
||||||
|
|
||||||
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
|
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
|
||||||
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
|
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
|
||||||
|
@ -25,4 +25,3 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
|
|||||||
# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
||||||
MIDI_ENABLE = no # MIDI support
|
MIDI_ENABLE = no # MIDI support
|
||||||
# UNICODE_ENABLE = YES # Unicode
|
# UNICODE_ENABLE = YES # Unicode
|
||||||
# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID
|
|
||||||
|
@ -26,7 +26,6 @@ NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA
|
|||||||
# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
||||||
MIDI_ENABLE = no # MIDI support
|
MIDI_ENABLE = no # MIDI support
|
||||||
UNICODE_ENABLE = YES # Unicode
|
UNICODE_ENABLE = YES # Unicode
|
||||||
# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID
|
|
||||||
|
|
||||||
# # project specific files
|
# # project specific files
|
||||||
SRC += matrix.c serial_uart.c
|
SRC += matrix.c serial_uart.c
|
||||||
|
@ -26,7 +26,6 @@ NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA
|
|||||||
# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
||||||
MIDI_ENABLE = no # MIDI support
|
MIDI_ENABLE = no # MIDI support
|
||||||
UNICODE_ENABLE = YES # Unicode
|
UNICODE_ENABLE = YES # Unicode
|
||||||
# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID
|
|
||||||
|
|
||||||
# project specific files
|
# project specific files
|
||||||
SRC += matrix.c serial_uart.c
|
SRC += matrix.c serial_uart.c
|
||||||
|
@ -26,7 +26,6 @@ NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA
|
|||||||
# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
||||||
MIDI_ENABLE = no # MIDI support
|
MIDI_ENABLE = no # MIDI support
|
||||||
UNICODE_ENABLE = YES # Unicode
|
UNICODE_ENABLE = YES # Unicode
|
||||||
# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID
|
|
||||||
|
|
||||||
# project specific files
|
# project specific files
|
||||||
SRC += matrix.c serial_uart.c
|
SRC += matrix.c serial_uart.c
|
||||||
|
@ -26,7 +26,6 @@ NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA
|
|||||||
# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
||||||
MIDI_ENABLE = no # MIDI support
|
MIDI_ENABLE = no # MIDI support
|
||||||
UNICODE_ENABLE = YES # Unicode
|
UNICODE_ENABLE = YES # Unicode
|
||||||
# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID
|
|
||||||
|
|
||||||
# project specific files
|
# project specific files
|
||||||
SRC += matrix.c \
|
SRC += matrix.c \
|
||||||
|
@ -27,7 +27,6 @@ NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA
|
|||||||
# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
||||||
MIDI_ENABLE = no # MIDI support
|
MIDI_ENABLE = no # MIDI support
|
||||||
UNICODE_ENABLE = YES # Unicode
|
UNICODE_ENABLE = YES # Unicode
|
||||||
# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID
|
|
||||||
|
|
||||||
# # project specific files
|
# # project specific files
|
||||||
SRC += matrix.c serial_uart.c
|
SRC += matrix.c serial_uart.c
|
||||||
|
@ -26,6 +26,5 @@ NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https:
|
|||||||
# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
||||||
MIDI_ENABLE = no # MIDI support
|
MIDI_ENABLE = no # MIDI support
|
||||||
# UNICODE_ENABLE = YES # Unicode
|
# UNICODE_ENABLE = YES # Unicode
|
||||||
# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID
|
|
||||||
|
|
||||||
LAYOUTS = 60_ansi 60_iso 60_ansi_split_bs_rshift 60_tsangan_hhkb
|
LAYOUTS = 60_ansi 60_iso 60_ansi_split_bs_rshift 60_tsangan_hhkb
|
||||||
|
@ -26,4 +26,3 @@ NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https:
|
|||||||
# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
||||||
MIDI_ENABLE = no # MIDI support
|
MIDI_ENABLE = no # MIDI support
|
||||||
# UNICODE_ENABLE = YES # Unicode
|
# UNICODE_ENABLE = YES # Unicode
|
||||||
# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID
|
|
||||||
|
@ -26,7 +26,6 @@ CUSTOM_MATRIX = yes # Custom matrix file for the HHKB
|
|||||||
# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
||||||
MIDI_ENABLE = no # MIDI support
|
MIDI_ENABLE = no # MIDI support
|
||||||
# UNICODE_ENABLE = yes # Unicode
|
# UNICODE_ENABLE = yes # Unicode
|
||||||
# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID
|
|
||||||
|
|
||||||
|
|
||||||
# HHKB_RN42_ENABLE = yes # Enable support for hasu's BT alt controller -- code borrowed from tmk source tree.
|
# HHKB_RN42_ENABLE = yes # Enable support for hasu's BT alt controller -- code borrowed from tmk source tree.
|
||||||
|
@ -26,7 +26,6 @@ CUSTOM_MATRIX = yes # Custom matrix file for the HHKB
|
|||||||
# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
||||||
MIDI_ENABLE = no # MIDI support
|
MIDI_ENABLE = no # MIDI support
|
||||||
# UNICODE_ENABLE = yes # Unicode
|
# UNICODE_ENABLE = yes # Unicode
|
||||||
# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID
|
|
||||||
|
|
||||||
|
|
||||||
# HHKB_RN42_ENABLE = yes # Enable support for hasu's BT alt controller -- code borrowed from tmk source tree.
|
# HHKB_RN42_ENABLE = yes # Enable support for hasu's BT alt controller -- code borrowed from tmk source tree.
|
||||||
|
@ -27,7 +27,6 @@ NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA
|
|||||||
# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
||||||
MIDI_ENABLE = no # MIDI support
|
MIDI_ENABLE = no # MIDI support
|
||||||
UNICODE_ENABLE = YES # Unicode
|
UNICODE_ENABLE = YES # Unicode
|
||||||
# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID
|
|
||||||
|
|
||||||
# # project specific files
|
# # project specific files
|
||||||
SRC += matrix.c serial_uart.c
|
SRC += matrix.c serial_uart.c
|
||||||
|
@ -26,5 +26,4 @@ NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https:
|
|||||||
# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
||||||
MIDI_ENABLE = no # MIDI support
|
MIDI_ENABLE = no # MIDI support
|
||||||
# UNICODE_ENABLE = YES # Unicode
|
# UNICODE_ENABLE = YES # Unicode
|
||||||
# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID
|
|
||||||
RGBLIGHT_ENABLE = yes # Enable RGB Underglow
|
RGBLIGHT_ENABLE = yes # Enable RGB Underglow
|
||||||
|
@ -26,7 +26,6 @@ NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA
|
|||||||
# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
||||||
MIDI_ENABLE = no # MIDI support
|
MIDI_ENABLE = no # MIDI support
|
||||||
UNICODE_ENABLE = yes # Unicode
|
UNICODE_ENABLE = yes # Unicode
|
||||||
# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID
|
|
||||||
|
|
||||||
# # project specific files
|
# # project specific files
|
||||||
SRC += matrix.c serial_uart.c
|
SRC += matrix.c serial_uart.c
|
||||||
|
@ -22,7 +22,6 @@ COMMAND_ENABLE = no # Commands for debug and configuration
|
|||||||
NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
|
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
|
#BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
|
||||||
UNICODE_ENABLE = yes # Unicode
|
UNICODE_ENABLE = yes # Unicode
|
||||||
#BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID
|
|
||||||
#TAP_DANCE_ENABLE = yes
|
#TAP_DANCE_ENABLE = yes
|
||||||
RGBLIGHT_ENABLE = no
|
RGBLIGHT_ENABLE = no
|
||||||
LED_ANIMATIONS = no
|
LED_ANIMATIONS = no
|
||||||
|
@ -25,6 +25,5 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
|||||||
RGBLIGHT_ENABLE = yes # Enable the RGB backlight
|
RGBLIGHT_ENABLE = yes # Enable the RGB backlight
|
||||||
MIDI_ENABLE = no # MIDI support
|
MIDI_ENABLE = no # MIDI support
|
||||||
# UNICODE_ENABLE = YES # Unicode
|
# UNICODE_ENABLE = YES # Unicode
|
||||||
# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID
|
|
||||||
|
|
||||||
LAYOUTS = 60_ansi 60_iso 60_hhkb
|
LAYOUTS = 60_ansi 60_iso 60_hhkb
|
||||||
|
@ -26,7 +26,6 @@ NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA
|
|||||||
# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
|
||||||
MIDI_ENABLE = no # MIDI support
|
MIDI_ENABLE = no # MIDI support
|
||||||
UNICODE_ENABLE = YES # Unicode
|
UNICODE_ENABLE = YES # Unicode
|
||||||
# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID
|
|
||||||
|
|
||||||
# # project specific files
|
# # project specific files
|
||||||
SRC += matrix.c serial_uart.c
|
SRC += matrix.c serial_uart.c
|
||||||
|
Loading…
Reference in New Issue
Block a user