Skip to content

Commit 0866323

Browse files
committed
core: Change matrix_init and matrix_print
1 parent 0dbf73d commit 0866323

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

common/matrix.c

+8-10
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ uint8_t matrix_cols(void)
3333
__attribute__ ((weak))
3434
void matrix_clear(void)
3535
{
36-
matrix_init();
3736
}
3837

3938
__attribute__ ((weak))
@@ -55,23 +54,22 @@ void matrix_print(void)
5554
#elif (MATRIX_COLS <= 32)
5655
print("r/c 0123456789ABCDEF0123456789ABCDEF\n");
5756
#endif
57+
5858
for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
59-
xprintf("%02X:", row);
6059

6160
#if (MATRIX_COLS <= 8)
62-
print_bin_reverse8(matrix_get_row(row));
61+
xprintf("%02X: %08b%s\n", row, bitrev(matrix_get_row(row)),
6362
#elif (MATRIX_COLS <= 16)
64-
print_bin_reverse16(matrix_get_row(row));
63+
xprintf("%02X: %016b%s\n", row, bitrev16(matrix_get_row(row)),
6564
#elif (MATRIX_COLS <= 32)
66-
print_bin_reverse32(matrix_get_row(row));
65+
xprintf("%02X: %032b%s\n", row, bitrev32(matrix_get_row(row)),
6766
#endif
68-
6967
#ifdef MATRIX_HAS_GHOST
70-
if (matrix_has_ghost_in_row(row)) {
71-
print(" <ghost");
72-
}
68+
matrix_has_ghost_in_row(row) ? " <ghost" : ""
69+
#else
70+
""
7371
#endif
74-
print("\n");
72+
);
7573
}
7674
}
7775

common/matrix.h

+4
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ typedef uint32_t matrix_row_t;
3232
#error "MATRIX_COLS: invalid value"
3333
#endif
3434

35+
#if (MATRIX_ROWS > 255)
36+
#error "MATRIX_ROWS must not exceed 255"
37+
#endif
38+
3539
#define MATRIX_IS_ON(row, col) (matrix_get_row(row) && (1<<col))
3640

3741

0 commit comments

Comments
 (0)