diff options
author | QMK Bot <hello@qmk.fm> | 2021-09-30 09:17:50 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-09-30 09:17:50 +0000 |
commit | e5d48f6d16f00895464add8e52d0c4b1a033228e (patch) | |
tree | df2edfff451e1650b827a11408807cc22f617d58 /keyboards/gh60 | |
parent | ed062d811d14e921ede0f99cac60ff1143bf7767 (diff) | |
parent | 0b37e07f907cbb9654ecbc6449bb690f91f9ab20 (diff) |
Merge remote-tracking branch 'origin/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 | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/keyboards/gh60/revc/rules.mk b/keyboards/gh60/revc/rules.mk index 3cb2f3bebc..30057a4571 100644 --- a/keyboards/gh60/revc/rules.mk +++ b/keyboards/gh60/revc/rules.mk @@ -17,6 +17,5 @@ KEYBOARD_LOCK_ENABLE = yes # Allow locking of keyboard via magic key # SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend 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 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 a8cc2fd82e..344a2850d8 100644 --- a/keyboards/gh60/satan/keymaps/default/rules.mk +++ b/keyboards/gh60/satan/keymaps/default/rules.mk @@ -9,7 +9,6 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = yes # 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 BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -MIDI_ENABLE = no # MIDI controls AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend |