71 files changed, 107 insertions(+), 117 deletions(-)

M keyboards/40percentclub/ut47/matrix.c
M keyboards/ai03/orbit/matrix.c
M keyboards/amj96/matrix.c
M keyboards/angel64/alpha/matrix.c
M keyboards/angel64/rev1/matrix.c
M keyboards/bpiphany/pegasushoof/2013/matrix.c
M keyboards/bpiphany/pegasushoof/2015/matrix.c
M keyboards/centromere/matrix.c
M keyboards/chimera_ergo/matrix.c
M keyboards/chimera_ls/matrix.c
M keyboards/chimera_ortho/matrix.c
M keyboards/chimera_ortho_plus/matrix.c
M keyboards/comet46/matrix.c
M keyboards/converter/adb_usb/matrix.c
M keyboards/converter/hp_46010a/matrix.c
M keyboards/converter/ibm_5291/matrix.c
M keyboards/converter/m0110_usb/matrix.c
M keyboards/converter/palm_usb/matrix.c
M keyboards/converter/sun_usb/matrix.c
M keyboards/converter/xt_usb/matrix.c
M keyboards/crkbd/rev1/legacy/matrix.c
M keyboards/dc01/arrow/matrix.c
M keyboards/dc01/left/matrix.c
M keyboards/dc01/numpad/matrix.c
M keyboards/dc01/right/matrix.c
M keyboards/dichotomy/matrix.c
M keyboards/dm9records/ergoinu/matrix.c
M keyboards/ergodone/matrix.c
M keyboards/ergotaco/matrix.c
M keyboards/georgi/matrix.c
M keyboards/gergo/matrix.c
M keyboards/handwired/dactyl/matrix.c
M keyboards/handwired/datahand/matrix.c
M keyboards/handwired/frenchdev/matrix.c
M keyboards/handwired/not_so_minidox/matrix.c
M keyboards/handwired/owlet60/matrix.c
M keyboards/handwired/promethium/matrix.c
M keyboards/handwired/pterodactyl/matrix.c
M keyboards/helix/pico/matrix.c
M keyboards/helix/rev1/matrix.c
M keyboards/helix/rev2/matrix.c
M keyboards/hid_liber/matrix.c
M keyboards/honeycomb/matrix.c
M keyboards/hotdox/matrix.c
M keyboards/keyboardio/model01/matrix.c
M keyboards/kinesis/alvicstep/matrix.c
M keyboards/kmac/matrix.c
M keyboards/kmini/matrix.c
M keyboards/lily58/rev1/matrix.c
M keyboards/meira/matrix.c
M keyboards/mitosis/matrix.c
M keyboards/moon/matrix.c
M keyboards/mschwingen/modelm/matrix.c
M keyboards/nek_type_a/matrix.c
M keyboards/redox_w/matrix.c
M keyboards/redscarf_iiplus/verb/matrix.c
M keyboards/redscarf_iiplus/verc/matrix.c
M keyboards/redscarf_iiplus/verd/matrix.c
M keyboards/sirius/uni660/rev1/matrix.c
M keyboards/sirius/uni660/rev2/matrix.c
M keyboards/sx60/matrix.c
M keyboards/telophase/matrix.c
M keyboards/thedogkeyboard/matrix.c
M keyboards/ymdk/sp64/matrix.c
M keyboards/yosino58/rev1/matrix.c
M quantum/matrix_common.c
M tmk_core/common/command.c
M tmk_core/common/mousekey.c
M tmk_core/common/print.h
M tmk_core/protocol/m0110.c
M tmk_core/protocol/ps2_mouse.c

@@ 126,8 126,8 @@ void matrix_print(void)
 {
     print("\nr/c 0123456789ABCDEF\n");
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
-        pbin_reverse16(matrix_get_row(row));
+        print_hex8(row); print(": ");
+        print_bin_reverse16(matrix_get_row(row));
         print("\n");
     }
 }

