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) | |
| download | qmk_firmware-57f408cff59435381f57900c054ba96710a30b3a.tar.gz qmk_firmware-57f408cff59435381f57900c054ba96710a30b3a.zip | |
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 f22e69f6b..879eb337c 100644 --- a/keyboards/hhkb/ansi/matrix.c +++ b/keyboards/hhkb/ansi/matrix.c | |||
| @@ -69,15 +69,17 @@ void matrix_init(void) | |||
| 69 | for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix1[i] = 0x00; | 69 | for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix1[i] = 0x00; |
| 70 | matrix = _matrix0; | 70 | matrix = _matrix0; |
| 71 | matrix_prev = _matrix1; | 71 | matrix_prev = _matrix1; |
| 72 | } | ||
| 73 | 72 | ||
| 74 | __attribute__ ((weak)) | 73 | matrix_init_quantum(); |
| 75 | void matrix_scan_user(void) { | ||
| 76 | } | 74 | } |
| 77 | 75 | ||
| 78 | void matrix_scan_kb(void) { | 76 | __attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); } |
| 79 | matrix_scan_user(); | 77 | |
| 80 | } | 78 | __attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); } |
| 79 | |||
| 80 | __attribute__((weak)) void matrix_init_user(void) {} | ||
| 81 | |||
| 82 | __attribute__((weak)) void matrix_scan_user(void) {} | ||
| 81 | 83 | ||
| 82 | uint8_t matrix_scan(void) | 84 | uint8_t matrix_scan(void) |
| 83 | { | 85 | { |
diff --git a/keyboards/hhkb/jp/matrix.c b/keyboards/hhkb/jp/matrix.c index 437356af6..fed2b3c3a 100644 --- a/keyboards/hhkb/jp/matrix.c +++ b/keyboards/hhkb/jp/matrix.c | |||
| @@ -69,15 +69,17 @@ void matrix_init(void) | |||
| 69 | for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix1[i] = 0x00; | 69 | for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix1[i] = 0x00; |
| 70 | matrix = _matrix0; | 70 | matrix = _matrix0; |
| 71 | matrix_prev = _matrix1; | 71 | matrix_prev = _matrix1; |
| 72 | } | ||
| 73 | 72 | ||
| 74 | __attribute__ ((weak)) | 73 | matrix_init_quantum(); |
| 75 | void matrix_scan_user(void) { | ||
| 76 | } | 74 | } |
| 77 | 75 | ||
| 78 | void matrix_scan_kb(void) { | 76 | __attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); } |
| 79 | matrix_scan_user(); | 77 | |
| 80 | } | 78 | __attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); } |
| 79 | |||
| 80 | __attribute__((weak)) void matrix_init_user(void) {} | ||
| 81 | |||
| 82 | __attribute__((weak)) void matrix_scan_user(void) {} | ||
| 81 | 83 | ||
| 82 | uint8_t matrix_scan(void) | 84 | uint8_t matrix_scan(void) |
| 83 | { | 85 | { |