diff options
71 files changed, 107 insertions, 117 deletions
diff --git a/keyboards/40percentclub/ut47/matrix.c b/keyboards/40percentclub/ut47/matrix.c index 921bc9ed5e..e47c7f8e13 100644 --- a/keyboards/40percentclub/ut47/matrix.c +++ b/keyboards/40percentclub/ut47/matrix.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"); } } diff --git a/keyboards/ai03/orbit/matrix.c b/keyboards/ai03/orbit/matrix.c index a1509666cd..b8e3296686 100644 --- a/keyboards/ai03/orbit/matrix.c +++ b/keyboards/ai03/orbit/matrix.c @@ -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"); diff --git a/keyboards/amj96/matrix.c b/keyboards/amj96/matrix.c index 5d00ea98f5..8e7bbaa791 100644 --- a/keyboards/amj96/matrix.c +++ b/keyboards/amj96/matrix.c @@ -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"); } } diff --git a/keyboards/angel64/alpha/matrix.c b/keyboards/angel64/alpha/matrix.c index e06fc15dc4..474fbec030 100644 --- a/keyboards/angel64/alpha/matrix.c +++ b/keyboards/angel64/alpha/matrix.c @@ -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"); } diff --git a/keyboards/angel64/rev1/matrix.c b/keyboards/angel64/rev1/matrix.c index e06fc15dc4..474fbec030 100644 --- a/keyboards/angel64/rev1/matrix.c +++ b/keyboards/angel64/rev1/matrix.c @@ -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"); } diff --git a/keyboards/bpiphany/pegasushoof/2013/matrix.c b/keyboards/bpiphany/pegasushoof/2013/matrix.c index a670d53823..037f323c00 100644 --- a/keyboards/bpiphany/pegasushoof/2013/matrix.c +++ b/keyboards/bpiphany/pegasushoof/2013/matrix.c @@ -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"); } } diff --git a/keyboards/bpiphany/pegasushoof/2015/matrix.c b/keyboards/bpiphany/pegasushoof/2015/matrix.c index db03993544..42c5da3bc5 100644 --- a/keyboards/bpiphany/pegasushoof/2015/matrix.c +++ b/keyboards/bpiphany/pegasushoof/2015/matrix.c @@ -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"); } } diff --git a/keyboards/centromere/matrix.c b/keyboards/centromere/matrix.c index 5ca083b435..7256cd5cb5 100644 --- a/keyboards/centromere/matrix.c +++ b/keyboards/centromere/matrix.c @@ -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"); } diff --git a/keyboards/chimera_ergo/matrix.c b/keyboards/chimera_ergo/matrix.c index 112b9a40d1..577176c466 100644 --- a/keyboards/chimera_ergo/matrix.c +++ b/keyboards/chimera_ergo/matrix.c @@ -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"); } diff --git a/keyboards/chimera_ls/matrix.c b/keyboards/chimera_ls/matrix.c index 7208d971e1..9edd91818f 100644 --- a/keyboards/chimera_ls/matrix.c +++ b/keyboards/chimera_ls/matrix.c @@ -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"); } diff --git a/keyboards/chimera_ortho/matrix.c b/keyboards/chimera_ortho/matrix.c index eb2f18473e..34930af7e2 100644 --- a/keyboards/chimera_ortho/matrix.c +++ b/keyboards/chimera_ortho/matrix.c @@ -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"); } diff --git a/keyboards/chimera_ortho_plus/matrix.c b/keyboards/chimera_ortho_plus/matrix.c index 2bdc97991c..818e05ac98 100644 --- a/keyboards/chimera_ortho_plus/matrix.c +++ b/keyboards/chimera_ortho_plus/matrix.c @@ -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"); } diff --git a/keyboards/comet46/matrix.c b/keyboards/comet46/matrix.c index eb2f18473e..34930af7e2 100644 --- a/keyboards/comet46/matrix.c +++ b/keyboards/comet46/matrix.c @@ -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"); } diff --git a/keyboards/converter/adb_usb/matrix.c b/keyboards/converter/adb_usb/matrix.c index 4a70eb5021..9e5399de5d 100644 --- a/keyboards/converter/adb_usb/matrix.c +++ b/keyboards/converter/adb_usb/matrix.c @@ -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 diff --git a/keyboards/converter/hp_46010a/matrix.c b/keyboards/converter/hp_46010a/matrix.c index 72a098746c..03fcb2424f 100644 --- a/keyboards/converter/hp_46010a/matrix.c +++ b/keyboards/converter/hp_46010a/matrix.c @@ -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"); } diff --git a/keyboards/converter/ibm_5291/matrix.c b/keyboards/converter/ibm_5291/matrix.c index 8b2dba7ab6..3946d02e51 100644 --- a/keyboards/converter/ibm_5291/matrix.c +++ b/keyboards/converter/ibm_5291/matrix.c @@ -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"); } diff --git a/keyboards/converter/m0110_usb/matrix.c b/keyboards/converter/m0110_usb/matrix.c index 098f9de0ff..daba7a138a 100644 --- a/keyboards/converter/m0110_usb/matrix.c +++ b/keyboards/converter/m0110_usb/matrix.c @@ -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(); diff --git a/keyboards/converter/palm_usb/matrix.c b/keyboards/converter/palm_usb/matrix.c index 590b5eea32..289284b616 100644 --- a/keyboards/converter/palm_usb/matrix.c +++ b/keyboards/converter/palm_usb/matrix.c @@ -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"); } } diff --git a/keyboards/converter/sun_usb/matrix.c b/keyboards/converter/sun_usb/matrix.c index c379e8237c..21f45111ec 100644 --- a/keyboards/converter/sun_usb/matrix.c +++ b/keyboards/converter/sun_usb/matrix.c @@ -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"); } } diff --git a/keyboards/converter/xt_usb/matrix.c b/keyboards/converter/xt_usb/matrix.c index d48f1a887f..d75f077ce9 100644 --- a/keyboards/converter/xt_usb/matrix.c +++ b/keyboards/converter/xt_usb/matrix.c @@ -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"); } diff --git a/keyboards/crkbd/rev1/legacy/matrix.c b/keyboards/crkbd/rev1/legacy/matrix.c index 8eb028137b..371b1913e1 100644 --- a/keyboards/crkbd/rev1/legacy/matrix.c +++ b/keyboards/crkbd/rev1/legacy/matrix.c @@ -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"); } } diff --git a/keyboards/dc01/arrow/matrix.c b/keyboards/dc01/arrow/matrix.c index 1823138c39..80fbbb1b04 100644 --- a/keyboards/dc01/arrow/matrix.c +++ b/keyboards/dc01/arrow/matrix.c @@ -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"); } diff --git a/keyboards/dc01/left/matrix.c b/keyboards/dc01/left/matrix.c index 0e7b591f82..41ecb8e178 100644 --- a/keyboards/dc01/left/matrix.c +++ b/keyboards/dc01/left/matrix.c @@ -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"); } diff --git a/keyboards/dc01/numpad/matrix.c b/keyboards/dc01/numpad/matrix.c index f8b725adc2..1eba58cc7c 100644 --- a/keyboards/dc01/numpad/matrix.c +++ b/keyboards/dc01/numpad/matrix.c @@ -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"); } diff --git a/keyboards/dc01/right/matrix.c b/keyboards/dc01/right/matrix.c index 6ec3a3b723..8338453430 100644 --- a/keyboards/dc01/right/matrix.c +++ b/keyboards/dc01/right/matrix.c @@ -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"); } diff --git a/keyboards/dichotomy/matrix.c b/keyboards/dichotomy/matrix.c index 2400753cc1..ed83bd452c 100755 --- a/keyboards/dichotomy/matrix.c +++ b/keyboards/dichotomy/matrix.c @@ -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"); } diff --git a/keyboards/dm9records/ergoinu/matrix.c b/keyboards/dm9records/ergoinu/matrix.c index 4a80cf9f24..b1c58f88fe 100644 --- a/keyboards/dm9records/ergoinu/matrix.c +++ b/keyboards/dm9records/ergoinu/matrix.c @@ -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"); } } diff --git a/keyboards/ergodone/matrix.c b/keyboards/ergodone/matrix.c index 456f73c954..3973ff3484 100644 --- a/keyboards/ergodone/matrix.c +++ b/keyboards/ergodone/matrix.c @@ -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"); } } diff --git a/keyboards/ergotaco/matrix.c b/keyboards/ergotaco/matrix.c index e28f754e67..e5af1c27fd 100644 --- a/keyboards/ergotaco/matrix.c +++ b/keyboards/ergotaco/matrix.c @@ -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"); } } diff --git a/keyboards/georgi/matrix.c b/keyboards/georgi/matrix.c index f0b69c841a..438412102b 100644 --- a/keyboards/georgi/matrix.c +++ b/keyboards/georgi/matrix.c @@ -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"); } } diff --git a/keyboards/gergo/matrix.c b/keyboards/gergo/matrix.c index 080eaea40f..655e729356 100644 --- a/keyboards/gergo/matrix.c +++ b/keyboards/gergo/matrix.c @@ -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"); } } diff --git a/keyboards/handwired/dactyl/matrix.c b/keyboards/handwired/dactyl/matrix.c index faa5c19cf2..0f4f98ad8d 100644 --- a/keyboards/handwired/dactyl/matrix.c +++ b/keyboards/handwired/dactyl/matrix.c @@ -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"); } } diff --git a/keyboards/handwired/datahand/matrix.c b/keyboards/handwired/datahand/matrix.c index a08450d779..c3f6bd42f3 100644 --- a/keyboards/handwired/datahand/matrix.c +++ b/keyboards/handwired/datahand/matrix.c @@ -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"); diff --git a/keyboards/handwired/frenchdev/matrix.c b/keyboards/handwired/frenchdev/matrix.c index c9c7e94aea..5ab254a6f9 100644 --- a/keyboards/handwired/frenchdev/matrix.c +++ b/keyboards/handwired/frenchdev/matrix.c @@ -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"); } } diff --git a/keyboards/handwired/not_so_minidox/matrix.c b/keyboards/handwired/not_so_minidox/matrix.c index aca9daedcb..b7cec9370c 100644 --- a/keyboards/handwired/not_so_minidox/matrix.c +++ b/keyboards/handwired/not_so_minidox/matrix.c @@ -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"); } } diff --git a/keyboards/handwired/owlet60/matrix.c b/keyboards/handwired/owlet60/matrix.c index dafc19fcc4..211273d1fa 100644 --- a/keyboards/handwired/owlet60/matrix.c +++ b/keyboards/handwired/owlet60/matrix.c @@ -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"); } diff --git a/keyboards/handwired/promethium/matrix.c b/keyboards/handwired/promethium/matrix.c index b4a4c6396a..e3a41af288 100644 --- a/keyboards/handwired/promethium/matrix.c +++ b/keyboards/handwired/promethium/matrix.c @@ -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"); } diff --git a/keyboards/handwired/pterodactyl/matrix.c b/keyboards/handwired/pterodactyl/matrix.c index 5f13cb30bb..507f640bd0 100644 --- a/keyboards/handwired/pterodactyl/matrix.c +++ b/keyboards/handwired/pterodactyl/matrix.c @@ -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"); } } diff --git a/keyboards/helix/pico/matrix.c b/keyboards/helix/pico/matrix.c index 27170e0394..b18213d846 100644 --- a/keyboards/helix/pico/matrix.c +++ b/keyboards/helix/pico/matrix.c @@ -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"); } } diff --git a/keyboards/helix/rev1/matrix.c b/keyboards/helix/rev1/matrix.c index 06ef49b563..aa2cc76905 100644 --- a/keyboards/helix/rev1/matrix.c +++ b/keyboards/helix/rev1/matrix.c @@ -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"); } } diff --git a/keyboards/helix/rev2/matrix.c b/keyboards/helix/rev2/matrix.c index 8ea070aa3a..8eed7e58b7 100644 --- a/keyboards/helix/rev2/matrix.c +++ b/keyboards/helix/rev2/matrix.c @@ -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"); } } diff --git a/keyboards/hid_liber/matrix.c b/keyboards/hid_liber/matrix.c index 05554a24c8..ff59a17153 100755 --- a/keyboards/hid_liber/matrix.c +++ b/keyboards/hid_liber/matrix.c @@ -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"); } } diff --git a/keyboards/honeycomb/matrix.c b/keyboards/honeycomb/matrix.c index 2bed690689..7fef6f0fd8 100755 --- a/keyboards/honeycomb/matrix.c +++ b/keyboards/honeycomb/matrix.c @@ -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"); } diff --git a/keyboards/hotdox/matrix.c b/keyboards/hotdox/matrix.c index 605be30220..5d0b0f6dd5 100644 --- a/keyboards/hotdox/matrix.c +++ b/keyboards/hotdox/matrix.c @@ -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"); } } diff --git a/keyboards/keyboardio/model01/matrix.c b/keyboards/keyboardio/model01/matrix.c index 92cca99137..450e48d947 100644 --- a/keyboards/keyboardio/model01/matrix.c +++ b/keyboards/keyboardio/model01/matrix.c @@ -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"); } } diff --git a/keyboards/kinesis/alvicstep/matrix.c b/keyboards/kinesis/alvicstep/matrix.c index be2bab039c..71619f8167 100644 --- a/keyboards/kinesis/alvicstep/matrix.c +++ b/keyboards/kinesis/alvicstep/matrix.c @@ -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"); } } diff --git a/keyboards/kmac/matrix.c b/keyboards/kmac/matrix.c index 9bc59a0784..3d5a3081d1 100644 --- a/keyboards/kmac/matrix.c +++ b/keyboards/kmac/matrix.c @@ -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"); diff --git a/keyboards/kmini/matrix.c b/keyboards/kmini/matrix.c index 7bfb650355..eee19054ea 100755 --- a/keyboards/kmini/matrix.c +++ b/keyboards/kmini/matrix.c @@ -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"); } diff --git a/keyboards/lily58/rev1/matrix.c b/keyboards/lily58/rev1/matrix.c index eb7e16e24a..d3ba1c924e 100755 --- a/keyboards/lily58/rev1/matrix.c +++ b/keyboards/lily58/rev1/matrix.c @@ -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"); } } diff --git a/keyboards/meira/matrix.c b/keyboards/meira/matrix.c index 7de188a68c..c1bfb5868f 100644 --- a/keyboards/meira/matrix.c +++ b/keyboards/meira/matrix.c @@ -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"); } } diff --git a/keyboards/mitosis/matrix.c b/keyboards/mitosis/matrix.c index 717a810678..71c372a3ce 100644 --- a/keyboards/mitosis/matrix.c +++ b/keyboards/mitosis/matrix.c @@ -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"); } diff --git a/keyboards/moon/matrix.c b/keyboards/moon/matrix.c index c74c70f897..24b4d49560 100644 --- a/keyboards/moon/matrix.c +++ b/keyboards/moon/matrix.c @@ -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"); diff --git a/keyboards/mschwingen/modelm/matrix.c b/keyboards/mschwingen/modelm/matrix.c index ef725a61eb..ffc1284ead 100644 --- a/keyboards/mschwingen/modelm/matrix.c +++ b/keyboards/mschwingen/modelm/matrix.c @@ -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... diff --git a/keyboards/nek_type_a/matrix.c b/keyboards/nek_type_a/matrix.c index 1da5b44a3c..a59598a503 100644 --- a/keyboards/nek_type_a/matrix.c +++ b/keyboards/nek_type_a/matrix.c @@ -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"); } diff --git a/keyboards/redox_w/matrix.c b/keyboards/redox_w/matrix.c index 15ca66e34d..703987a939 100644 --- a/keyboards/redox_w/matrix.c +++ b/keyboards/redox_w/matrix.c @@ -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"); } diff --git a/keyboards/redscarf_iiplus/verb/matrix.c b/keyboards/redscarf_iiplus/verb/matrix.c index 54b0f3a9a1..42cfb7c037 100755 --- a/keyboards/redscarf_iiplus/verb/matrix.c +++ b/keyboards/redscarf_iiplus/verb/matrix.c @@ -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"); } diff --git a/keyboards/redscarf_iiplus/verc/matrix.c b/keyboards/redscarf_iiplus/verc/matrix.c index 54b0f3a9a1..42cfb7c037 100755 --- a/keyboards/redscarf_iiplus/verc/matrix.c +++ b/keyboards/redscarf_iiplus/verc/matrix.c @@ -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"); } diff --git a/keyboards/redscarf_iiplus/verd/matrix.c b/keyboards/redscarf_iiplus/verd/matrix.c index 28568653c5..78d1191b68 100644 --- a/keyboards/redscarf_iiplus/verd/matrix.c +++ b/keyboards/redscarf_iiplus/verd/matrix.c @@ -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"); } diff --git a/keyboards/sirius/uni660/rev1/matrix.c b/keyboards/sirius/uni660/rev1/matrix.c index 355fa7e5e9..2db6767a46 100644 --- a/keyboards/sirius/uni660/rev1/matrix.c +++ b/keyboards/sirius/uni660/rev1/matrix.c @@ -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"); } diff --git a/keyboards/sirius/uni660/rev2/matrix.c b/keyboards/sirius/uni660/rev2/matrix.c index 355fa7e5e9..2db6767a46 100644 --- a/keyboards/sirius/uni660/rev2/matrix.c +++ b/keyboards/sirius/uni660/rev2/matrix.c @@ -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"); } diff --git a/keyboards/sx60/matrix.c b/keyboards/sx60/matrix.c index 58647d13b0..6fa0dd1456 100644 --- a/keyboards/sx60/matrix.c +++ b/keyboards/sx60/matrix.c @@ -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"); } diff --git a/keyboards/telophase/matrix.c b/keyboards/telophase/matrix.c index 8edfce62d2..bc7a125e07 100644 --- a/keyboards/telophase/matrix.c +++ b/keyboards/telophase/matrix.c @@ -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"); } diff --git a/keyboards/thedogkeyboard/matrix.c b/keyboards/thedogkeyboard/matrix.c index e06fc15dc4..474fbec030 100644 --- a/keyboards/thedogkeyboard/matrix.c +++ b/keyboards/thedogkeyboard/matrix.c @@ -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"); } diff --git a/keyboards/ymdk/sp64/matrix.c b/keyboards/ymdk/sp64/matrix.c index 8dd2bb8d76..74bddc0578 100644 --- a/keyboards/ymdk/sp64/matrix.c +++ b/keyboards/ymdk/sp64/matrix.c @@ -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"); } } diff --git a/keyboards/yosino58/rev1/matrix.c b/keyboards/yosino58/rev1/matrix.c index 20efb69229..3db40b3829 100644 --- a/keyboards/yosino58/rev1/matrix.c +++ b/keyboards/yosino58/rev1/matrix.c @@ -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"); } } diff --git a/quantum/matrix_common.c b/quantum/matrix_common.c index 01d2b38e5e..efbad6a5fd 100644 --- a/quantum/matrix_common.c +++ b/quantum/matrix_common.c @@ -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"); diff --git a/tmk_core/common/command.c b/tmk_core/common/command.c index 59aa4e4d34..34c4b36b1c 100644 --- a/tmk_core/common/command.c +++ b/tmk_core/common/command.c @@ -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 */ } diff --git a/tmk_core/common/mousekey.c b/tmk_core/common/mousekey.c index d8cf63f771..63e74baa93 100644 --- a/tmk_core/common/mousekey.c +++ b/tmk_core/common/mousekey.c @@ -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(" "); diff --git a/tmk_core/common/print.h b/tmk_core/common/print.h index 647a5aa053..35fcad0f40 100644 --- a/tmk_core/common/print.h +++ b/tmk_core/common/print.h @@ -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) diff --git a/tmk_core/protocol/m0110.c b/tmk_core/protocol/m0110.c index b02a6933d2..64f2fa50ab 100644 --- a/tmk_core/protocol/m0110.c +++ b/tmk_core/protocol/m0110.c @@ -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(); diff --git a/tmk_core/protocol/ps2_mouse.c b/tmk_core/protocol/ps2_mouse.c index 8df465026b..5415453a05 100644 --- a/tmk_core/protocol/ps2_mouse.c +++ b/tmk_core/protocol/ps2_mouse.c @@ -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(" "); |