Add my keymap

[max/tmk_keyboard.git] / tmk_core / common / matrix.c

diff --git a/tmk_core/common/matrix.c b/tmk_core/common/matrix.c
index 9694bd1a87aebd8587e7b06df2bfb5061fb007cc..bfca5930752ebbabd215dcd7751f91ed6354cd9e 100644 (file)
--- a/tmk_core/common/matrix.c
+++ b/tmk_core/common/matrix.c
@@ -33,7 +33,6 @@ uint8_t matrix_cols(void)
 __attribute__ ((weak))
 void matrix_clear(void)
 {
-    matrix_init();
 }
 
 __attribute__ ((weak))
@@ -49,29 +48,28 @@ __attribute__ ((weak))
 void matrix_print(void)
 {
 #if (MATRIX_COLS <= 8)
-    print("r/c 01234567\n");
+    print("\n  01234567\n");
 #elif (MATRIX_COLS <= 16)
-    print("r/c 0123456789ABCDEF\n");
+    print("\n  0123456789ABCDEF\n");
 #elif (MATRIX_COLS <= 32)
-    print("r/c 0123456789ABCDEF0123456789ABCDEF\n");
+    print("\n  0123456789ABCDEF0123456789ABCDEF\n");
 #endif
+
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        xprintf("%02X:", row);
 
 #if (MATRIX_COLS <= 8)
-        print_bin_reverse8(matrix_get_row(row));
+        xprintf("%X:%08b%s\n", row&0xF, bitrev(matrix_get_row(row)),
 #elif (MATRIX_COLS <= 16)
-        print_bin_reverse16(matrix_get_row(row));
+        xprintf("%X:%016b%s\n", row&0xF, bitrev16(matrix_get_row(row)),
 #elif (MATRIX_COLS <= 32)
-        print_bin_reverse32(matrix_get_row(row));
+        xprintf("%X:%032b%s\n", row&0xF, bitrev32(matrix_get_row(row)),
 #endif
-
 #ifdef MATRIX_HAS_GHOST
-        if (matrix_has_ghost_in_row(row)) {
-            print(" <ghost");
-        }
+        matrix_has_ghost_in_row(row) ?  " <ghost" : ""
+#else
+        ""
 #endif
-        print("\n");
+        );
     }
 }