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/gh60 | |
| parent | 90797d903c81944c80b4957e118adfb20145b9ba (diff) | |
| parent | 36bc3c867eda54921b64b2f4e7262a371dbecd65 (diff) | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/gh60')
| -rw-r--r-- | keyboards/gh60/revc/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/gh60/satan/keymaps/default/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/gh60/satan/rules.mk | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/keyboards/gh60/revc/rules.mk b/keyboards/gh60/revc/rules.mk index f5194840b9..3cb2f3bebc 100644 --- a/keyboards/gh60/revc/rules.mk +++ b/keyboards/gh60/revc/rules.mk @@ -18,6 +18,5 @@ KEYBOARD_LOCK_ENABLE = yes # Allow locking of keyboard via magic key NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work # BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI support -# UNICODE_ENABLE = YES # Unicode LAYOUTS = 60_ansi 60_iso 60_ansi_split_bs_rshift 60_tsangan_hhkb diff --git a/keyboards/gh60/satan/keymaps/default/rules.mk b/keyboards/gh60/satan/keymaps/default/rules.mk index 9bd14ac70a..a8cc2fd82e 100644 --- a/keyboards/gh60/satan/keymaps/default/rules.mk +++ b/keyboards/gh60/satan/keymaps/default/rules.mk @@ -11,7 +11,5 @@ NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: ht BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI controls AUDIO_ENABLE = no # Audio output -UNICODE_ENABLE = no # Unicode RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend - diff --git a/keyboards/gh60/satan/rules.mk b/keyboards/gh60/satan/rules.mk index 0128ff0179..98178e17d5 100644 --- a/keyboards/gh60/satan/rules.mk +++ b/keyboards/gh60/satan/rules.mk @@ -16,6 +16,5 @@ NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: ht RGBLIGHT_ENABLE = yes # Enable keyboard underlight functionality BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality AUDIO_ENABLE = no -UNICODE_ENABLE = no # Unicode LAYOUTS = 60_ansi 60_iso 60_ansi_split_bs_rshift |