@@ 96,7 96,7 @@ void matrix_print(void) {
   print_matrix_header();
 
   for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-    phex(row);
+    print_hex8(row);
     print(": ");
     print_matrix_row(row);
     print("\n");

@@ 130,8 130,8 @@ void matrix_print(void)
 {
     print("\nr/c 0123456789ABCDEF\n");
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
-        pbin_reverse16(matrix_get_row(row));
+        print_hex8(row); print(": ");
+        print_bin_reverse16(matrix_get_row(row));
         print("\n");
     }
 }

@@ 120,7 120,7 @@ void matrix_print(void)
     print_matrix_header();
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
+        print_hex8(row); print(": ");
         print_matrix_row(row);
         print("\n");
     }

@@ 120,7 120,7 @@ void matrix_print(void)
     print_matrix_header();
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
+        print_hex8(row); print(": ");
         print_matrix_row(row);
         print("\n");
     }

@@ 133,8 133,8 @@ void matrix_print(void)
 {
 	print("\nr/c 0123456789ABCDEF\n");
 	for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-		phex(row); print(": ");
-		pbin_reverse16(matrix_get_row(row));
+		print_hex8(row); print(": ");
+		print_bin_reverse16(matrix_get_row(row));
 		print("\n");
 	}
 }

@@ 93,8 93,8 @@ void matrix_print(void)
 {
   print("\nr/c 0123456789ABCDEF\n");
   for (uint8_t row = 0; row < matrix_rows(); row++) {
-    phex(row); print(": ");
-    pbin_reverse16(matrix_get_row(row));
+    print_hex8(row); print(": ");
+    print_bin_reverse16(matrix_get_row(row));
     print("\n");
   }
 }

@@ 137,7 137,7 @@ void matrix_print(void)
     print_matrix_header();
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
+        print_hex8(row); print(": ");
         print_matrix_row(row);
         print("\n");
     }

@@ 148,7 148,7 @@ void matrix_print(void)
     print_matrix_header();
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
+        print_hex8(row); print(": ");
         print_matrix_row(row);
         print("\n");
     }

@@ 152,7 152,7 @@ void matrix_print(void)
     print_matrix_header();
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
+        print_hex8(row); print(": ");
         print_matrix_row(row);
         print("\n");
     }

@@ 138,7 138,7 @@ void matrix_print(void)
     print_matrix_header();
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
+        print_hex8(row); print(": ");
         print_matrix_row(row);
         print("\n");
     }

@@ 138,7 138,7 @@ void matrix_print(void)
     print_matrix_header();
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
+        print_hex8(row); print(": ");
         print_matrix_row(row);
         print("\n");
     }

@@ 138,7 138,7 @@ void matrix_print(void)
     print_matrix_header();
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
+        print_hex8(row); print(": ");
         print_matrix_row(row);
         print("\n");
     }

@@ 129,8 129,8 @@ void adb_mouse_task(void)
     if (debug_mouse) {
             print("adb_host_mouse_recv: "); print_bin16(codes); print("\n");
             print("adb_mouse raw: [");
-            phex(mouseacc); print(" ");
-            phex(mouse_report.buttons); print("|");
+            print_hex8(mouseacc); print(" ");
+            print_hex8(mouse_report.buttons); print("|");
             print_decs(mouse_report.x); print(" ");
             print_decs(mouse_report.y); print("]\n");
     }


@@ 173,7 173,7 @@ uint8_t matrix_scan(void)
     key1 = codes&0xFF;
 
     if (debug_matrix && codes) {
-        print("adb_host_kbd_recv: "); phex16(codes); print("\n");
+        print("adb_host_kbd_recv: "); print_hex16(codes); print("\n");
     }
 
     if (codes == 0) {                           // no keys

@@ 220,7 220,7 @@ void matrix_print(void)
     print("\nr/c 01234567\n");
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
+        print_hex8(row); print(": ");
         print_bin_reverse8(matrix_get_row(row));
         print("\n");
     }

@@ 277,7 277,7 @@ void matrix_print(void) {
     print_matrix_header();
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
+        print_hex8(row); print(": ");
         print_matrix_row(row);
         print("\n");
     }

@@ 93,7 93,7 @@ uint8_t matrix_scan(void)
     }
 
     if (debug_enable) {
-        print("["); phex(key); print("]\n");
+        print("["); print_hex8(key); print("]\n");
     }
     
     matrix_scan_quantum();

