diff options
| author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-09-29 23:23:10 -0700 |
|---|---|---|
| committer | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-09-29 23:23:10 -0700 |
| commit | 922c8071e4b0735cd83f76eed5b23be6fe90196d (patch) | |
| tree | e556ec2230c1a97562f4e2c45e85fc13512316cb /keyboards/hhkb | |
| parent | 90797d903c81944c80b4957e118adfb20145b9ba (diff) | |
| parent | 36bc3c867eda54921b64b2f4e7262a371dbecd65 (diff) | |
| download | qmk_firmware-922c8071e4b0735cd83f76eed5b23be6fe90196d.tar.gz qmk_firmware-922c8071e4b0735cd83f76eed5b23be6fe90196d.zip | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/hhkb')
| -rw-r--r-- | keyboards/hhkb/ansi/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/hhkb/jp/rules.mk | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/keyboards/hhkb/ansi/rules.mk b/keyboards/hhkb/ansi/rules.mk index 56898e260..c59ee34f9 100644 --- a/keyboards/hhkb/ansi/rules.mk +++ b/keyboards/hhkb/ansi/rules.mk | |||
| @@ -18,7 +18,6 @@ CUSTOM_MATRIX = yes # Custom matrix file for the HHKB | |||
| 18 | # NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | 18 | # NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work |
| 19 | # BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality | 19 | # BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality |
| 20 | MIDI_ENABLE = no # MIDI support | 20 | MIDI_ENABLE = no # MIDI support |
| 21 | # UNICODE_ENABLE = yes # Unicode | ||
| 22 | 21 | ||
| 23 | 22 | ||
| 24 | # HHKB_RN42_ENABLE = yes # Enable support for hasu's BT alt controller -- code borrowed from tmk source tree. | 23 | # HHKB_RN42_ENABLE = yes # Enable support for hasu's BT alt controller -- code borrowed from tmk source tree. |
diff --git a/keyboards/hhkb/jp/rules.mk b/keyboards/hhkb/jp/rules.mk index 9b5b0b48b..3c66ff500 100644 --- a/keyboards/hhkb/jp/rules.mk +++ b/keyboards/hhkb/jp/rules.mk | |||
| @@ -18,7 +18,6 @@ CUSTOM_MATRIX = yes # Custom matrix file for the HHKB | |||
| 18 | # NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | 18 | # NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work |
| 19 | # BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality | 19 | # BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality |
| 20 | MIDI_ENABLE = no # MIDI support | 20 | MIDI_ENABLE = no # MIDI support |
| 21 | # UNICODE_ENABLE = yes # Unicode | ||
| 22 | 21 | ||
| 23 | 22 | ||
| 24 | # HHKB_RN42_ENABLE = yes # Enable support for hasu's BT alt controller -- code borrowed from tmk source tree. | 23 | # HHKB_RN42_ENABLE = yes # Enable support for hasu's BT alt controller -- code borrowed from tmk source tree. |