Procházet zdrojové kódy

Slight reduction in serial.h file size

Scott Lahteine před 6 roky
rodič
revize
3ea073ace6
1 změnil soubory, kde provedl 65 přidání a 65 odebrání
  1. 65
    65
      Marlin/src/core/serial.h

+ 65
- 65
Marlin/src/core/serial.h Zobrazit soubor

@@ -53,14 +53,14 @@ extern uint8_t marlin_debug_flags;
53 53
   extern int8_t serial_port_index;
54 54
   #define _PORT_REDIRECT(n,p)   REMEMBER(n,serial_port_index,p)
55 55
   #define _PORT_RESTORE(n)      RESTORE(n)
56
-  #define SERIAL_OUT(WHAT, ...) do{ \
57
-    if (!serial_port_index || serial_port_index == SERIAL_BOTH) (void)MYSERIAL0.WHAT(__VA_ARGS__); \
58
-    if ( serial_port_index) (void)MYSERIAL1.WHAT(__VA_ARGS__); \
56
+  #define SERIAL_OUT(WHAT, V...) do{ \
57
+    if (!serial_port_index || serial_port_index == SERIAL_BOTH) (void)MYSERIAL0.WHAT(V); \
58
+    if ( serial_port_index) (void)MYSERIAL1.WHAT(V); \
59 59
   }while(0)
60 60
 #else
61 61
   #define _PORT_REDIRECT(n,p)   NOOP
62 62
   #define _PORT_RESTORE(n)      NOOP
63
-  #define SERIAL_OUT(WHAT, ...) (void)MYSERIAL0.WHAT(__VA_ARGS__)
63
+  #define SERIAL_OUT(WHAT, V...) (void)MYSERIAL0.WHAT(V)
64 64
 #endif
65 65
 
66 66
 #define PORT_REDIRECT(p)        _PORT_REDIRECT(1,p)
@@ -68,11 +68,11 @@ extern uint8_t marlin_debug_flags;
68 68
 
69 69
 #define SERIAL_CHAR(x)          SERIAL_OUT(write, x)
70 70
 #define SERIAL_ECHO(x)          SERIAL_OUT(print, x)
71
-#define SERIAL_ECHO_F(...)      SERIAL_OUT(print, __VA_ARGS__)
71
+#define SERIAL_ECHO_F(V...)      SERIAL_OUT(print, V)
72 72
 #define SERIAL_ECHOLN(x)        SERIAL_OUT(println, x)
73 73
 #define SERIAL_PRINT(x,b)       SERIAL_OUT(print, x, b)
74 74
 #define SERIAL_PRINTLN(x,b)     SERIAL_OUT(println, x, b)
75
-#define SERIAL_PRINTF(...)      SERIAL_OUT(printf, __VA_ARGS__)
75
+#define SERIAL_PRINTF(V...)      SERIAL_OUT(printf, V)
76 76
 #define SERIAL_FLUSH()          SERIAL_OUT(flush)
77 77
 
78 78
 #if TX_BUFFER_SIZE > 0
@@ -82,70 +82,70 @@ extern uint8_t marlin_debug_flags;
82 82
 #endif
83 83
 
84 84
 // Print up to 12 pairs of values
