dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2025-07-30 19:03:44 +02:00
Code Releases Activity

Change Stream refernces to pointers

Browse Source 
I misunderstood that references can never be changed.
This commit is contained in:
Asbelos
2020-08-01 16:32:16 +01:00
parent a14b9ef8bf
commit 9044cce2a3
13 changed files with 123 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
StringFormatter.cpp
View File

@@ -22,16 +22,22 @@
void StringFormatter::print( const __FlashStringHelper* input...) {
va_list args;
va_start(args, input);
send2(DIAGSERIAL,input,args);
send(& DIAGSERIAL,input,args);
}
void StringFormatter::send(Print & stream, const __FlashStringHelper* input...) {
va_list args;
va_start(args, input);
send2(stream,input,args);
send(& stream,input,args);
}
void StringFormatter::send(Print * stream, const __FlashStringHelper* input...) {
va_list args;
va_start(args, input);
send(stream,input,args);
}
void StringFormatter::send2(Print & stream,const __FlashStringHelper* format, va_list args) {
void StringFormatter::send(Print * stream,const __FlashStringHelper* format, va_list args) {
// thanks to Jan Turoň https://arduino.stackexchange.com/questions/56517/formatting-strings-in-arduino-for-output
@@ -39,35 +45,35 @@ void StringFormatter::send2(Print & stream,const __FlashStringHelper* format, va
for(int i=0; ; ++i) {
char c=pgm_read_byte_near(flash+i);
if (c=='\0') return;
if(c!='%') { stream.print(c); continue; }
if(c!='%') { stream->print(c); continue; }
i++;
c=pgm_read_byte_near(flash+i);
switch(c) {
case '%': stream.print('%'); break;
case 'c': stream.print((char) va_arg(args, int)); break;
case 's': stream.print(va_arg(args, char*)); break;
case '%': stream->print('%'); break;
case 'c': stream->print((char) va_arg(args, int)); break;
case 's': stream->print(va_arg(args, char*)); break;
case 'e': printEscapes(stream,va_arg(args, char*)); break;
case 'E': printEscapes(stream,(const __FlashStringHelper*)va_arg(args, char*)); break;
case 'S': stream.print((const __FlashStringHelper*)va_arg(args, char*)); break;
case 'd': stream.print(va_arg(args, int), DEC); break;
case 'l': stream.print(va_arg(args, long), DEC); break;
case 'b': stream.print(va_arg(args, int), BIN); break;
case 'o': stream.print(va_arg(args, int), OCT); break;
case 'x': stream.print(va_arg(args, int), HEX); break;
case 'f': stream.print(va_arg(args, double), 2); break;
case 'S': stream->print((const __FlashStringHelper*)va_arg(args, char*)); break;
case 'd': stream->print(va_arg(args, int), DEC); break;
case 'l': stream->print(va_arg(args, long), DEC); break;
case 'b': stream->print(va_arg(args, int), BIN); break;
case 'o': stream->print(va_arg(args, int), OCT); break;
case 'x': stream->print(va_arg(args, int), HEX); break;
case 'f': stream->print(va_arg(args, double), 2); break;
}
}
va_end(args);
}
void StringFormatter::printEscapes(Print & stream, char * input) {
void StringFormatter::printEscapes(Print * stream, char * input) {
for(int i=0; ; ++i) {
char c=input[i];
printEscape(stream,c);
if (c=='\0') return;
}
}
void StringFormatter::printEscapes(Print & stream, const __FlashStringHelper* input) {
void StringFormatter::printEscapes(Print * stream, const __FlashStringHelper* input) {
char* flash=(char*)input;
for(int i=0; ; ++i) {
char c=pgm_read_byte_near(flash+i);
@@ -75,14 +81,14 @@ void StringFormatter::printEscapes(Print & stream, const __FlashStringHelper* in
if (c=='\0') return;
}
}
void StringFormatter::printEscape(Print & stream, char c) {
void StringFormatter::printEscape(Print * stream, char c) {
switch(c) {
case '\n': stream.print(F("\\n")); break;
case '\r': stream.print(F("\\r")); break;
case '\0': stream.print(F("\\0")); return;
case '\t': stream.print(F("\\t")); break;
case '\\': stream.print(F("\\")); break;
default: stream.print(c);
case '\n': stream->print(F("\\n")); break;
case '\r': stream->print(F("\\r")); break;
case '\0': stream->print(F("\\0")); return;
case '\t': stream->print(F("\\t")); break;
case '\\': stream->print(F("\\")); break;
default: stream->print(c);
}
}