@@ 381,8 381,8 @@ void matrix_print(void)
 {
     print("\nr/c 01234567\n");
     for (uint8_t row = 0; row < matrix_rows(); row++) {
-        phex(row); print(": ");
-        pbin_reverse(matrix_get_row(row));
+        print_hex8(row); print(": ");
+        print_bin_reverse8(matrix_get_row(row));
         print("\n");
     }
 }

@@ 181,8 181,8 @@ void matrix_print(void)
 {
     print("\nr/c 01234567\n");
     for (uint8_t row = 0; row < matrix_rows(); row++) {
-        phex(row); print(": ");
-        pbin_reverse(matrix_get_row(row));
+        print_hex8(row); print(": ");
+        print_bin_reverse8(matrix_get_row(row));
         print("\n");
     }
 }

@@ 233,7 233,7 @@ void matrix_print(void)
     print_matrix_header();
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
+        print_hex8(row); print(": ");
         print_matrix_row(row);
         print("\n");
     }

@@ 350,8 350,8 @@ void matrix_print(void)
 {
     print("\nr/c 0123456789ABCDEF\n");
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
-        pbin_reverse16(matrix_get_row(row));
+        print_hex8(row); print(": ");
+        print_bin_reverse16(matrix_get_row(row));
         print("\n");
     }
 }

@@ 238,7 238,7 @@ void matrix_print(void)
     print_matrix_header();
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
+        print_hex8(row); print(": ");
         print_matrix_row(row);
         print("\n");
     }

@@ 278,7 278,7 @@ void matrix_print(void)
     print_matrix_header();
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
+        print_hex8(row); print(": ");
         print_matrix_row(row);
         print("\n");
     }

@@ 238,7 238,7 @@ void matrix_print(void)
     print_matrix_header();
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
+        print_hex8(row); print(": ");
         print_matrix_row(row);
         print("\n");
     }

@@ 238,7 238,7 @@ void matrix_print(void)
     print_matrix_header();
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
+        print_hex8(row); print(": ");
         print_matrix_row(row);
         print("\n");
     }

@@ 210,7 210,7 @@ void matrix_print(void)
     print_matrix_header();
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
+        print_hex8(row); print(": ");
         print_matrix_row(row);
         print("\n");
     }

@@ 245,8 245,8 @@ void matrix_print(void)
 {
   print("\nr/c 0123456789ABCDEF\n");
   for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-    phex(row); print(": ");
-    pbin_reverse16(matrix_get_row(row));
+    print_hex8(row); print(": ");
+    print_bin_reverse16(matrix_get_row(row));
     print("\n");
   }
 }

@@ 152,8 152,8 @@ void matrix_print(void)
 {
   print("\nr/c 0123456789ABCDEF\n");
   for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-    phex(row); print(": ");
-    pbin_reverse16(matrix_get_row(row));
+    print_hex8(row); print(": ");
+    print_bin_reverse16(matrix_get_row(row));
     print("\n");
   }
 }

@@ 220,8 220,8 @@ void matrix_print(void)
 {
     print("\nr/c 0123456789ABCDEF\n");
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
-        pbin_reverse16(matrix_get_row(row));
+        print_hex8(row); print(": ");
+        print_bin_reverse16(matrix_get_row(row));
         print("\n");
     }
 }

@@ 241,8 241,8 @@ void matrix_print(void)
 {
     print("\nr/c 0123456789ABCDEF\n");
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
-        pbin_reverse16(matrix_get_row(row));
+        print_hex8(row); print(": ");
+        print_bin_reverse16(matrix_get_row(row));
         print("\n");
     }
 }

@@ 285,8 285,8 @@ inline matrix_row_t matrix_get_row(uint8_t row) { return matrix[row]; }
 void matrix_print(void) {
     print("\nr/c 0123456789ABCDEF\n");
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
-        pbin_reverse16(matrix_get_row(row));
+        print_hex8(row); print(": ");
+        print_bin_reverse16(matrix_get_row(row));
         print("\n");
     }
 }