85
-#define __SEP_N(N,...)      _SEP_##N(__VA_ARGS__)
86
-#define _SEP_N(N,...)       __SEP_N(N,__VA_ARGS__)
87
-#define _SEP_1(PRE)         SERIAL_ECHOPGM(PRE)
88
-#define _SEP_2(PRE,V)       serial_echopair_PGM(PSTR(PRE),V)
89
-#define _SEP_3(a,b,c)       do{ _SEP_2(a,b); SERIAL_ECHOPGM(c); }while(0)
90
-#define _SEP_4(a,b,...)     do{ _SEP_2(a,b); _SEP_2(__VA_ARGS__); }while(0)
91
-#define _SEP_5(a,b,...)     do{ _SEP_2(a,b); _SEP_3(__VA_ARGS__); }while(0)
92
-#define _SEP_6(a,b,...)     do{ _SEP_2(a,b); _SEP_4(__VA_ARGS__); }while(0)
93
-#define _SEP_7(a,b,...)     do{ _SEP_2(a,b); _SEP_5(__VA_ARGS__); }while(0)
94
-#define _SEP_8(a,b,...)     do{ _SEP_2(a,b); _SEP_6(__VA_ARGS__); }while(0)
95
-#define _SEP_9(a,b,...)     do{ _SEP_2(a,b); _SEP_7(__VA_ARGS__); }while(0)
96
-#define _SEP_10(a,b,...)    do{ _SEP_2(a,b); _SEP_8(__VA_ARGS__); }while(0)
97
-#define _SEP_11(a,b,...)    do{ _SEP_2(a,b); _SEP_9(__VA_ARGS__); }while(0)
98
-#define _SEP_12(a,b,...)    do{ _SEP_2(a,b); _SEP_10(__VA_ARGS__); }while(0)
99
-#define _SEP_13(a,b,...)    do{ _SEP_2(a,b); _SEP_11(__VA_ARGS__); }while(0)
100
-#define _SEP_14(a,b,...)    do{ _SEP_2(a,b); _SEP_12(__VA_ARGS__); }while(0)
101
-#define _SEP_15(a,b,...)    do{ _SEP_2(a,b); _SEP_13(__VA_ARGS__); }while(0)
102
-#define _SEP_16(a,b,...)    do{ _SEP_2(a,b); _SEP_14(__VA_ARGS__); }while(0)
103
-#define _SEP_17(a,b,...)    do{ _SEP_2(a,b); _SEP_15(__VA_ARGS__); }while(0)
104
-#define _SEP_18(a,b,...)    do{ _SEP_2(a,b); _SEP_16(__VA_ARGS__); }while(0)
105
-#define _SEP_19(a,b,...)    do{ _SEP_2(a,b); _SEP_17(__VA_ARGS__); }while(0)
106
-#define _SEP_20(a,b,...)    do{ _SEP_2(a,b); _SEP_18(__VA_ARGS__); }while(0)
107
-#define _SEP_21(a,b,...)    do{ _SEP_2(a,b); _SEP_19(__VA_ARGS__); }while(0)
108
-#define _SEP_22(a,b,...)    do{ _SEP_2(a,b); _SEP_20(__VA_ARGS__); }while(0)
109
-#define _SEP_23(a,b,...)    do{ _SEP_2(a,b); _SEP_21(__VA_ARGS__); }while(0)
110
-#define _SEP_24(a,b,...)    do{ _SEP_2(a,b); _SEP_22(__VA_ARGS__); }while(0)
111
-
112
-#define SERIAL_ECHOPAIR(...) _SEP_N(NUM_ARGS(__VA_ARGS__),__VA_ARGS__)
85
+#define __SEP_N(N,V...)   _SEP_##N(V)
86
+#define _SEP_N(N,V...)    __SEP_N(N,V)
87
+#define _SEP_1(PRE)       SERIAL_ECHOPGM(PRE)
88
+#define _SEP_2(PRE,V)     serial_echopair_PGM(PSTR(PRE),V)
89
+#define _SEP_3(a,b,c)     do{ _SEP_2(a,b); SERIAL_ECHOPGM(c); }while(0)
90
+#define _SEP_4(a,b,V...)  do{ _SEP_2(a,b); _SEP_2(V); }while(0)
91
+#define _SEP_5(a,b,V...)  do{ _SEP_2(a,b); _SEP_3(V); }while(0)
92
+#define _SEP_6(a,b,V...)  do{ _SEP_2(a,b); _SEP_4(V); }while(0)
93
+#define _SEP_7(a,b,V...)  do{ _SEP_2(a,b); _SEP_5(V); }while(0)
94
+#define _SEP_8(a,b,V...)  do{ _SEP_2(a,b); _SEP_6(V); }while(0)
95
+#define _SEP_9(a,b,V...)  do{ _SEP_2(a,b); _SEP_7(V); }while(0)
96
+#define _SEP_10(a,b,V...) do{ _SEP_2(a,b); _SEP_8(V); }while(0)
97
+#define _SEP_11(a,b,V...) do{ _SEP_2(a,b); _SEP_9(V); }while(0)
98
+#define _SEP_12(a,b,V...) do{ _SEP_2(a,b); _SEP_10(V); }while(0)
99
+#define _SEP_13(a,b,V...) do{ _SEP_2(a,b); _SEP_11(V); }while(0)
100
+#define _SEP_14(a,b,V...) do{ _SEP_2(a,b); _SEP_12(V); }while(0)
101
+#define _SEP_15(a,b,V...) do{ _SEP_2(a,b); _SEP_13(V); }while(0)
102
+#define _SEP_16(a,b,V...) do{ _SEP_2(a,b); _SEP_14(V); }while(0)
103
+#define _SEP_17(a,b,V...) do{ _SEP_2(a,b); _SEP_15(V); }while(0)
104
+#define _SEP_18(a,b,V...) do{ _SEP_2(a,b); _SEP_16(V); }while(0)
105
+#define _SEP_19(a,b,V...) do{ _SEP_2(a,b); _SEP_17(V); }while(0)
106
+#define _SEP_20(a,b,V...) do{ _SEP_2(a,b); _SEP_18(V); }while(0)
107
+#define _SEP_21(a,b,V...) do{ _SEP_2(a,b); _SEP_19(V); }while(0)
108
+#define _SEP_22(a,b,V...) do{ _SEP_2(a,b); _SEP_20(V); }while(0)
109
+#define _SEP_23(a,b,V...) do{ _SEP_2(a,b); _SEP_21(V); }while(0)
110
+#define _SEP_24(a,b,V...) do{ _SEP_2(a,b); _SEP_22(V); }while(0)
111
+
112
+#define SERIAL_ECHOPAIR(V...) _SEP_N(NUM_ARGS(V),V)
113 113
 
