Scott Lahteine 7 years ago
parent
commit
742cff5f3c
2 changed files with 24 additions and 24 deletions
  1. 12
    12
      Marlin/src/HAL/HAL_LPC1768/HardwareSerial.h
  2. 12
    12
      Marlin/src/HAL/HAL_LPC1768/serial.h

+ 12
- 12
Marlin/src/HAL/HAL_LPC1768/HardwareSerial.h View File

92
   void print(const char value[]) {
92
   void print(const char value[]) {
93
     printf("%s" , value);
93
     printf("%s" , value);
94
   }
94
   }
95
-  void print(char value, int nbase = BYTE) {
95
+  void print(char value, int nbase = 0) {
96
     if (nbase == BIN) print_bin(value,8);
96
     if (nbase == BIN) print_bin(value,8);
97
     else if (nbase == OCT) printf("%3o", value);
97
     else if (nbase == OCT) printf("%3o", value);
98
     else if (nbase == HEX) printf("%2X", value);
98
     else if (nbase == HEX) printf("%2X", value);
99
     else if (nbase == DEC ) printf("%d", value);
99
     else if (nbase == DEC ) printf("%d", value);
100
     else printf("%c" , value);
100
     else printf("%c" , value);
101
   }
101
   }
102
-  void print(unsigned char value, int nbase = BYTE) {
102
+  void print(unsigned char value, int nbase = 0) {
103
     if (nbase == BIN) print_bin(value,8);
103
     if (nbase == BIN) print_bin(value,8);
104
     else if (nbase == OCT) printf("%3o", value);
104
     else if (nbase == OCT) printf("%3o", value);
105
     else if (nbase == HEX) printf("%2X", value);
105
     else if (nbase == HEX) printf("%2X", value);
106
     else printf("%u" , value);
106
     else printf("%u" , value);
107
   }
107
   }
108
-  void print(int value, int nbase = BYTE) {
108
+  void print(int value, int nbase = 0) {
109
     if (nbase == BIN) print_bin(value,16);
109
     if (nbase == BIN) print_bin(value,16);
110
     else if (nbase == OCT) printf("%6o", value);
110
     else if (nbase == OCT) printf("%6o", value);
111
     else if (nbase == HEX) printf("%4X", value);
111
     else if (nbase == HEX) printf("%4X", value);
112
     else printf("%d", value);
112
     else printf("%d", value);
113
   }
113
   }
114
-  void print(unsigned int value, int nbase = BYTE) {
114
+  void print(unsigned int value, int nbase = 0) {
115
     if (nbase == BIN) print_bin(value,16);
115
     if (nbase == BIN) print_bin(value,16);
116
     else if (nbase == OCT) printf("%6o", value);
116
     else if (nbase == OCT) printf("%6o", value);
117
     else if (nbase == HEX) printf("%4X", value);
117
     else if (nbase == HEX) printf("%4X", value);
118
     else printf("%u" , value);
118
     else printf("%u" , value);
119
   }
119
   }
120
-  void print(long value, int nbase = BYTE) {
120
+  void print(long value, int nbase = 0) {
121
     if (nbase == BIN) print_bin(value,32);
121
     if (nbase == BIN) print_bin(value,32);
122
     else if (nbase == OCT) printf("%11o", value);
122
     else if (nbase == OCT) printf("%11o", value);
123
     else if (nbase == HEX) printf("%8X", value);
123
     else if (nbase == HEX) printf("%8X", value);
124
     else printf("%ld" , value);
124
     else printf("%ld" , value);
125
   }
125
   }
126
-  void print(unsigned long value, int nbase = BYTE) {
126
+  void print(unsigned long value, int nbase = 0) {
127
     if (nbase == BIN) print_bin(value,32);
127
     if (nbase == BIN) print_bin(value,32);
128
     else if (nbase == OCT) printf("%11o", value);
128
     else if (nbase == OCT) printf("%11o", value);
129
     else if (nbase == HEX) printf("%8X", value);
129
     else if (nbase == HEX) printf("%8X", value);
141
   void println(const char value[]) {
141
   void println(const char value[]) {
142
     printf("%s\n" , value);
142
     printf("%s\n" , value);
143
   }
143
   }
144
-  void println(char value, int nbase = BYTE) {
144
+  void println(char value, int nbase = 0) {
145
     print(value, nbase);
145
     print(value, nbase);
146
     println();
146
     println();
147
   }
147
   }
148
-  void println(unsigned char value, int nbase = BYTE) {
148
+  void println(unsigned char value, int nbase = 0) {
149
     print(value, nbase);
149
     print(value, nbase);
150
     println();
150
     println();
151
   }
151
   }
152
-  void println(int value, int nbase = BYTE) {
152
+  void println(int value, int nbase = 0) {
153
     print(value, nbase);
153
     print(value, nbase);
154
     println();
154
     println();
155
   }
155
   }
156
-  void println(unsigned int value, int nbase = BYTE) {
156
+  void println(unsigned int value, int nbase = 0) {
157
     print(value, nbase);
157
     print(value, nbase);
158
     println();
158
     println();
159
   }
159
   }
160
-  void println(long value, int nbase = BYTE) {
160
+  void println(long value, int nbase = 0) {
161
     print(value, nbase);
161
     print(value, nbase);
162
     println();
162
     println();
163
   }
163
   }
164
-  void println(unsigned long value, int nbase = BYTE) {
164
+  void println(unsigned long value, int nbase = 0) {
165
     print(value, nbase);
165
     print(value, nbase);
166
     println();
166
     println();
167
   }
167
   }

+ 12
- 12
Marlin/src/HAL/HAL_LPC1768/serial.h View File

142
   }
142
   }
