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

2 files changed, 0 insertions, 17 deletions

diff --git a/keyboards/meira/keymaps/default/keymap.c b/keyboards/meira/keymaps/default/keymap.c
index 5c80df0f0..fcb9796d7 100644
--- a/keyboards/meira/keymaps/default/keymap.c
+++ b/keyboards/meira/keymaps/default/keymap.c
@@ -174,14 +174,6 @@ void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
   }
 }
 
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
     case QWERTY:
@@ -304,7 +296,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   }
   return true;
 }
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/meira/meira.c b/keyboards/meira/meira.c
index 1d0db5e99..7879875db 100644
--- a/keyboards/meira/meira.c
+++ b/keyboards/meira/meira.c
@@ -84,11 +84,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
         return process_record_user(keycode, record);
 }
 
-void led_set_kb(uint8_t usb_led) {
-        // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-        led_set_user(usb_led);
-}
-
 void reset_keyboard_kb(){
 #ifdef WATCHDOG_ENABLE
     MCUSR = 0;