diff options
author | Drashna Jael're <drashna@live.com> | 2022-03-25 16:19:22 -0700 |
---|---|---|
committer | Drashna Jael're <drashna@live.com> | 2022-03-25 16:19:22 -0700 |
commit | 53ff570bf068e04740f187163774327839dfa68b (patch) | |
tree | 5429e069fc593d484b0b479de422b51ac239be83 /keyboards/planck/ez | |
parent | e8171efc7158ba4ebb24827680b19b775d366b1a (diff) | |
parent | efc9c525b19b33c6e09057218ea64f07f45f9555 (diff) |
Remerge 0.16.x' into firmware21
Diffstat (limited to 'keyboards/planck/ez')
-rw-r--r-- | keyboards/planck/ez/config.h | 2 | ||||
-rw-r--r-- | keyboards/planck/ez/ez.c | 5 | ||||
-rwxr-xr-x | keyboards/planck/ez/rules.mk | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/keyboards/planck/ez/config.h b/keyboards/planck/ez/config.h index 6008d24f92..2475401535 100644 --- a/keyboards/planck/ez/config.h +++ b/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 diff --git a/keyboards/planck/ez/ez.c b/keyboards/planck/ez/ez.c index bfb2fff697..26dbc64d01 100644 --- a/keyboards/planck/ez/ez.c +++ b/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(); diff --git a/keyboards/planck/ez/rules.mk b/keyboards/planck/ez/rules.mk index ed20a3d710..d8494f1843 100755 --- a/keyboards/planck/ez/rules.mk +++ b/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 |