Remerge 0.16.x' into firmware21

keyboards/planck/ez/config.h

@@ -107,8 +107,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 #define DRIVER_ADDR_1 0b1010000
 

keyboards/planck/ez/ez.c

@@ -106,6 +106,7 @@ led_config_t g_led_config = { {
     1, 1, 1, 1, 1, 4, 1, 1, 1, 1, 1
 } };
 
+<<<<<<< HEAD
 void suspend_power_down_kb(void) {
     rgb_matrix_set_color_all(0, 0, 0);
     rgb_matrix_set_suspend_state(true);
@@ -120,6 +121,8 @@ void keyboard_post_init_kb(void) {
     rgb_matrix_enable_noeeprom();
     keyboard_post_init_user();
 }
+=======
+>>>>>>> qmk/master
 #endif
 
 /* Left B9   Right B8 */
@@ -241,7 +244,7 @@ layer_state_t layer_state_set_kb(layer_state_t state) {
     planck_ez_left_led_off();
     planck_ez_right_led_off();
     state = layer_state_set_user(state);
-    uint8_t layer = biton32(state);
+    uint8_t layer = get_highest_layer(state);
     switch (layer) {
         case 1:
             planck_ez_left_led_on();

keyboards/planck/ez/rules.mk

@@ -16,7 +16,7 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = yes          # Audio output
 AUDIO_DRIVER = dac_additive
-RGBLIGHT_ENABLE = no
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 
 ENCODER_ENABLE = yes
 RGB_MATRIX_DRIVER = IS31FL3737
@@ -28,3 +28,5 @@ LAYOUTS_HAS_RGB = no
 RGB_MATRIX_SUPPORTED = yes
 RGBLIGHT_SUPPORTED = no
 BAKCLIGHT_SUPPORTED = no
+
+MOUSE_SHARED_EP = no