Merge branch 'master' into debounce_refactor

# Conflicts:
#	tmk_core/common/keyboard.c

1 files changed, 11 insertions, 0 deletions

diff --git a/keyboards/ymdk_np21/matrix.c b/keyboards/ymdk_np21/matrix.c
index a9e9cb539..b2bfb2f0b 100644
--- a/keyboards/ymdk_np21/matrix.c
+++ b/keyboards/ymdk_np21/matrix.c
@@ -91,12 +91,23 @@ uint8_t matrix_scan(void) {
     return 1;
 }
 
+__attribute__ ((weak))
+void matrix_scan_user(void) {};
+
+__attribute__ ((weak))
 void matrix_scan_kb(void) {
   // Looping keyboard code goes here
   // This runs every cycle (a lot)
   matrix_scan_user();
 };
 
+__attribute__ ((weak))
+void matrix_init_user(void) {};
+
+__attribute__ ((weak))
+void matrix_init_kb(void) {
+  matrix_init_user();
+}
 // declarations
 void matrix_set_row_status(uint8_t row) {
     DDRB = (1 << row);