Merge pull request qmk#7 from okke-formsma/nrf52-jorne

Call matrix_init_quantum from matrix_init instead of matrix_init_user
Lenbok · Jul 12, 2020 · 608febe · 608febe
2 parents ba34814 + 638693b
commit 608febe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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) {