Merge remote-tracking branch 'origin/master' into develop

keyboards/ergodox_infinity/ergodox_infinity.c

@@ -137,13 +137,6 @@ void matrix_init_kb(void) {
     matrix_init_user();
 }
 
-void matrix_scan_kb(void) {
-    // put your looping keyboard code here
-    // runs every cycle (a lot)
-
-    matrix_scan_user();
-}
-
 __attribute__ ((weak)) void ergodox_board_led_on(void) {}
 
 __attribute__ ((weak)) void ergodox_right_led_1_on(void) {}

keyboards/ergodox_infinity/keymaps/default/keymap.c

@@ -164,12 +164,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   return true;
 }
 
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-
-}
-
-
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {