Merge branch 'master' into debounce_refactor

# Conflicts:
#	tmk_core/common/keyboard.c

1 files changed, 4 insertions, 0 deletions

diff --git a/keyboards/bigswitch/bigswitch.c b/keyboards/bigswitch/bigswitch.c
index dfd9710e27..32f9f7fab8 100644
--- a/keyboards/bigswitch/bigswitch.c
+++ b/keyboards/bigswitch/bigswitch.c
@@ -19,15 +19,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 volatile uint8_t runonce = true;
 static uint16_t my_timer;
 
+__attribute__ ((weak))
 void matrix_init_user(void) {
   my_timer = timer_read();
 }
 
+__attribute__ ((weak))
 void matrix_scan_user(void) {
+#if defined(RGBLIGHT_ENABLE)
   if (runonce && timer_elapsed(my_timer) > 1000) {
     runonce = false;
     rgblight_sethsv_noeeprom(0x0, 0xff, 0x80);
     rgblight_mode_noeeprom(9);
     rgblight_enable_noeeprom();
   }
+#endif
 }