diff options
| author | Joshua Rubin <joshuarubin@users.noreply.github.com> | 2020-07-19 20:25:30 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-19 19:25:30 -0700 |
| commit | 57f408cff59435381f57900c054ba96710a30b3a (patch) | |
| tree | 7ef616faaae9859753de7a9e6445f86cc72d7757 | |
| parent | c4d778a302462929ba71a4746afa1f21f10922c2 (diff) | |
ensure hhkb runs matrix_init_quantum (#9629)
| -rw-r--r-- | keyboards/hhkb/ansi/matrix.c | 14 | ||||
| -rw-r--r-- | keyboards/hhkb/jp/matrix.c | 14 |
2 files changed, 16 insertions, 12 deletions
diff --git a/keyboards/hhkb/ansi/matrix.c b/keyboards/hhkb/ansi/matrix.c index f22e69f6b0..879eb337cf 100644 --- a/keyboards/hhkb/ansi/matrix.c +++ b/keyboards/hhkb/ansi/matrix.c @@ -69,15 +69,17 @@ void matrix_init(void) for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix1[i] = 0x00; matrix = _matrix0; matrix_prev = _matrix1; -} -__attribute__ ((weak)) -void matrix_scan_user(void) { + matrix_init_quantum(); } -void matrix_scan_kb(void) { - matrix_scan_user(); -} +__attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); } + +__attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); } + +__attribute__((weak)) void matrix_init_user(void) {} + +__attribute__((weak)) void matrix_scan_user(void) {} uint8_t matrix_scan(void) { diff --git a/keyboards/hhkb/jp/matrix.c b/keyboards/hhkb/jp/matrix.c index 437356af6d..fed2b3c3a9 100644 --- a/keyboards/hhkb/jp/matrix.c +++ b/keyboards/hhkb/jp/matrix.c @@ -69,15 +69,17 @@ void matrix_init(void) for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix1[i] = 0x00; matrix = _matrix0; matrix_prev = _matrix1; -} -__attribute__ ((weak)) -void matrix_scan_user(void) { + matrix_init_quantum(); } -void matrix_scan_kb(void) { - matrix_scan_user(); -} +__attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); } + +__attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); } + +__attribute__((weak)) void matrix_init_user(void) {} + +__attribute__((weak)) void matrix_scan_user(void) {} uint8_t matrix_scan(void) { |