poz/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Tidy up print/debug logging headers (#22969)

Browse source
This commit is contained in:
Joel Challis 2024-01-27 04:30:29 +00:00 committed by GitHub
parent f2299ee5f8
commit bb71145632
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 20 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
platforms/avr/_print.h
View file

@ -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__)

22
quantum/logging/debug.h
View file

@ -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); \
} while (0)
# define dprintf(fmt, ...) \
do { \
if (debug_enable) xprintf(fmt, ##__VA_ARGS__); \
if (debug_config.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
quantum/logging/print.h
View file

@ -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 */
@ -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)