aboutsummaryrefslogtreecommitdiffstats
path: root/tmk_core/common/avr
diff options
context:
space:
mode:
authorGravatar Josh Colbeck <skrymir@gmail.com>2016-07-04 15:41:58 -0500
committerGravatar Josh Colbeck <skrymir@gmail.com>2016-07-04 15:41:58 -0500
commita5fb2b58a5fc328da7eea42cb73c668f3b5d0f7e (patch)
tree31762ea16ad4e7aceb86d3939ebe25839becc77a /tmk_core/common/avr
parent497b92c3bd3ee480e59d08f2a6fb1b780172681c (diff)
parent9e01b219f32b0086728c10658928b8bffcc26ef7 (diff)
downloadqmk_firmware-a5fb2b58a5fc328da7eea42cb73c668f3b5d0f7e.tar.gz
Merge remote-tracking branch 'jackhumbert/master' into patch-1
Diffstat (limited to 'tmk_core/common/avr')
-rw-r--r--tmk_core/common/avr/suspend.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/tmk_core/common/avr/suspend.c b/tmk_core/common/avr/suspend.c
index a6f3c6441..8a7272bbc 100644
--- a/tmk_core/common/avr/suspend.c
+++ b/tmk_core/common/avr/suspend.c
@@ -114,8 +114,10 @@ bool suspend_wakeup_condition(void)
matrix_power_up();
matrix_scan();
matrix_power_down();
- if (matrix_key_count()) return true;
- return false;
+ for (uint8_t r = 0; r < MATRIX_ROWS; r++) {
+ if (matrix_get_row(r)) return true;
+ }
+ return false;
}
// run immediately after wakeup