@@ 297,8 297,8 @@ void matrix_print(void)
 {
     print("\nr/c 0123456789ABCDEF\n");
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
-        pbin_reverse16(matrix_get_row(row));
+        print_hex8(row); print(": ");
+        print_bin_reverse16(matrix_get_row(row));
         print("\n");
     }
 }

@@ 75,7 75,7 @@ void matrix_print(void) {
   print("\nr/c 01234567\n");
 
   for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-    phex(row);
+    print_hex8(row);
     print(": ");
     print_bin_reverse8(matrix_get_row(row));
     print("\n");

@@ 196,8 196,8 @@ void matrix_print(void)
 {
     print("\nr/c 0123456789ABCDEF\n");
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
-        pbin_reverse16(matrix_get_row(row));
+        print_hex8(row); print(": ");
+        print_bin_reverse16(matrix_get_row(row));
         print("\n");
     }
 }

@@ 261,8 261,8 @@ void matrix_print(void)
 {
     print("\nr/c 0123456789ABCDEF\n");
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
-        pbin_reverse16(matrix_get_row(row));
+        print_hex8(row); print(": ");
+        print_bin_reverse16(matrix_get_row(row));
         print("\n");
     }
 }

@@ 124,7 124,7 @@ void matrix_print(void)
     print_matrix_header();
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
+        print_hex8(row); print(": ");
         print_matrix_row(row);
         print("\n");
     }

@@ 180,7 180,7 @@ void matrix_print(void)
     print_matrix_header();
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
+        print_hex8(row); print(": ");
         print_matrix_row(row);
         print("\n");
     }

@@ 310,8 310,8 @@ void matrix_print(void)
 {
     print("\nr/c 0123456789ABCDEF\n");
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
-        pbin_reverse16(matrix_get_row(row));
+        print_hex8(row); print(": ");
+        print_bin_reverse16(matrix_get_row(row));
         print("\n");
     }
 }

@@ 295,8 295,8 @@ void matrix_print(void)
 {
     print("\nr/c 0123456789ABCDEF\n");
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
-        pbin_reverse16(matrix_get_row(row));
+        print_hex8(row); print(": ");
+        print_bin_reverse16(matrix_get_row(row));
         print("\n");
     }
 }

@@ 261,8 261,8 @@ void matrix_print(void)
 {
     print("\nr/c 0123456789ABCDEF\n");
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
-        pbin_reverse16(matrix_get_row(row));
+        print_hex8(row); print(": ");
+        print_bin_reverse16(matrix_get_row(row));
         print("\n");
     }
 }

@@ 309,8 309,8 @@ void matrix_print(void)
 {
     print("\nr/c 0123456789ABCDEF\n");
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
-        pbin_reverse16(matrix_get_row(row));
+        print_hex8(row); print(": ");
+        print_bin_reverse16(matrix_get_row(row));
         print("\n");
     }
 }

@@ 246,8 246,8 @@ void matrix_print(void)
 {
     print("\nr/c 01234567\n");
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
-        pbin_reverse(matrix_get_row(row));
+        print_hex8(row); print(": ");
+        print_bin_reverse8(matrix_get_row(row));
         print("\n");
     }
 }

@@ 186,7 186,7 @@ void matrix_print(void)
     print_matrix_header();
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
+        print_hex8(row); print(": ");
         print_matrix_row(row);
         print("\n");
     }

@@ 154,8 154,8 @@ void matrix_print(void)
 {
   print("\nr/c 0123456789ABCDEF\n");
   for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-    phex(row); print(": ");
-    pbin_reverse16(matrix_get_row(row));
+    print_hex8(row); print(": ");
+    print_bin_reverse16(matrix_get_row(row));
     print("\n");
   }
 }

@@ 85,8 85,8 @@ matrix_row_t matrix_get_row(uint8_t row) {
 void matrix_print(void) {
   print("\nr/c 0123456789ABCDEF\n");
   for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-    phex(row); print(": ");
-    pbin_reverse16(matrix_get_row(row));
+    print_hex8(row); print(": ");
+    print_bin_reverse16(matrix_get_row(row));
     print("\n");
   }
 }

