diff options
author | Ray Cielencki <rayslinky@users.noreply.github.com> | 2019-03-03 13:25:08 -0500 |
---|---|---|
committer | Drashna Jaelre <drashna@live.com> | 2019-03-03 10:25:08 -0800 |
commit | 6aba3ce9d2bd108c5a7cc65625085505677fca17 (patch) | |
tree | 666e0bcb085321e053f9741fd36d72d3e56fda1a /keyboards | |
parent | 79e0964d2194a26fc011547006a6fc3f8a99947a (diff) | |
download | qmk_firmware-6aba3ce9d2bd108c5a7cc65625085505677fca17.tar.gz qmk_firmware-6aba3ce9d2bd108c5a7cc65625085505677fca17.zip |
[Keyboard] Add support for matrix_scan_user to usb-usb converter (#5291)
* [Keyboard] Add support for matrix_scan_user to usb-usb converter
* update to matrix_scan_quantum
* also add init calls
Diffstat (limited to 'keyboards')
-rw-r--r-- | keyboards/converter/usb_usb/custom_matrix.cpp | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/keyboards/converter/usb_usb/custom_matrix.cpp b/keyboards/converter/usb_usb/custom_matrix.cpp index fba107c7cb..2f7703d058 100644 --- a/keyboards/converter/usb_usb/custom_matrix.cpp +++ b/keyboards/converter/usb_usb/custom_matrix.cpp @@ -98,6 +98,7 @@ extern "C" kbd2.SetReportParser(0, (HIDReportParser*)&kbd_parser2); kbd3.SetReportParser(0, (HIDReportParser*)&kbd_parser3); kbd4.SetReportParser(0, (HIDReportParser*)&kbd_parser4); + matrix_init_quantum(); } static void or_report(report_keyboard_t report) { @@ -115,6 +116,25 @@ extern "C" } } + __attribute__ ((weak)) + void matrix_init_kb(void) { + matrix_init_user(); + } + + __attribute__ ((weak)) + void matrix_init_user(void) { + matrix_init_user(); + } + + __attribute__ ((weak)) + void matrix_scan_kb(void) { + matrix_scan_user(); + } + + __attribute__ ((weak)) + void matrix_scan_user(void) { + } + uint8_t matrix_scan(void) { static uint16_t last_time_stamp1 = 0; static uint16_t last_time_stamp2 = 0; @@ -169,6 +189,7 @@ extern "C" keyboard_set_leds(host_keyboard_leds()); } } + matrix_scan_quantum(); return 1; } |