diff options
Diffstat (limited to 'users/drashna/drashna.c')
| -rw-r--r-- | users/drashna/drashna.c | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/users/drashna/drashna.c b/users/drashna/drashna.c index b54d0cfcc..4cef5433d 100644 --- a/users/drashna/drashna.c +++ b/users/drashna/drashna.c | |||
| @@ -103,12 +103,12 @@ void shutdown_user(void) { | |||
| 103 | rgblight_enable_noeeprom(); | 103 | rgblight_enable_noeeprom(); |
| 104 | rgblight_mode_noeeprom(1); | 104 | rgblight_mode_noeeprom(1); |
| 105 | rgblight_setrgb_red(); | 105 | rgblight_setrgb_red(); |
| 106 | #endif // RGBLIGHT_ENABLE | 106 | #endif // RGBLIGHT_ENABLE |
| 107 | #ifdef RGB_MATRIX_ENABLE | 107 | #ifdef RGB_MATRIX_ENABLE |
| 108 | rgb_matrix_set_color_all(0xFF, 0x00, 0x00); | 108 | rgb_matrix_set_color_all(0xFF, 0x00, 0x00); |
| 109 | rgb_matrix_update_pwm_buffers(); | 109 | rgb_matrix_update_pwm_buffers(); |
| 110 | 110 | ||
| 111 | #endif // RGB_MATRIX_ENABLE | 111 | #endif // RGB_MATRIX_ENABLE |
| 112 | shutdown_keymap(); | 112 | shutdown_keymap(); |
| 113 | } | 113 | } |
| 114 | 114 | ||
| @@ -124,8 +124,12 @@ void suspend_power_down_user(void) { | |||
| 124 | __attribute__((weak)) void suspend_wakeup_init_keymap(void) {} | 124 | __attribute__((weak)) void suspend_wakeup_init_keymap(void) {} |
| 125 | 125 | ||
| 126 | void suspend_wakeup_init_user(void) { | 126 | void suspend_wakeup_init_user(void) { |
| 127 | if (layer_state_is(_GAMEPAD)) { layer_off(_GAMEPAD); } | 127 | if (layer_state_is(_GAMEPAD)) { |
| 128 | if (layer_state_is(_DIABLO)) { layer_off(_DIABLO); } | 128 | layer_off(_GAMEPAD); |
| 129 | } | ||
| 130 | if (layer_state_is(_DIABLO)) { | ||
| 131 | layer_off(_DIABLO); | ||
| 132 | } | ||
| 129 | suspend_wakeup_init_keymap(); | 133 | suspend_wakeup_init_keymap(); |
| 130 | } | 134 | } |
| 131 | 135 | ||
| @@ -142,13 +146,13 @@ void matrix_scan_user(void) { | |||
| 142 | startup_user(); | 146 | startup_user(); |
| 143 | } | 147 | } |
| 144 | 148 | ||
| 145 | #ifdef TAP_DANCE_ENABLE // Run Diablo 3 macro checking code. | 149 | #ifdef TAP_DANCE_ENABLE // Run Diablo 3 macro checking code. |
| 146 | run_diablo_macro_check(); | 150 | run_diablo_macro_check(); |
| 147 | #endif // TAP_DANCE_ENABLE | 151 | #endif // TAP_DANCE_ENABLE |
| 148 | 152 | ||
| 149 | #if defined(RGBLIGHT_ENABLE) | 153 | #if defined(RGBLIGHT_ENABLE) |
| 150 | matrix_scan_rgb_light(); | 154 | matrix_scan_rgb_light(); |
| 151 | #endif // RGBLIGHT_ENABLE | 155 | #endif // RGBLIGHT_ENABLE |
| 152 | #if defined(RGB_MATRIX_ENABLE) | 156 | #if defined(RGB_MATRIX_ENABLE) |
| 153 | matrix_scan_rgb_matrix(); | 157 | matrix_scan_rgb_matrix(); |
| 154 | #endif | 158 | #endif |
| @@ -167,13 +171,15 @@ __attribute__((weak)) layer_state_t layer_state_set_keymap(layer_state_t state) | |||
| 167 | // on layer change, no matter where the change was initiated | 171 | // on layer change, no matter where the change was initiated |
| 168 | // Then runs keymap's layer change check | 172 | // Then runs keymap's layer change check |
| 169 | layer_state_t layer_state_set_user(layer_state_t state) { | 173 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 170 | if (!is_keyboard_master()) { return state; } | 174 | if (!is_keyboard_master()) { |
| 175 | return state; | ||
| 176 | } | ||
| 171 | 177 | ||
| 172 | state = layer_state_set_keymap(state); | 178 | state = layer_state_set_keymap(state); |
| 173 | state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST); | 179 | state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST); |
| 174 | #if defined(RGBLIGHT_ENABLE) | 180 | #if defined(RGBLIGHT_ENABLE) |
| 175 | state = layer_state_set_rgb_light(state); | 181 | state = layer_state_set_rgb_light(state); |
| 176 | #endif // RGBLIGHT_ENABLE | 182 | #endif // RGBLIGHT_ENABLE |
| 177 | #if defined(AUDIO_ENABLE) && !defined(__arm__) | 183 | #if defined(AUDIO_ENABLE) && !defined(__arm__) |
| 178 | static bool is_gamepad_on = false; | 184 | static bool is_gamepad_on = false; |
| 179 | if (layer_state_cmp(state, _GAMEPAD) != is_gamepad_on) { | 185 | if (layer_state_cmp(state, _GAMEPAD) != is_gamepad_on) { |
| @@ -192,13 +198,15 @@ __attribute__((weak)) layer_state_t default_layer_state_set_keymap(layer_state_t | |||
| 192 | 198 | ||
| 193 | // Runs state check and changes underglow color and animation | 199 | // Runs state check and changes underglow color and animation |
| 194 | layer_state_t default_layer_state_set_user(layer_state_t state) { | 200 | layer_state_t default_layer_state_set_user(layer_state_t state) { |
| 195 | if (!is_keyboard_master()) { return state; } | 201 | if (!is_keyboard_master()) { |
| 202 | return state; | ||
| 203 | } | ||
| 196 | 204 | ||
| 197 | state = default_layer_state_set_keymap(state); | 205 | state = default_layer_state_set_keymap(state); |
| 198 | #if 0 | 206 | #if 0 |
| 199 | # if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) | 207 | # if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) |
| 200 | state = default_layer_state_set_rgb(state); | 208 | state = default_layer_state_set_rgb(state); |
| 201 | # endif // RGBLIGHT_ENABLE | 209 | # endif // RGBLIGHT_ENABLE |
| 202 | #endif | 210 | #endif |
| 203 | return state; | 211 | return state; |
| 204 | } | 212 | } |