@@ 158,8 158,8 @@ void matrix_print(void)
 {
     print("\nr/c 01234567\n");
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
-        pbin_reverse(matrix_get_row(row));
+        print_hex8(row); print(": ");
+        print_bin_reverse8(matrix_get_row(row));
         print("\n");
     }
 }

@@ 72,7 72,7 @@ void matrix_print(void) {
     print_matrix_header();
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row);
+        print_hex8(row);
         print(": ");
         print_matrix_row(row);
         print("\n");

@@ 126,7 126,7 @@ void matrix_print(void)
     print("\nr/c 0123456789ABCDEFGHIJKLMNOPQRSTUV  \n");
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
+        print_hex8(row); print(": ");
         print_bin_reverse32(matrix_get_row(row));
         print("\n");
     }

@@ 310,8 310,8 @@ void matrix_print(void)
 {
     print("\nr/c 0123456789ABCDEF\n");
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
-        pbin_reverse16(matrix_get_row(row));
+        print_hex8(row); print(": ");
+        print_bin_reverse16(matrix_get_row(row));
         print("\n");
     }
 }

@@ 183,8 183,8 @@ void matrix_print(void)
 {
     print("\nr/c 0123456789ABCDEF\n");
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
-        pbin_reverse16(matrix_get_row(row));
+        print_hex8(row); print(": ");
+        print_bin_reverse16(matrix_get_row(row));
         print("\n");
     }
 }

@@ 139,7 139,7 @@ void matrix_print(void)
     print_matrix_header();
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
+        print_hex8(row); print(": ");
         print_matrix_row(row);
         print("\n");
     }

@@ 118,7 118,7 @@ void matrix_print(void) {
   print_matrix_header();
 
   for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-    phex(row);
+    print_hex8(row);
     print(": ");
     print_matrix_row(row);
     print("\n");

@@ 63,7 63,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
     row_data |= spi_read();
 
 #if DEBUG
-    phex(~row_data);
+    print_hex8(~row_data);
     uprint(" ");
 #endif
     // For each row...

@@ 236,7 236,7 @@ void matrix_print(void)
     print_matrix_header();
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
+        print_hex8(row); print(": ");
         print_matrix_row(row);
         print("\n");
     }

@@ 146,7 146,7 @@ void matrix_print(void)
     print_matrix_header();
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
+        print_hex8(row); print(": ");
         print_matrix_row(row);
         print("\n");
     }

@@ 124,7 124,7 @@ void matrix_print(void)
     print_matrix_header();
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
+        print_hex8(row); print(": ");
         print_matrix_row(row);
         print("\n");
     }

@@ 124,7 124,7 @@ void matrix_print(void)
     print_matrix_header();
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
+        print_hex8(row); print(": ");
         print_matrix_row(row);
         print("\n");
     }

@@ 124,7 124,7 @@ void matrix_print(void)
     print_matrix_header();
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
+        print_hex8(row); print(": ");
         print_matrix_row(row);
         print("\n");
     }

@@ 144,7 144,7 @@ void matrix_print(void)
     print_matrix_header();
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
+        print_hex8(row); print(": ");
         print_matrix_row(row);
         print("\n");
     }

@@ 144,7 144,7 @@ void matrix_print(void)
     print_matrix_header();
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
+        print_hex8(row); print(": ");
         print_matrix_row(row);
         print("\n");
     }

@@ 203,7 203,7 @@ void matrix_print(void)
     print_matrix_header();
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
+        print_hex8(row); print(": ");
         print_matrix_row(row);
         print("\n");
     }

@@ 148,7 148,7 @@ void matrix_print(void)
     print_matrix_header();
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
+        print_hex8(row); print(": ");
         print_matrix_row(row);
         print("\n");
     }

@@ 120,7 120,7 @@ void matrix_print(void)
     print_matrix_header();
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
+        print_hex8(row); print(": ");
         print_matrix_row(row);
         print("\n");
     }

@@ 137,8 137,8 @@ void matrix_print(void)
 {
   print("\nr/c 0123456789ABCDEF\n");
   for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-    phex(row); print(": ");
-    pbin_reverse16(matrix_get_row(row));
+    print_hex8(row); print(": ");
+    print_bin_reverse16(matrix_get_row(row));
     print("\n");
   }
 }

