aboutsummaryrefslogtreecommitdiff
path: root/tmk_core
diff options
context:
space:
mode:
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/common/command.c12
-rw-r--r--tmk_core/common/mousekey.c2
-rw-r--r--tmk_core/common/print.h10
-rw-r--r--tmk_core/protocol/m0110.c8
-rw-r--r--tmk_core/protocol/ps2_mouse.c2
5 files changed, 12 insertions, 22 deletions
diff --git a/tmk_core/common/command.c b/tmk_core/common/command.c
index 59aa4e4d3..34c4b36b1 100644
--- a/tmk_core/common/command.c
+++ b/tmk_core/common/command.c
@@ -550,22 +550,22 @@ static void mousekey_param_print(void) {
550# if !defined(NO_PRINT) && !defined(USER_PRINT) 550# if !defined(NO_PRINT) && !defined(USER_PRINT)
551 print("\n\t- Values -\n"); 551 print("\n\t- Values -\n");
552 print("1: delay(*10ms): "); 552 print("1: delay(*10ms): ");
553 pdec(mk_delay); 553 print_dec(mk_delay);
554 print("\n"); 554 print("\n");
555 print("2: interval(ms): "); 555 print("2: interval(ms): ");
556 pdec(mk_interval); 556 print_dec(mk_interval);
557 print("\n"); 557 print("\n");
558 print("3: max_speed: "); 558 print("3: max_speed: ");
559 pdec(mk_max_speed); 559 print_dec(mk_max_speed);
560 print("\n"); 560 print("\n");
561 print("4: time_to_max: "); 561 print("4: time_to_max: ");
562 pdec(mk_time_to_max); 562 print_dec(mk_time_to_max);
563 print("\n"); 563 print("\n");
564 print("5: wheel_max_speed: "); 564 print("5: wheel_max_speed: ");
565 pdec(mk_wheel_max_speed); 565 print_dec(mk_wheel_max_speed);
566 print("\n"); 566 print("\n");
567 print("6: wheel_time_to_max: "); 567 print("6: wheel_time_to_max: ");
568 pdec(mk_wheel_time_to_max); 568 print_dec(mk_wheel_time_to_max);
569 print("\n"); 569 print("\n");
570# endif /* !NO_PRINT */ 570# endif /* !NO_PRINT */
571} 571}
diff --git a/tmk_core/common/mousekey.c b/tmk_core/common/mousekey.c
index d8cf63f77..63e74baa9 100644
--- a/tmk_core/common/mousekey.c
+++ b/tmk_core/common/mousekey.c
@@ -471,7 +471,7 @@ void mousekey_clear(void) {
471static void mousekey_debug(void) { 471static void mousekey_debug(void) {
472 if (!debug_mouse) return; 472 if (!debug_mouse) return;
473 print("mousekey [btn|x y v h](rep/acl): ["); 473 print("mousekey [btn|x y v h](rep/acl): [");
474 phex(mouse_report.buttons); 474 print_hex8(mouse_report.buttons);
475 print("|"); 475 print("|");
476 print_decs(mouse_report.x); 476 print_decs(mouse_report.x);
477 print(" "); 477 print(" ");
diff --git a/tmk_core/common/print.h b/tmk_core/common/print.h
index 647a5aa05..35fcad0f4 100644
--- a/tmk_core/common/print.h
+++ b/tmk_core/common/print.h
@@ -258,13 +258,3 @@ extern "C"
258# define print_val_bin_reverse32(v) 258# define print_val_bin_reverse32(v)
259 259
260#endif /* NO_PRINT */ 260#endif /* NO_PRINT */
261
262/* Backward compatiblitly for old name */
263#define pdec(data) print_dec(data)
264#define pdec16(data) print_dec(data)
265#define phex(data) print_hex8(data)
266#define phex16(data) print_hex16(data)
267#define pbin(data) print_bin8(data)
268#define pbin16(data) print_bin16(data)
269#define pbin_reverse(data) print_bin_reverse8(data)
270#define pbin_reverse16(data) print_bin_reverse16(data)
diff --git a/tmk_core/protocol/m0110.c b/tmk_core/protocol/m0110.c
index b02a6933d..64f2fa50a 100644
--- a/tmk_core/protocol/m0110.c
+++ b/tmk_core/protocol/m0110.c
@@ -95,11 +95,11 @@ void m0110_init(void) {
95 uint8_t data; 95 uint8_t data;
96 m0110_send(M0110_MODEL); 96 m0110_send(M0110_MODEL);
97 data = m0110_recv(); 97 data = m0110_recv();
98 print("m0110_init model: "); phex(data); print("\n"); 98 print("m0110_init model: "); print_hex8(data); print("\n");
99 99
100 m0110_send(M0110_TEST); 100 m0110_send(M0110_TEST);
101 data = m0110_recv(); 101 data = m0110_recv();
102 print("m0110_init test: "); phex(data); print("\n"); 102 print("m0110_init test: "); print_hex8(data); print("\n");
103 */ 103 */
104} 104}
105 105
@@ -122,7 +122,7 @@ uint8_t m0110_send(uint8_t data) {
122 return 1; 122 return 1;
123ERROR: 123ERROR:
124 print("m0110_send err: "); 124 print("m0110_send err: ");
125 phex(m0110_error); 125 print_hex8(m0110_error);
126 print("\n"); 126 print("\n");
127 _delay_ms(500); 127 _delay_ms(500);
128 idle(); 128 idle();
@@ -146,7 +146,7 @@ uint8_t m0110_recv(void) {
146 return data; 146 return data;
147ERROR: 147ERROR:
148 print("m0110_recv err: "); 148 print("m0110_recv err: ");
149 phex(m0110_error); 149 print_hex8(m0110_error);
150 print("\n"); 150 print("\n");
151 _delay_ms(500); 151 _delay_ms(500);
152 idle(); 152 idle();
diff --git a/tmk_core/protocol/ps2_mouse.c b/tmk_core/protocol/ps2_mouse.c
index 8df465026..5415453a0 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) {
190static inline void ps2_mouse_print_report(report_mouse_t *mouse_report) { 190static inline void ps2_mouse_print_report(report_mouse_t *mouse_report) {
191 if (!debug_mouse) return; 191 if (!debug_mouse) return;
192 print("ps2_mouse: ["); 192 print("ps2_mouse: [");
193 phex(mouse_report->buttons); 193 print_hex8(mouse_report->buttons);
194 print("|"); 194 print("|");
195 print_hex8((uint8_t)mouse_report->x); 195 print_hex8((uint8_t)mouse_report->x);
196 print(" "); 196 print(" ");