Merge remote-tracking branch 'upstream/master' into develop

2021-12-02 03:26:54 +11:00
parent 1493e6d3f0 c12b997679
commit 0b241ea4f7
1783 changed files with 37 additions and 3458 deletions
--- a/keyboards/handwired/promethium/keymaps/default/rules.mk
+++ b/keyboards/handwired/promethium/keymaps/default/rules.mk
@@ -16,6 +16,3 @@ UNICODEMAP_ENABLE = yes
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 PS2_MOUSE_ENABLE = yes
 PS2_USE_INT = yes
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
--- a/keyboards/handwired/promethium/rules.mk
+++ b/keyboards/handwired/promethium/rules.mk
@@ -26,9 +26,6 @@ CUSTOM_MATRIX = yes
 BLUETOOTH_ENABLE = yes
 BLUETOOTH_DRIVER = AdafruitBLE

-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
 SRC += ws2812.c
 SRC += rgbsps.c
 SRC += analog.c