Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tidy up print/debug logging headers #22969

Merged
merged 1 commit into from
Jan 27, 2024
Merged

Tidy up print/debug logging headers #22969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions platforms/avr/_print.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,3 @@
#pragma once

#include "avr/xprintf.h"

// Create user & normal print defines
#define print(s) xputs(PSTR(s))
#define println(s) xputs(PSTR(s "\r\n"))
#define uprint(s) xputs(PSTR(s))
#define uprintln(s) xputs(PSTR(s "\r\n"))
#define uprintf(fmt, ...) __xprintf(PSTR(fmt), ##__VA_ARGS__)
26 changes: 7 additions & 19 deletions quantum/logging/debug.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,26 +54,14 @@ extern debug_config_t debug_config;
* Debug print utils
*/
#ifndef NO_DEBUG

# define dprint(s) \
do { \
if (debug_enable) print(s); \
} while (0)
# define dprintln(s) \
do { \
if (debug_enable) println(s); \
# define dprintf(fmt, ...) \
do { \
if (debug_config.enable) xprintf(fmt, ##__VA_ARGS__); \
} while (0)
# define dprintf(fmt, ...) \
do { \
if (debug_enable) xprintf(fmt, ##__VA_ARGS__); \
} while (0)
# define dmsg(s) dprintf("%s at %d: %s\n", __FILE__, __LINE__, s)

#else /* NO_DEBUG */

# define dprint(s)
# define dprintln(s)
# define dprintf(fmt, ...)
# define dmsg(s)

#endif /* NO_DEBUG */

#define dprint(s) dprintf(s)
#define dprintln(s) dprintf(s "\r\n")
#define dmsg(s) dprintf("%s at %d: %s\n", __FILE__, __LINE__, s)
36 changes: 13 additions & 23 deletions quantum/logging/print.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,40 +52,27 @@ void print_set_sendchar(sendchar_func_t func);
# if __has_include_next("_print.h")
# include_next "_print.h" /* Include the platforms print.h */
# else
// Fall back to lib/printf
# include "printf.h" // lib/printf/printf.h

// Create user & normal print defines
# define print(s) printf(s)
# define println(s) printf(s "\r\n")
# include "printf.h" // // Fall back to lib/printf/printf.h
# define xprintf printf
# define uprint(s) printf(s)
# define uprintln(s) printf(s "\r\n")
# define uprintf printf

# endif /* __has_include_next("_print.h") */
#else /* NO_PRINT */
# undef xprintf
# endif
#else
// Remove print defines
# define print(s)
# define println(s)
# undef xprintf
# define xprintf(fmt, ...)
# define uprintf(fmt, ...)
# define uprint(s)
# define uprintln(s)
#endif

#endif /* NO_PRINT */
// Resolve before USER_PRINT can remove
#define uprintf xprintf

#ifdef USER_PRINT
// Remove normal print defines
# undef print
# undef println
# undef xprintf
# define print(s)
# define println(s)
# define xprintf(fmt, ...)
#endif

#define print(s) xprintf(s)
#define println(s) xprintf(s "\r\n")

#define print_dec(i) xprintf("%u", i)
#define print_decs(i) xprintf("%d", i)
/* hex */
Expand Down Expand Up @@ -121,6 +108,9 @@ void print_set_sendchar(sendchar_func_t func);
//
// !!! DO NOT USE USER PRINT CALLS IN THE BODY OF QMK/TMK !!!

#define uprint(s) uprintf(s)
#define uprintln(s) uprintf(s "\r\n")

/* decimal */
#define uprint_dec(i) uprintf("%u", i)
#define uprint_decs(i) uprintf("%d", i)
Expand Down
Loading