Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add missing LED Matrix suspend code to suspend.c #12878

Merged
merged 3 commits into from
May 13, 2021
Merged

Add missing LED Matrix suspend code to suspend.c #12878

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9e5773
Add missing LED Matrix suspend code to suspend.c
drashna May 12, 2021
ac56c2d
Swap order of RGB/LED functions to match
drashna May 13, 2021
e8cec7a
More tweaks
drashna May 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions tmk_core/common/avr/suspend.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,10 @@ void suspend_power_down(void) {
rgb_matrix_set_suspend_state(true);
# endif

# if defined(LED_MATRIX_ENABLE)
drashna marked this conversation as resolved.
Show resolved Hide resolved
led_matrix_set_suspend_state(true);
# endif

// Enter sleep state if possible (ie, the MCU has a watchdog timeout interrupt)
# if defined(WDT_vect)
power_down(WDTO_15MS);
Expand Down Expand Up @@ -222,6 +226,10 @@ void suspend_wakeup_init(void) {
rgb_matrix_set_suspend_state(false);
#endif

#if defined(LED_MATRIX_ENABLE)
led_matrix_set_suspend_state(false);
#endif

suspend_wakeup_init_kb();
}

Expand Down
7 changes: 7 additions & 0 deletions tmk_core/common/chibios/suspend.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ void suspend_power_down(void) {
#if defined(RGB_MATRIX_ENABLE)
rgb_matrix_set_suspend_state(true);
#endif
#if defined(LED_MATRIX_ENABLE)
led_matrix_set_suspend_state(true);
#endif
drashna marked this conversation as resolved.
Show resolved Hide resolved

#ifdef AUDIO_ENABLE
stop_all_notes();
#endif /* AUDIO_ENABLE */
Expand Down Expand Up @@ -156,6 +160,9 @@ void suspend_wakeup_init(void) {
#endif
#if defined(RGB_MATRIX_ENABLE)
rgb_matrix_set_suspend_state(false);
#endif
#if defined(LED_MATRIX_ENABLE)
led_matrix_set_suspend_state(false);
#endif
drashna marked this conversation as resolved.
Show resolved Hide resolved
suspend_wakeup_init_kb();
}