114 114
 // Print up to 12 pairs of values followed by newline
115
-#define __SELP_N(N,...)   _SELP_##N(__VA_ARGS__)
116
-#define _SELP_N(N,...)    __SELP_N(N,__VA_ARGS__)
117
-#define _SELP_1(PRE)      SERIAL_ECHOLNPGM(PRE)
118
-#define _SELP_2(PRE,V)    do{ serial_echopair_PGM(PSTR(PRE),V); SERIAL_EOL(); }while(0)
119
-#define _SELP_3(a,b,c)    do{ _SEP_2(a,b); SERIAL_ECHOLNPGM(c); }while(0)
120
-#define _SELP_4(a,b,...)  do{ _SEP_2(a,b); _SELP_2(__VA_ARGS__); }while(0)
121
-#define _SELP_5(a,b,...)  do{ _SEP_2(a,b); _SELP_3(__VA_ARGS__); }while(0)
122
-#define _SELP_6(a,b,...)  do{ _SEP_2(a,b); _SELP_4(__VA_ARGS__); }while(0)
123
-#define _SELP_7(a,b,...)  do{ _SEP_2(a,b); _SELP_5(__VA_ARGS__); }while(0)
124
-#define _SELP_8(a,b,...)  do{ _SEP_2(a,b); _SELP_6(__VA_ARGS__); }while(0)
125
-#define _SELP_9(a,b,...)  do{ _SEP_2(a,b); _SELP_7(__VA_ARGS__); }while(0)
126
-#define _SELP_10(a,b,...) do{ _SEP_2(a,b); _SELP_8(__VA_ARGS__); }while(0)
127
-#define _SELP_11(a,b,...) do{ _SEP_2(a,b); _SELP_9(__VA_ARGS__); }while(0)
128
-#define _SELP_12(a,b,...) do{ _SEP_2(a,b); _SELP_10(__VA_ARGS__); }while(0)
129
-#define _SELP_13(a,b,...) do{ _SEP_2(a,b); _SELP_11(__VA_ARGS__); }while(0)
130
-#define _SELP_14(a,b,...) do{ _SEP_2(a,b); _SELP_12(__VA_ARGS__); }while(0)
131
-#define _SELP_15(a,b,...) do{ _SEP_2(a,b); _SELP_13(__VA_ARGS__); }while(0)
132
-#define _SELP_16(a,b,...) do{ _SEP_2(a,b); _SELP_14(__VA_ARGS__); }while(0)
133
-#define _SELP_17(a,b,...) do{ _SEP_2(a,b); _SELP_15(__VA_ARGS__); }while(0)
134
-#define _SELP_18(a,b,...) do{ _SEP_2(a,b); _SELP_16(__VA_ARGS__); }while(0)
135
-#define _SELP_19(a,b,...) do{ _SEP_2(a,b); _SELP_17(__VA_ARGS__); }while(0)
136
-#define _SELP_20(a,b,...) do{ _SEP_2(a,b); _SELP_18(__VA_ARGS__); }while(0)
137
-#define _SELP_21(a,b,...) do{ _SEP_2(a,b); _SELP_19(__VA_ARGS__); }while(0)
138
-#define _SELP_22(a,b,...) do{ _SEP_2(a,b); _SELP_20(__VA_ARGS__); }while(0)
139
-#define _SELP_23(a,b,...) do{ _SEP_2(a,b); _SELP_21(__VA_ARGS__); }while(0)
140
-#define _SELP_24(a,b,...) do{ _SEP_2(a,b); _SELP_22(__VA_ARGS__); }while(0)
141
-
142
-#define SERIAL_ECHOLNPAIR(...) _SELP_N(NUM_ARGS(__VA_ARGS__),__VA_ARGS__)
115
+#define __SELP_N(N,V...)   _SELP_##N(V)
116
+#define _SELP_N(N,V...)    __SELP_N(N,V)
117
+#define _SELP_1(PRE)       SERIAL_ECHOLNPGM(PRE)
118
+#define _SELP_2(PRE,V)     do{ serial_echopair_PGM(PSTR(PRE),V); SERIAL_EOL(); }while(0)
119
+#define _SELP_3(a,b,c)     do{ _SEP_2(a,b); SERIAL_ECHOLNPGM(c); }while(0)
120
+#define _SELP_4(a,b,V...)  do{ _SEP_2(a,b); _SELP_2(V); }while(0)
121
+#define _SELP_5(a,b,V...)  do{ _SEP_2(a,b); _SELP_3(V); }while(0)
122
+#define _SELP_6(a,b,V...)  do{ _SEP_2(a,b); _SELP_4(V); }while(0)
123
+#define _SELP_7(a,b,V...)  do{ _SEP_2(a,b); _SELP_5(V); }while(0)
124
+#define _SELP_8(a,b,V...)  do{ _SEP_2(a,b); _SELP_6(V); }while(0)
125
+#define _SELP_9(a,b,V...)  do{ _SEP_2(a,b); _SELP_7(V); }while(0)
126
+#define _SELP_10(a,b,V...) do{ _SEP_2(a,b); _SELP_8(V); }while(0)
127
+#define _SELP_11(a,b,V...) do{ _SEP_2(a,b); _SELP_9(V); }while(0)
128
+#define _SELP_12(a,b,V...) do{ _SEP_2(a,b); _SELP_10(V); }while(0)
129
+#define _SELP_13(a,b,V...) do{ _SEP_2(a,b); _SELP_11(V); }while(0)
130
+#define _SELP_14(a,b,V...) do{ _SEP_2(a,b); _SELP_12(V); }while(0)
131
+#define _SELP_15(a,b,V...) do{ _SEP_2(a,b); _SELP_13(V); }while(0)
132
+#define _SELP_16(a,b,V...) do{ _SEP_2(a,b); _SELP_14(V); }while(0)
133
+#define _SELP_17(a,b,V...) do{ _SEP_2(a,b); _SELP_15(V); }while(0)
134
+#define _SELP_18(a,b,V...) do{ _SEP_2(a,b); _SELP_16(V); }while(0)
135
+#define _SELP_19(a,b,V...) do{ _SEP_2(a,b); _SELP_17(V); }while(0)
136
+#define _SELP_20(a,b,V...) do{ _SEP_2(a,b); _SELP_18(V); }while(0)
137
+#define _SELP_21(a,b,V...) do{ _SEP_2(a,b); _SELP_19(V); }while(0)
138
+#define _SELP_22(a,b,V...) do{ _SEP_2(a,b); _SELP_20(V); }while(0)
139
+#define _SELP_23(a,b,V...) do{ _SEP_2(a,b); _SELP_21(V); }while(0)
140
+#define _SELP_24(a,b,V...) do{ _SEP_2(a,b); _SELP_22(V); }while(0)
141
+
142
+#define SERIAL_ECHOLNPAIR(V...) _SELP_N(NUM_ARGS(V),V)
143 143
 
