diff options
author | Wilba <Jason.S.Williams@gmail.com> | 2020-01-04 07:52:00 +1100 |
---|---|---|
committer | Drashna Jaelre <drashna@live.com> | 2020-01-03 12:52:00 -0800 |
commit | 320822d75b785401809f45007320e6fb6885b3fd (patch) | |
tree | c511d49a48b953ac29ffb4a51ac928319eb9fde4 /quantum/quantum.c | |
parent | b36259566546eb884cc241bcfadb671051e5e75e (diff) | |
download | qmk_firmware-320822d75b785401809f45007320e6fb6885b3fd.tar.gz qmk_firmware-320822d75b785401809f45007320e6fb6885b3fd.zip |
VIA Configurator Refactor (#7268)
* VIA Refactor
* Remove old code
* review changes
* review changes
* Fix cannonkeys/satisfaction75/prototype:via build
* Add via.h to quantum.h
* Move backlight init to after backlight config load
* Merge branch 'master' into via_refactor_pr
* Update user's rules.mk to new way of enabling VIA
* Added id_switch_matrix_state
* Review changes
Diffstat (limited to 'quantum/quantum.c')
-rw-r--r-- | quantum/quantum.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c index 695da5fdc..bf159644a 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c | |||
@@ -213,6 +213,9 @@ bool process_record_quantum(keyrecord_t *record) { | |||
213 | #if defined(RGB_MATRIX_ENABLE) | 213 | #if defined(RGB_MATRIX_ENABLE) |
214 | process_rgb_matrix(keycode, record) && | 214 | process_rgb_matrix(keycode, record) && |
215 | #endif | 215 | #endif |
216 | #if defined(VIA_ENABLE) | ||
217 | process_record_via(keycode, record) && | ||
218 | #endif | ||
216 | process_record_kb(keycode, record) && | 219 | process_record_kb(keycode, record) && |
217 | #if defined(MIDI_ENABLE) && defined(MIDI_ADVANCED) | 220 | #if defined(MIDI_ENABLE) && defined(MIDI_ADVANCED) |
218 | process_midi(keycode, record) && | 221 | process_midi(keycode, record) && |
@@ -560,9 +563,7 @@ __attribute__((weak)) void bootmagic_lite(void) { | |||
560 | 563 | ||
561 | // We need multiple scans because debouncing can't be turned off. | 564 | // We need multiple scans because debouncing can't be turned off. |
562 | matrix_scan(); | 565 | matrix_scan(); |
563 | #if defined(DEBOUNCING_DELAY) && DEBOUNCING_DELAY > 0 | 566 | #if defined(DEBOUNCE) && DEBOUNCE > 0 |
564 | wait_ms(DEBOUNCING_DELAY * 2); | ||
565 | #elif defined(DEBOUNCE) && DEBOUNCE > 0 | ||
566 | wait_ms(DEBOUNCE * 2); | 567 | wait_ms(DEBOUNCE * 2); |
567 | #else | 568 | #else |
568 | wait_ms(30); | 569 | wait_ms(30); |