143
 
143
 
144
   void print(const char value[]) { printf("%s" , value); }
144
   void print(const char value[]) { printf("%s" , value); }
145
-  void print(char value, int nbase = BYTE) {
145
+  void print(char value, int nbase = 0) {
146
     if (nbase == BIN) print_bin(value, 8);
146
     if (nbase == BIN) print_bin(value, 8);
147
     else if (nbase == OCT) printf("%3o", value);
147
     else if (nbase == OCT) printf("%3o", value);
148
     else if (nbase == HEX) printf("%2X", value);
148
     else if (nbase == HEX) printf("%2X", value);
149
     else if (nbase == DEC ) printf("%d", value);
149
     else if (nbase == DEC ) printf("%d", value);
150
     else printf("%c" , value);
150
     else printf("%c" , value);
151
   }
151
   }
152
-  void print(unsigned char value, int nbase = BYTE) {
152
+  void print(unsigned char value, int nbase = 0) {
153
     if (nbase == BIN) print_bin(value, 8);
153
     if (nbase == BIN) print_bin(value, 8);
154
     else if (nbase == OCT) printf("%3o", value);
154
     else if (nbase == OCT) printf("%3o", value);
155
     else if (nbase == HEX) printf("%2X", value);
155
     else if (nbase == HEX) printf("%2X", value);
156
     else printf("%u" , value);
156
     else printf("%u" , value);
157
   }
157
   }
158
-  void print(int value, int nbase = BYTE) {
158
+  void print(int value, int nbase = 0) {
159
     if (nbase == BIN) print_bin(value, 16);
159
     if (nbase == BIN) print_bin(value, 16);
160
     else if (nbase == OCT) printf("%6o", value);
160
     else if (nbase == OCT) printf("%6o", value);
161
     else if (nbase == HEX) printf("%4X", value);
161
     else if (nbase == HEX) printf("%4X", value);
162
     else printf("%d", value);
162
     else printf("%d", value);
163
   }
163
   }
164
-  void print(unsigned int value, int nbase = BYTE) {
164
+  void print(unsigned int value, int nbase = 0) {
165
     if (nbase == BIN) print_bin(value, 16);
165
     if (nbase == BIN) print_bin(value, 16);
166
     else if (nbase == OCT) printf("%6o", value);
166
     else if (nbase == OCT) printf("%6o", value);
167
     else if (nbase == HEX) printf("%4X", value);
167
     else if (nbase == HEX) printf("%4X", value);
168
     else printf("%u" , value);
168
     else printf("%u" , value);
169
   }
169
   }
170
-  void print(long value, int nbase = BYTE) {
170
+  void print(long value, int nbase = 0) {
171
     if (nbase == BIN) print_bin(value, 32);
171
     if (nbase == BIN) print_bin(value, 32);
172
     else if (nbase == OCT) printf("%11o", value);
172
     else if (nbase == OCT) printf("%11o", value);
173
     else if (nbase == HEX) printf("%8X", value);
173
     else if (nbase == HEX) printf("%8X", value);
174
     else printf("%ld" , value);
174
     else printf("%ld" , value);
175
   }
175
   }
176
-  void print(unsigned long value, int nbase = BYTE) {
176
+  void print(unsigned long value, int nbase = 0) {
177
     if (nbase == BIN) print_bin(value, 32);
177
     if (nbase == BIN) print_bin(value, 32);
178
     else if (nbase == OCT) printf("%11o", value);
178
     else if (nbase == OCT) printf("%11o", value);
179
     else if (nbase == HEX) printf("%8X", value);
179
     else if (nbase == HEX) printf("%8X", value);
183
   void print(double value, int round = 6) { printf("%f" , value); }
183
   void print(double value, int round = 6) { printf("%f" , value); }
184
 
184
 
185
   void println(const char value[]) { printf("%s\n" , value); }
185
   void println(const char value[]) { printf("%s\n" , value); }
186
-  void println(char value, int nbase = BYTE) { print(value, nbase); println(); }
187
-  void println(unsigned char value, int nbase = BYTE) { print(value, nbase); println(); }
188
-  void println(int value, int nbase = BYTE) { print(value, nbase); println(); }
189
-  void println(unsigned int value, int nbase = BYTE) { print(value, nbase); println(); }
190
-  void println(long value, int nbase = BYTE) { print(value, nbase); println(); }
191
-  void println(unsigned long value, int nbase = BYTE) { print(value, nbase); println(); }
186
+  void println(char value, int nbase = 0) { print(value, nbase); println(); }
187
+  void println(unsigned char value, int nbase = 0) { print(value, nbase); println(); }
188
+  void println(int value, int nbase = 0) { print(value, nbase); println(); }
189
+  void println(unsigned int value, int nbase = 0) { print(value, nbase); println(); }
190
+  void println(long value, int nbase = 0) { print(value, nbase); println(); }
191
+  void println(unsigned long value, int nbase = 0) { print(value, nbase); println(); }
192
   void println(float value, int round = 6) { printf("%f\n" , value); }
192
   void println(float value, int round = 6) { printf("%f\n" , value); }
193
   void println(double value, int round = 6) { printf("%f\n" , value); }
193
   void println(double value, int round = 6) { printf("%f\n" , value); }
194
   void println(void) { print('\n'); }
194
   void println(void) { print('\n'); }

Loading…
Cancel
Save