correct items from merge

keyboards/planck/planck.h

@@ -3,7 +3,7 @@
 
 #include "quantum.h"
 
-//#define encoder_update(clockwise) encoder_update_user(uint8_t index, clockwise)
+#define encoder_update(clockwise) encoder_update_user(uint8_t index, clockwise)
 
 #ifdef __AVR__
 #define LAYOUT_planck_mit( \

keyboards/planck/rev6/matrix.c

@@ -90,6 +90,7 @@ uint8_t matrix_scan(void) {
         dip_update(i, dip_switch[i]);
     }
     memcpy(last_dip_switch, dip_switch, sizeof(&dip_switch));
+
     // actual matrix
     for (int col = 0; col < MATRIX_COLS; col++) {
         matrix_row_t data = 0;

quantum/rgb_matrix.c

@@ -889,28 +889,6 @@ uint8_t decrement( uint8_t value, uint8_t step, uint8_t min, uint8_t max ) {
 //     }
 // }
 
-void rgb_matrix_test_led( uint8_t index, bool red, bool green, bool blue ) {
-    for ( int i=0; i<DRIVER_LED_TOTAL; i++ )
-    {
-        if ( i == index )
-        {
-#ifdef IS31FL3731
-            IS31FL3731_set_led_control_register( i, red, green, blue );
-#elif defined (IS31FL3733)
-            IS31FL3733_set_led_control_register( i, red, green, blue );
-#endif
-        }
-        else
-        {
-#ifdef IS31FL3731
-            IS31FL3731_set_led_control_register( i, false, false, false );
-#elif defined (IS31FL3733)
-            IS31FL3733_set_led_control_register( i, false, false, false );
-#endif
-        }
-    }
-}
-
 uint32_t rgb_matrix_get_tick(void) {
     return g_tick;
 }

quantum/rgb_matrix.h

@@ -25,10 +25,8 @@
 #include "quantum.h"
 
 #ifdef IS31FL3731
-    #include "i2c_master.h"
     #include "is31fl3731.h"
 #elif defined (IS31FL3733)
-    #include "i2c_master.h"
     #include "is31fl3733.h"
 #elif defined (WS2812)
     #include "ws2812.h"

quantum/rgblight.c

@@ -306,9 +306,9 @@ void rgblight_disable(void) {
   rgblight_config.enable = 0;
   eeconfig_update_rgblight(rgblight_config.raw);
   xprintf("rgblight disable [EEPROM]: rgblight_config.enable = %u\n", rgblight_config.enable);
-  #ifdef RGBLIGHT_ANIMATIONS
-    rgblight_timer_disable();
-  #endif
+#ifdef RGBLIGHT_USE_TIMER
+      rgblight_timer_disable();
+#endif
   wait_ms(50);
   rgblight_set();
 }
@@ -318,7 +318,7 @@ void rgblight_disable_noeeprom(void) {
   xprintf("rgblight disable [noEEPROM]: rgblight_config.enable = %u\n", rgblight_config.enable);
 #ifdef RGBLIGHT_USE_TIMER
     rgblight_timer_disable();
-  #endif
+#endif
   wait_ms(50);
   rgblight_set();
 }