Merge branch 'debounce_refactor' of https://github.com/alex-ong/qmk_firmware into debounce_refactor

2 files changed, 3 insertions, 5 deletions

diff --git a/quantum/debounce.h b/quantum/debounce.h
index 8397823ebb..9ca05c6824 100644
--- a/quantum/debounce.h
+++ b/quantum/debounce.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "matrix.h"
-
 // raw is the current key state
 // on entry cooked is the previous debounced state
 // on exit cooked is the current debounced state
diff --git a/quantum/debounce/debounce_sym_g.c b/quantum/debounce/debounce_sym_g.c
index e365cdf037..c8ab34e1a0 100644
--- a/quantum/debounce/debounce_sym_g.c
+++ b/quantum/debounce/debounce_sym_g.c
@@ -16,9 +16,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Basic global debounce algorithm. Used in 99% of keyboards at time of implementation
 When no state changes have occured for DEBOUNCE milliseconds, we push the state.
 */
-#include "debounce.h"
 #include "matrix.h"
 #include "timer.h"
+#include "quantum.h"
 #ifndef DEBOUNCE
   #define DEBOUNCE 5
 #endif
@@ -45,13 +45,13 @@ void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool
 #else //no debouncing.
 void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool changed)
 {
-  for (int i = 0; i < MATRIX_ROWS; i++) {
+  for (int i = 0; i < num_rows; i++) {
     cooked[i] = raw[i];
   }
 }
 #endif
 
-bool debounce_active() {
+bool debounce_active(void) {
   return debouncing;
 }