144 144
 #define SERIAL_ECHOPGM(S)           (serialprintPGM(PSTR(S)))
145 145
 #define SERIAL_ECHOLNPGM(S)         (serialprintPGM(PSTR(S "\n")))
146 146
 
147
-#define SERIAL_ECHOPAIR_F(pre, ...) do{ SERIAL_ECHO(pre); SERIAL_ECHO_F(__VA_ARGS__); }while(0)
148
-#define SERIAL_ECHOLNPAIR_F(...)    do{ SERIAL_ECHOPAIR_F(__VA_ARGS__); SERIAL_EOL(); }while(0)
147
+#define SERIAL_ECHOPAIR_F(pre, V...) do{ SERIAL_ECHO(pre); SERIAL_ECHO_F(V); }while(0)
148
+#define SERIAL_ECHOLNPAIR_F(V...)    do{ SERIAL_ECHOPAIR_F(V); SERIAL_EOL(); }while(0)
149 149
 
150 150
 #define SERIAL_ECHO_START()         serial_echo_start()
151 151
 #define SERIAL_ERROR_START()        serial_error_start()
@@ -185,4 +185,4 @@ void print_bin(const uint16_t val);
185 185
 void print_xyz(PGM_P const prefix, PGM_P const suffix, const float x, const float y, const float z);
186 186
 void print_xyz(PGM_P const prefix, PGM_P const suffix, const float xyz[]);
187 187
 #define SERIAL_POS(SUFFIX,VAR) do { print_xyz(PSTR("  " STRINGIFY(VAR) "="), PSTR(" : " SUFFIX "\n"), VAR); } while(0)
188
-#define SERIAL_XYZ(PREFIX,...) do { print_xyz(PSTR(PREFIX), nullptr, __VA_ARGS__); } while(0)
188
+#define SERIAL_XYZ(PREFIX,V...) do { print_xyz(PSTR(PREFIX), nullptr, V); } while(0)

Loading…
Zrušit
Uložit