diff options
| author | fauxpark <fauxpark@gmail.com> | 2021-12-02 03:26:54 +1100 |
|---|---|---|
| committer | fauxpark <fauxpark@gmail.com> | 2021-12-02 03:26:54 +1100 |
| commit | 0b241ea4f778bf978f15d8278854c290eb5e3701 (patch) | |
| tree | 05dd60a623967c0a1037583aa4b9e8bfb8abba74 /keyboards/merge | |
| parent | 1493e6d3f04387f7dc460836cac724703cb947e2 (diff) | |
| parent | c12b99767921366c9fa8a1d6ba53872a26aa6127 (diff) | |
| download | qmk_firmware-0b241ea4f778bf978f15d8278854c290eb5e3701.tar.gz qmk_firmware-0b241ea4f778bf978f15d8278854c290eb5e3701.zip | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/merge')
| -rw-r--r-- | keyboards/merge/iso_macro/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/merge/uc1/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/merge/um70/rules.mk | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/keyboards/merge/iso_macro/rules.mk b/keyboards/merge/iso_macro/rules.mk index a455a828a6..89e4faaf61 100644 --- a/keyboards/merge/iso_macro/rules.mk +++ b/keyboards/merge/iso_macro/rules.mk @@ -12,8 +12,6 @@ MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work NKRO_ENABLE = no # USB Nkey Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality diff --git a/keyboards/merge/uc1/rules.mk b/keyboards/merge/uc1/rules.mk index 704eeb1217..e29b4f2892 100644 --- a/keyboards/merge/uc1/rules.mk +++ b/keyboards/merge/uc1/rules.mk @@ -12,8 +12,6 @@ MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work NKRO_ENABLE = no # Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality diff --git a/keyboards/merge/um70/rules.mk b/keyboards/merge/um70/rules.mk index 3347a8ebbf..af71e6bf25 100644 --- a/keyboards/merge/um70/rules.mk +++ b/keyboards/merge/um70/rules.mk @@ -12,8 +12,6 @@ MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work NKRO_ENABLE = yes # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality |