From 638693bf2159da407fec4c987a09f5bb373a4f0f Mon Sep 17 00:00:00 2001
From: Okke Formsma <okke@formsma.nl>
Date: Fri, 10 Jul 2020 17:34:17 +0200
Subject: [PATCH] Call matrix_init_quantum from matrix_init instead of
 matrix_init_user

Makes the behavior identical to non-NRF QMK.
Fixes https://github.com/joric/qmk/issues/6
---
 keyboards/jorne_ble/master/master.c | 6 ++++--
 tmk_core/protocol/nrf/matrix.c      | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/keyboards/jorne_ble/master/master.c b/keyboards/jorne_ble/master/master.c
index ef0ace1de7eb..d7524c6d6977 100644
--- a/keyboards/jorne_ble/master/master.c
+++ b/keyboards/jorne_ble/master/master.c
@@ -43,7 +43,7 @@ void select_row(uint8_t row);
 matrix_row_t read_cols(void);
 static bool bootloader_flag = false;
 
-void matrix_init_user() {
+void matrix_init_kb() {
   nrfmicro_init();
 
   select_row(3);
@@ -60,12 +60,14 @@ void matrix_init_user() {
   #ifdef SSD1306OLED
       iota_gfx_init(!IS_LEFT_HAND);   // turns on the display
   #endif
+  matrix_init_user();
 }
 
-void matrix_scan_user(void) {
+void matrix_scan_kb(void) {
   #ifdef SSD1306OLED
     iota_gfx_task();  // this is what updates the display continuously
   #endif
 
   nrfmicro_update();
+  matrix_scan_user();
 }
diff --git a/tmk_core/protocol/nrf/matrix.c b/tmk_core/protocol/nrf/matrix.c
index 2f2d49093f3d..982042eccec0 100644
--- a/tmk_core/protocol/nrf/matrix.c
+++ b/tmk_core/protocol/nrf/matrix.c
@@ -181,7 +181,7 @@ void matrix_init(void) {
 #if defined(USE_AS_I2C_SLAVE)
   i2cs_init();
 #endif
-  matrix_init_user();
+  matrix_init_quantum();
 }
 
 static inline void set_received_key(ble_switch_state_t key, bool from_slave) {