Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Slight tidy up of keyboard task loop (#15725)

Browse source
This commit is contained in:
Joel Challis 2022-01-09 03:50:44 +00:00 committed by GitHub
parent 82d3bdb733
commit 7562f6644f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 48 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
quantum/keyboard.c
View file

@ -349,6 +349,32 @@ void keyboard_init(void) {
keyboard_post_init_kb(); /* Always keep this last */ keyboard_post_init_kb(); /* Always keep this last */
} }
/** \brief keyboard set leds
*
* FIXME: needs doc
*/
void keyboard_set_leds(uint8_t leds) {
if (debug_keyboard) {
debug("keyboard_set_led: ");
debug_hex8(leds);
debug("\n");
}
led_set(leds);
}
/** \brief set host led state
*
* Only sets state if change detected
*/
void led_task(void) {
static uint8_t led_status = 0;
// update LED
if (led_status != host_keyboard_leds()) {
led_status = host_keyboard_leds();
keyboard_set_leds(led_status);
}
}
/** \brief key_event_task /** \brief key_event_task
* *
* This function is responsible for calling into other systems when they need to respond to electrical switch press events. * This function is responsible for calling into other systems when they need to respond to electrical switch press events.
@ -363,28 +389,17 @@ void switch_events(uint8_t row, uint8_t col, bool pressed) {
#endif #endif
} }
/** \brief Keyboard task: Do keyboard routine jobs /** \brief Perform scan of keyboard matrix
* *
* Do routine keyboard jobs: * Any detected changes in state are sent out as part of the processing
*
* * scan matrix
* * handle mouse movements
* * handle midi commands
* * light LEDs
*
* This is repeatedly called as fast as possible.
*/ */
void keyboard_task(void) { bool matrix_scan_task(void) {
static matrix_row_t matrix_prev[MATRIX_ROWS]; static matrix_row_t matrix_prev[MATRIX_ROWS];
static uint8_t led_status = 0;
matrix_row_t matrix_row = 0; matrix_row_t matrix_row = 0;
matrix_row_t matrix_change = 0; matrix_row_t matrix_change = 0;
#ifdef QMK_KEYS_PER_SCAN #ifdef QMK_KEYS_PER_SCAN
uint8_t keys_processed = 0; uint8_t keys_processed = 0;
#endif #endif
#ifdef ENCODER_ENABLE
bool encoders_changed = false;
#endif
uint8_t matrix_changed = matrix_scan(); uint8_t matrix_changed = matrix_scan();
if (matrix_changed) last_matrix_activity_trigger(); if (matrix_changed) last_matrix_activity_trigger();
@ -431,9 +446,24 @@ void keyboard_task(void) {
MATRIX_LOOP_END: MATRIX_LOOP_END:
#ifdef DEBUG_MATRIX_SCAN_RATE
matrix_scan_perf_task(); matrix_scan_perf_task();
#endif return matrix_changed;
}
/** \brief Keyboard task: Do keyboard routine jobs
*
* Do routine keyboard jobs:
*
* * scan matrix
* * handle mouse movements
* * handle midi commands
* * light LEDs
*
* This is repeatedly called as fast as possible.
*/
void keyboard_task(void) {
bool matrix_changed = matrix_scan_task();
(void)matrix_changed;
#if defined(RGBLIGHT_ENABLE) #if defined(RGBLIGHT_ENABLE)
rgblight_task(); rgblight_task();
@ -453,7 +483,7 @@ MATRIX_LOOP_END:
#endif #endif
#ifdef ENCODER_ENABLE #ifdef ENCODER_ENABLE
encoders_changed = encoder_read(); bool encoders_changed = encoder_read();
if (encoders_changed) last_encoder_activity_trigger(); if (encoders_changed) last_encoder_activity_trigger();
#endif #endif
@ -516,22 +546,5 @@ MATRIX_LOOP_END:
programmable_button_send(); programmable_button_send();
#endif #endif
// update LED led_task();
if (led_status != host_keyboard_leds()) {
led_status = host_keyboard_leds();
keyboard_set_leds(led_status);
}
}
/** \brief keyboard set leds
*
* FIXME: needs doc
*/
void keyboard_set_leds(uint8_t leds) {
if (debug_keyboard) {
debug("keyboard_set_led: ");
debug_hex8(leds);
debug("\n");
}
led_set(leds);
} }