Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Relocate matrix_scan_quantum tasks #15882

Merged
merged 3 commits into from
Jan 19, 2022
Merged

Relocate matrix_scan_quantum tasks #15882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be1398d
Move matrix_scan_quantum tasks
zvecr Jan 15, 2022
58a7a05
Fix tests
zvecr Jan 15, 2022
328c48f
Fix up missing refs
zvecr Jan 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 70 additions & 0 deletions quantum/keyboard.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include <stdint.h>
#include "quantum.h"
#include "keyboard.h"
#include "matrix.h"
#include "keymap.h"
Expand Down Expand Up @@ -450,6 +451,73 @@ bool matrix_scan_task(void) {
return matrix_changed;
}

/** \brief Tasks previously located in matrix_scan_quantum
*
* TODO: rationalise against keyboard_task and current split role
*/
void quantum_task(void) {
#ifdef SPLIT_KEYBOARD
// some tasks should only run on master
if (!is_keyboard_master()) return;
#endif

#if defined(AUDIO_ENABLE) && defined(AUDIO_INIT_DELAY)
// There are some tasks that need to be run a little bit
// after keyboard startup, or else they will not work correctly
// because of interaction with the USB device state, which
// may still be in flux...
//
// At the moment the only feature that needs this is the
// startup song.
static bool delayed_tasks_run = false;
static uint16_t delayed_task_timer = 0;
if (!delayed_tasks_run) {
if (!delayed_task_timer) {
delayed_task_timer = timer_read();
} else if (timer_elapsed(delayed_task_timer) > 300) {
audio_startup();
delayed_tasks_run = true;
}
}
#endif

#if defined(AUDIO_ENABLE) && !defined(NO_MUSIC_MODE)
music_task();
#endif

#ifdef KEY_OVERRIDE_ENABLE
key_override_task();
#endif

#ifdef SEQUENCER_ENABLE
sequencer_task();
#endif

#ifdef TAP_DANCE_ENABLE
tap_dance_task();
#endif

#ifdef COMBO_ENABLE
combo_task();
#endif

#ifdef WPM_ENABLE
decay_wpm();
#endif

#ifdef HAPTIC_ENABLE
haptic_task();
#endif

#ifdef DIP_SWITCH_ENABLE
dip_switch_read(false);
#endif

#ifdef AUTO_SHIFT_ENABLE
autoshift_matrix_scan();
#endif
}

/** \brief Keyboard task: Do keyboard routine jobs
*
* Do routine keyboard jobs:
Expand All @@ -465,6 +533,8 @@ void keyboard_task(void) {
bool matrix_changed = matrix_scan_task();
(void)matrix_changed;

quantum_task();

#if defined(RGBLIGHT_ENABLE)
rgblight_task();
#endif
Expand Down
73 changes: 2 additions & 71 deletions quantum/quantum.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@ float default_layer_songs[][16][2] = DEFAULT_LAYER_SONGS;
# endif
#endif

#ifdef AUTO_SHIFT_ENABLE
# include "process_auto_shift.h"
#endif

uint8_t extract_mod_bits(uint16_t code) {
switch (code) {
case QK_MODS ... QK_MODS_MAX:
Expand Down Expand Up @@ -400,73 +396,8 @@ void matrix_init_quantum() {
matrix_init_kb();
}

void matrix_scan_quantum() {
#if defined(AUDIO_ENABLE) && defined(AUDIO_INIT_DELAY)
// There are some tasks that need to be run a little bit
// after keyboard startup, or else they will not work correctly
// because of interaction with the USB device state, which
// may still be in flux...
//
// At the moment the only feature that needs this is the
// startup song.
static bool delayed_tasks_run = false;
static uint16_t delayed_task_timer = 0;
if (!delayed_tasks_run) {
if (!delayed_task_timer) {
delayed_task_timer = timer_read();
} else if (timer_elapsed(delayed_task_timer) > 300) {
audio_startup();
delayed_tasks_run = true;
}
}
#endif

#if defined(AUDIO_ENABLE) && !defined(NO_MUSIC_MODE)
music_task();
#endif

#ifdef KEY_OVERRIDE_ENABLE
key_override_task();
#endif

#ifdef SEQUENCER_ENABLE
sequencer_task();
#endif

#ifdef TAP_DANCE_ENABLE
tap_dance_task();
#endif

#ifdef COMBO_ENABLE
combo_task();
#endif

#ifdef LED_MATRIX_ENABLE
led_matrix_task();
#endif

#ifdef WPM_ENABLE
decay_wpm();
#endif

#ifdef HAPTIC_ENABLE
haptic_task();
#endif

#ifdef DIP_SWITCH_ENABLE
dip_switch_read(false);
#endif

#ifdef AUTO_SHIFT_ENABLE
autoshift_matrix_scan();
#endif

matrix_scan_kb();
}

#ifdef HD44780_ENABLED
# include "hd44780.h"
#endif
// TODO: remove legacy api
void matrix_scan_quantum() { matrix_scan_kb(); }

//------------------------------------------------------------------------------
// Override these functions in your keymap file to play different tunes on
Expand Down