diff options
| author | Drashna Jaelre <drashna@live.com> | 2021-09-29 11:16:11 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-29 11:16:11 -0700 |
| commit | 1e54796f0cf469e2c1fdd880cc288b04e7b83985 (patch) | |
| tree | bdcc76205faf3e7ec325fd73d36e932cdc0441da /users/drashna/drashna.c | |
| parent | 929d959ef9e2572b4744930d86e322936e6e1f0e (diff) | |
| download | qmk_firmware-1e54796f0cf469e2c1fdd880cc288b04e7b83985.tar.gz qmk_firmware-1e54796f0cf469e2c1fdd880cc288b04e7b83985.zip | |
[Keymap] Update to Drashna Code (#14644)
Diffstat (limited to 'users/drashna/drashna.c')
| -rw-r--r-- | users/drashna/drashna.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/users/drashna/drashna.c b/users/drashna/drashna.c index 3423e379a..871136c13 100644 --- a/users/drashna/drashna.c +++ b/users/drashna/drashna.c | |||
| @@ -73,11 +73,6 @@ void matrix_init_user(void) { | |||
| 73 | 73 | ||
| 74 | matrix_init_secret(); | 74 | matrix_init_secret(); |
| 75 | matrix_init_keymap(); | 75 | matrix_init_keymap(); |
| 76 | #if defined(AUDIO_ENABLE) && defined(SPLIT_KEYBOARD) | ||
| 77 | if (!is_keyboard_master()) { | ||
| 78 | stop_all_notes(); | ||
| 79 | } | ||
| 80 | #endif | ||
| 81 | } | 76 | } |
| 82 | 77 | ||
| 83 | __attribute__((weak)) void keyboard_post_init_keymap(void) {} | 78 | __attribute__((weak)) void keyboard_post_init_keymap(void) {} |
| @@ -227,16 +222,15 @@ bool hasAllBitsInMask(uint8_t value, uint8_t mask) { | |||
| 227 | } | 222 | } |
| 228 | 223 | ||
| 229 | #ifdef SPLIT_KEYBOARD | 224 | #ifdef SPLIT_KEYBOARD |
| 230 | # if defined(AUDIO_ENABLE) | ||
| 231 | bool delayed_tasks_run = false; | ||
| 232 | # endif | ||
| 233 | __attribute__((weak)) void matrix_slave_scan_keymap(void) {} | 225 | __attribute__((weak)) void matrix_slave_scan_keymap(void) {} |
| 234 | void matrix_slave_scan_user(void) { | 226 | void matrix_slave_scan_user(void) { |
| 235 | # if defined(AUDIO_ENABLE) | 227 | # if defined(AUDIO_ENABLE) |
| 236 | # if !defined(NO_MUSIC_MODE) | 228 | # if !defined(NO_MUSIC_MODE) |
| 237 | music_task(); | 229 | music_task(); |
| 238 | # endif | 230 | # endif |
| 231 | # ifdef AUDIO_INIT_DELAY | ||
| 239 | if (!is_keyboard_master()) { | 232 | if (!is_keyboard_master()) { |
| 233 | static bool delayed_tasks_run = false; | ||
| 240 | static uint16_t delayed_task_timer = 0; | 234 | static uint16_t delayed_task_timer = 0; |
| 241 | if (!delayed_tasks_run) { | 235 | if (!delayed_tasks_run) { |
| 242 | if (!delayed_task_timer) { | 236 | if (!delayed_task_timer) { |
| @@ -247,6 +241,7 @@ void matrix_slave_scan_user(void) { | |||
| 247 | } | 241 | } |
| 248 | } | 242 | } |
| 249 | } | 243 | } |
| 244 | # endif | ||
| 250 | # endif | 245 | # endif |
| 251 | # ifdef SEQUENCER_ENABLE | 246 | # ifdef SEQUENCER_ENABLE |
| 252 | sequencer_task(); | 247 | sequencer_task(); |
