Skip to content

Commit 321859e

Browse files
committed
Setting line ending for println
1 parent 69b3460 commit 321859e

File tree

2 files changed

+9
-101
lines changed

2 files changed

+9
-101
lines changed

hardware/arduino/avr/cores/arduino/Print.cpp

Lines changed: 4 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/*
2-
Print.cpp - Base class that provides print(), println()
3-
and printlf()
2+
Print.cpp - Base class that provides print() and println().
43
Copyright (c) 2008 David A. Mellis. All right reserved.
54
65
This library is free software; you can redistribute it and/or
@@ -126,7 +125,7 @@ size_t Print::print(const Printable& x)
126125

127126
size_t Print::println(void)
128127
{
129-
return write("\r\n");
128+
return write(line_ending);
130129
}
131130

132131
size_t Print::println(const String &s)
@@ -199,93 +198,10 @@ size_t Print::println(const Printable& x)
199198
return n;
200199
}
201200

202-
203-
// printlf
204-
205-
size_t Print::printlf(void)
206-
{
207-
return write("\n");
208-
}
209-
210-
size_t Print::printlf(const __FlashStringHelper *ifsh)
211-
{
212-
size_t n = print(ifsh);
213-
n += printlf();
214-
return n;
215-
}
216-
217-
218-
size_t Print::printlf(const String &s)
219-
{
220-
size_t n = print(s);
221-
n += printlf();
222-
return n;
223-
}
224-
225-
size_t Print::printlf(const char c[])
226-
{
227-
size_t n = print(c);
228-
n += printlf();
229-
return n;
230-
}
231-
232-
size_t Print::printlf(char c)
233-
{
234-
size_t n = print(c);
235-
n += printlf();
236-
return n;
237-
}
238-
239-
size_t Print::printlf(unsigned char b, int base)
240-
{
241-
size_t n = print(b, base);
242-
n += printlf();
243-
return n;
244-
}
245-
246-
size_t Print::printlf(int num, int base)
247-
{
248-
size_t n = print(num, base);
249-
n += printlf();
250-
return n;
251-
}
252-
253-
size_t Print::printlf(unsigned int num, int base)
254-
{
255-
size_t n = print(num, base);
256-
n += printlf();
257-
return n;
258-
}
259-
260-
size_t Print::printlf(long num, int base)
261-
{
262-
size_t n = print(num, base);
263-
n += printlf();
264-
return n;
265-
}
266-
267-
size_t Print::printlf(unsigned long num, int base)
268-
{
269-
size_t n = print(num, base);
270-
n += printlf();
271-
return n;
201+
void Print::set_line_ending(const char * ending){
202+
line_ending = ending;
272203
}
273204

274-
size_t Print::printlf(double num, int digits)
275-
{
276-
size_t n = print(num, digits);
277-
n += printlf();
278-
return n;
279-
}
280-
281-
size_t Print::printlf(const Printable& x)
282-
{
283-
size_t n = print(x);
284-
n += printlf();
285-
return n;
286-
}
287-
288-
289205
// Private Methods /////////////////////////////////////////////////////////////
290206

291207
size_t Print::printNumber(unsigned long n, uint8_t base)

hardware/arduino/avr/cores/arduino/Print.h

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,13 @@ class Print
4040
int write_error;
4141
size_t printNumber(unsigned long, uint8_t);
4242
size_t printFloat(double, uint8_t);
43+
const char * line_ending;
4344
protected:
4445
void setWriteError(int err = 1) { write_error = err; }
4546
public:
46-
Print() : write_error(0) {}
47+
Print() : write_error(0) {
48+
line_ending = "\r\n";
49+
}
4750

4851
int getWriteError() { return write_error; }
4952
void clearWriteError() { setWriteError(0); }
@@ -87,18 +90,7 @@ class Print
8790
size_t println(const Printable&);
8891
size_t println(void);
8992

90-
size_t printlf(const __FlashStringHelper *);
91-
size_t printlf(const String &s);
92-
size_t printlf(const char[]);
93-
size_t printlf(char);
94-
size_t printlf(unsigned char, int = DEC);
95-
size_t printlf(int, int = DEC);
96-
size_t printlf(unsigned int, int = DEC);
97-
size_t printlf(long, int = DEC);
98-
size_t printlf(unsigned long, int = DEC);
99-
size_t printlf(double, int = 2);
100-
size_t printlf(const Printable&);
101-
size_t printlf(void);
93+
void set_line_ending(const char * ending);
10294

10395
virtual void flush() { /* Empty implementation for backward compatibility */ }
10496
};

0 commit comments

Comments
 (0)