diff options
| author | Drashna Jaelre <drashna@live.com> | 2021-08-24 01:37:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-24 01:37:14 -0700 |
| commit | bc239cd52022ea7ca26310faa9ed98e3faa81cb6 (patch) | |
| tree | fea0d67477102aafbbfcff46f4a761747ac169ae /users/drashna | |
| parent | 4e1c5887c5c08ebd2cf7868c8d9292aa728e7bf0 (diff) | |
[Keymap] Drashna keymap fixups (#14140)
Diffstat (limited to 'users/drashna')
| -rw-r--r-- | users/drashna/drashna.c | 2 | ||||
| -rw-r--r-- | users/drashna/drashna.h | 7 | ||||
| -rw-r--r-- | users/drashna/transport_sync.c | 11 |
3 files changed, 7 insertions, 13 deletions
diff --git a/users/drashna/drashna.c b/users/drashna/drashna.c index 13421f39d7..3423e379a1 100644 --- a/users/drashna/drashna.c +++ b/users/drashna/drashna.c @@ -172,7 +172,6 @@ layer_state_t layer_state_set_user(layer_state_t state) { return state; } - state = layer_state_set_keymap(state); state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST); #if defined(RGBLIGHT_ENABLE) state = layer_state_set_rgb_light(state); @@ -188,6 +187,7 @@ layer_state_t layer_state_set_user(layer_state_t state) { } } #endif + state = layer_state_set_keymap(state); return state; } diff --git a/users/drashna/drashna.h b/users/drashna/drashna.h index a1fa3ffa92..af26fdc433 100644 --- a/users/drashna/drashna.h +++ b/users/drashna/drashna.h @@ -76,10 +76,15 @@ enum userspace_layers { #endif #define DEFAULT_LAYER_1_HSV HSV_CYAN -#define DEFAULT_LAYER_2_HSV HSV_SPRINGGREEN +#define DEFAULT_LAYER_2_HSV HSV_CHARTREUSE #define DEFAULT_LAYER_3_HSV HSV_MAGENTA #define DEFAULT_LAYER_4_HSV HSV_GOLDENROD +#define DEFAULT_LAYER_1_RGB RGB_CYAN +#define DEFAULT_LAYER_2_RGB RGB_CHARTREUSE +#define DEFAULT_LAYER_3_RGB RGB_MAGENTA +#define DEFAULT_LAYER_4_RGB RGB_GOLDENROD + bool mod_key_press_timer(uint16_t code, uint16_t mod_code, bool pressed); bool mod_key_press(uint16_t code, uint16_t mod_code, bool pressed, uint16_t this_timer); void matrix_init_keymap(void); diff --git a/users/drashna/transport_sync.c b/users/drashna/transport_sync.c index 38434751e6..fdd596c04c 100644 --- a/users/drashna/transport_sync.c +++ b/users/drashna/transport_sync.c @@ -71,10 +71,6 @@ void keyboard_post_init_transport_sync(void) { void user_transport_update(void) { if (is_keyboard_master()) { -# ifdef OLED_ENABLE - user_state.oled_on = is_oled_on(); -# endif - transport_keymap_config = keymap_config.raw; transport_userspace_config = userspace_config.raw; #ifdef AUDIO_ENABLE @@ -89,13 +85,6 @@ void user_transport_update(void) { #endif } else { -# ifdef OLED_ENABLE - if (user_state.oled_on) { - oled_on(); - } else { - oled_off(); - } -# endif keymap_config.raw = transport_keymap_config; userspace_config.raw = transport_userspace_config; #ifdef UNICODE_ENABLE |