@@ 311,8 311,8 @@ void matrix_print(void)
 {
     print("\nr/c 0123456789ABCDEF\n");
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row); print(": ");
-        pbin_reverse16(matrix_get_row(row));
+        print_hex8(row); print(": ");
+        print_bin_reverse16(matrix_get_row(row));
         print("\n");
     }
 }

@@ 69,7 69,7 @@ void matrix_print(void) {
     print_matrix_header();
 
     for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        phex(row);
+        print_hex8(row);
         print(": ");
         print_matrix_row(row);
         print("\n");

@@ 550,22 550,22 @@ static void mousekey_param_print(void) {
 #    if !defined(NO_PRINT) && !defined(USER_PRINT)
     print("\n\t- Values -\n");
     print("1: delay(*10ms): ");
-    pdec(mk_delay);
+    print_dec(mk_delay);
     print("\n");
     print("2: interval(ms): ");
-    pdec(mk_interval);
+    print_dec(mk_interval);
     print("\n");
     print("3: max_speed: ");
-    pdec(mk_max_speed);
+    print_dec(mk_max_speed);
     print("\n");
     print("4: time_to_max: ");
-    pdec(mk_time_to_max);
+    print_dec(mk_time_to_max);
     print("\n");
     print("5: wheel_max_speed: ");
-    pdec(mk_wheel_max_speed);
+    print_dec(mk_wheel_max_speed);
     print("\n");
     print("6: wheel_time_to_max: ");
-    pdec(mk_wheel_time_to_max);
+    print_dec(mk_wheel_time_to_max);
     print("\n");
 #    endif /* !NO_PRINT */
 }

@@ 471,7 471,7 @@ void mousekey_clear(void) {
 static void mousekey_debug(void) {
     if (!debug_mouse) return;
     print("mousekey [btn|x y v h](rep/acl): [");
-    phex(mouse_report.buttons);
+    print_hex8(mouse_report.buttons);
     print("|");
     print_decs(mouse_report.x);
     print(" ");

@@ 258,13 258,3 @@ extern "C"
 #    define print_val_bin_reverse32(v)
 
 #endif /* NO_PRINT */
-
-/* Backward compatiblitly for old name */
-#define pdec(data) print_dec(data)
-#define pdec16(data) print_dec(data)
-#define phex(data) print_hex8(data)
-#define phex16(data) print_hex16(data)
-#define pbin(data) print_bin8(data)
-#define pbin16(data) print_bin16(data)
-#define pbin_reverse(data) print_bin_reverse8(data)
-#define pbin_reverse16(data) print_bin_reverse16(data)

@@ 95,11 95,11 @@ void m0110_init(void) {
         uint8_t data;
         m0110_send(M0110_MODEL);
         data = m0110_recv();
-        print("m0110_init model: "); phex(data); print("\n");
+        print("m0110_init model: "); print_hex8(data); print("\n");
 
         m0110_send(M0110_TEST);
         data = m0110_recv();
-        print("m0110_init test: "); phex(data); print("\n");
+        print("m0110_init test: "); print_hex8(data); print("\n");
     */
 }
 


@@ 122,7 122,7 @@ uint8_t m0110_send(uint8_t data) {
     return 1;
 ERROR:
     print("m0110_send err: ");
-    phex(m0110_error);
+    print_hex8(m0110_error);
     print("\n");
     _delay_ms(500);
     idle();


@@ 146,7 146,7 @@ uint8_t m0110_recv(void) {
     return data;
 ERROR:
     print("m0110_recv err: ");
-    phex(m0110_error);
+    print_hex8(m0110_error);
     print("\n");
     _delay_ms(500);
     idle();

@@ 190,7 190,7 @@ static inline void ps2_mouse_clear_report(report_mouse_t *mouse_report) {
 static inline void ps2_mouse_print_report(report_mouse_t *mouse_report) {
     if (!debug_mouse) return;
     print("ps2_mouse: [");
-    phex(mouse_report->buttons);
+    print_hex8(mouse_report->buttons);
     print("|");
     print_hex8((uint8_t)mouse_report->x);
     print(" ");