diff options
| author | Drashna Jaelre <drashna@live.com> | 2021-07-22 21:42:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-22 21:42:59 -0700 |
| commit | 816accda3d48ba6d199644acb0ee5966987a09c8 (patch) | |
| tree | 9a03a3489f1cc668dbf2609ccb990c6cc2d9458d /keyboards/rgbkb/mun | |
| parent | 750f40566a511d78c60ab214bc3d8ce5d47d6883 (diff) | |
Fix errors with matrix_output_unselect_delay function calls (#13645)
Diffstat (limited to 'keyboards/rgbkb/mun')
| -rw-r--r-- | keyboards/rgbkb/mun/matrix.c | 6 | ||||
| -rw-r--r-- | keyboards/rgbkb/mun/mun.c | 10 |
2 files changed, 7 insertions, 9 deletions
diff --git a/keyboards/rgbkb/mun/matrix.c b/keyboards/rgbkb/mun/matrix.c index a0cb7df512..497ab041f4 100644 --- a/keyboards/rgbkb/mun/matrix.c +++ b/keyboards/rgbkb/mun/matrix.c @@ -19,7 +19,7 @@ #include "transactions.h" #define ERROR_DISCONNECT_COUNT 5 -#define ROWS_PER_HAND (MATRIX_ROWS / 2) +#define ROWS_PER_HAND (MATRIX_ROWS / 2) static const pin_t row_pins[ROWS_PER_HAND] = MATRIX_ROW_PINS; static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; @@ -141,7 +141,7 @@ uint8_t matrix_scan(void) { /* Drive row pin high again. */ ATOMIC_BLOCK_FORCEON { writePinHigh(row_pins[row_idx]); } - matrix_output_unselect_delay(); + matrix_output_unselect_delay(row_idx, row_pins[row_idx] != 0); } if (memcmp(raw_matrix, current_matrix, sizeof(current_matrix)) != 0) { @@ -153,4 +153,4 @@ uint8_t matrix_scan(void) { bool remote_changed = matrix_post_scan(); return (uint8_t)(local_changed || remote_changed); -}
\ No newline at end of file +} diff --git a/keyboards/rgbkb/mun/mun.c b/keyboards/rgbkb/mun/mun.c index 5dabecc134..6cc95c46e9 100644 --- a/keyboards/rgbkb/mun/mun.c +++ b/keyboards/rgbkb/mun/mun.c @@ -12,24 +12,22 @@ #include "common_oled.h" #include <transactions.h> -void keyboard_post_init_kb(void) -{ +void keyboard_post_init_kb(void) { touch_encoder_init(); transaction_register_rpc(TOUCH_ENCODER_SYNC, touch_encoder_slave_sync); transaction_register_rpc(RGB_MENU_SYNC, rgb_menu_slave_sync); keyboard_post_init_user(); } -void housekeeping_task_kb(void) -{ +void housekeeping_task_kb(void) { touch_encoder_update(TOUCH_ENCODER_SYNC); rgb_menu_update(RGB_MENU_SYNC); } #if defined(BUSY_WAIT) -void matrix_output_unselect_delay(void) { +void matrix_output_unselect_delay(uint8_t line, bool key_pressed) { for (int32_t i = 0; i < BUSY_WAIT_INSTRUCTIONS; i++) { __asm__ volatile("nop" ::: "memory"); } } -#endif
\ No newline at end of file +#endif |