Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
8086837f69
2 changed files with 8 additions and 8 deletions
|
@ -27,8 +27,8 @@
|
||||||
|
|
||||||
// Create user & normal print defines
|
// Create user & normal print defines
|
||||||
#define xprintf(fmt, ...) __xprintf(fmt, ##__VA_ARGS__)
|
#define xprintf(fmt, ...) __xprintf(fmt, ##__VA_ARGS__)
|
||||||
#define print(s) xprintf(s)
|
#define print(s) __xprintf(s)
|
||||||
#define println(s) xprintf(s "\r\n")
|
#define println(s) __xprintf(s "\r\n")
|
||||||
#define uprint(s) print(s)
|
#define uprint(s) __xprintf(s)
|
||||||
#define uprintln(s) println(s)
|
#define uprintln(s) __xprintf(s "\r\n")
|
||||||
#define uprintf(fmt, ...) xprintf(fmt, ##__VA_ARGS__)
|
#define uprintf(fmt, ...) __xprintf(fmt, ##__VA_ARGS__)
|
||||||
|
|
|
@ -28,6 +28,6 @@
|
||||||
// Create user & normal print defines
|
// Create user & normal print defines
|
||||||
#define print(s) xputs(PSTR(s))
|
#define print(s) xputs(PSTR(s))
|
||||||
#define println(s) xputs(PSTR(s "\r\n"))
|
#define println(s) xputs(PSTR(s "\r\n"))
|
||||||
#define uprint(s) print(s)
|
#define uprint(s) xputs(PSTR(s))
|
||||||
#define uprintln(s) println(s)
|
#define uprintln(s) xputs(PSTR(s "\r\n"))
|
||||||
#define uprintf(fmt, ...) xprintf(fmt, ##__VA_ARGS__)
|
#define uprintf(fmt, ...) __xprintf(PSTR(fmt), ##__VA_ARGS__)
|
Loading…
Reference in a new issue