dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-23 08:06:13 +01:00
Code Releases Activity

indentation and LCD macro use

Browse Source 
No actual code change.
This commit is contained in:
Asbelos 2021-08-23 12:35:42 +01:00
parent 214e6c643f
commit 161b35ae84
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DCC.cpp
View File

@ -910,7 +910,7 @@ void DCC::callback(int value) {
// check for automatic retry // check for automatic retry
if (value == -1 && ackManagerRetry > 0) { if (value == -1 && ackManagerRetry > 0) {
ackRetrySum ++; ackRetrySum ++;
StringFormatter::lcd(0, F("RETRY %d %d %d %d"), ackManagerCv, ackManagerRetry, ackRetry, ackRetrySum); LCD(0, F("RETRY %d %d %d %d"), ackManagerCv, ackManagerRetry, ackRetry, ackRetrySum);
ackManagerRetry --; ackManagerRetry --;
ackManagerProg = ackManagerProgStart; ackManagerProg = ackManagerProgStart;
return; return;

22
DCCEXParser.cpp
View File

@ -469,7 +469,7 @@ void DCCEXParser::parse(Print *stream, byte *com, RingStream * ringStream)
if (mode == POWERMODE::OFF) if (mode == POWERMODE::OFF)
DCC::setProgTrackBoost(false); // Prog track boost mode will not outlive prog track off DCC::setProgTrackBoost(false); // Prog track boost mode will not outlive prog track off
StringFormatter::send(stream, F("<p%c>\n"), opcode); StringFormatter::send(stream, F("<p%c>\n"), opcode);
StringFormatter::lcd(2, F("p%c"), opcode); LCD(2, F("p%c"), opcode);
return; return;
} }
switch (p[0]) switch (p[0])
@ -477,7 +477,7 @@ void DCCEXParser::parse(Print *stream, byte *com, RingStream * ringStream)
case HASH_KEYWORD_MAIN: case HASH_KEYWORD_MAIN:
DCCWaveform::mainTrack.setPowerMode(mode); DCCWaveform::mainTrack.setPowerMode(mode);
StringFormatter::send(stream, F("<p%c MAIN>\n"), opcode); StringFormatter::send(stream, F("<p%c MAIN>\n"), opcode);
StringFormatter::lcd(2, F("p%c MAIN"), opcode); LCD(2, F("p%c MAIN"), opcode);
return; return;
case HASH_KEYWORD_PROG: case HASH_KEYWORD_PROG:
@ -485,7 +485,7 @@ void DCCEXParser::parse(Print *stream, byte *com, RingStream * ringStream)
if (mode == POWERMODE::OFF) if (mode == POWERMODE::OFF)
DCC::setProgTrackBoost(false); // Prog track boost mode will not outlive prog track off DCC::setProgTrackBoost(false); // Prog track boost mode will not outlive prog track off
StringFormatter::send(stream, F("<p%c PROG>\n"), opcode); StringFormatter::send(stream, F("<p%c PROG>\n"), opcode);
StringFormatter::lcd(2, F("p%c PROG"), opcode); LCD(2, F("p%c PROG"), opcode);
return; return;
case HASH_KEYWORD_JOIN: case HASH_KEYWORD_JOIN:
DCCWaveform::mainTrack.setPowerMode(mode); DCCWaveform::mainTrack.setPowerMode(mode);
@ -494,13 +494,13 @@ void DCCEXParser::parse(Print *stream, byte *com, RingStream * ringStream)
{ {
DCC::setProgTrackSyncMain(true); DCC::setProgTrackSyncMain(true);
StringFormatter::send(stream, F("<p1 JOIN>\n"), opcode); StringFormatter::send(stream, F("<p1 JOIN>\n"), opcode);
StringFormatter::lcd(2, F("p1 JOIN")); LCD(2, F("p1 JOIN"));
} }
else else
{ {
StringFormatter::send(stream, F("<p0>\n")); StringFormatter::send(stream, F("<p0>\n"));
StringFormatter::lcd(2, F("p0")); LCD(2, F("p0"));
} }
return; return;
} }
break; break;
@ -809,17 +809,17 @@ bool DCCEXParser::parseD(Print *stream, int16_t params, int16_t p[])
if (params >= 3) { if (params >= 3) {
if (p[1] == HASH_KEYWORD_LIMIT) { if (p[1] == HASH_KEYWORD_LIMIT) {
DCCWaveform::progTrack.setAckLimit(p[2]); DCCWaveform::progTrack.setAckLimit(p[2]);
StringFormatter::lcd(1, F("Ack Limit=%dmA"), p[2]); // <D ACK LIMIT 42> LCD(1, F("Ack Limit=%dmA"), p[2]); // <D ACK LIMIT 42>
} else if (p[1] == HASH_KEYWORD_MIN) { } else if (p[1] == HASH_KEYWORD_MIN) {
DCCWaveform::progTrack.setMinAckPulseDuration(p[2]); DCCWaveform::progTrack.setMinAckPulseDuration(p[2]);
StringFormatter::lcd(0, F("Ack Min=%dus"), p[2]); // <D ACK MIN 1500> LCD(0, F("Ack Min=%dus"), p[2]); // <D ACK MIN 1500>
} else if (p[1] == HASH_KEYWORD_MAX) { } else if (p[1] == HASH_KEYWORD_MAX) {
DCCWaveform::progTrack.setMaxAckPulseDuration(p[2]); DCCWaveform::progTrack.setMaxAckPulseDuration(p[2]);
StringFormatter::lcd(0, F("Ack Max=%dus"), p[2]); // <D ACK MAX 9000> LCD(0, F("Ack Max=%dus"), p[2]); // <D ACK MAX 9000>
} else if (p[1] == HASH_KEYWORD_RETRY) { } else if (p[1] == HASH_KEYWORD_RETRY) {
if (p[2] >255) p[2]=3; if (p[2] >255) p[2]=3;
DCC::setAckRetry(p[2]); DCC::setAckRetry(p[2]);
StringFormatter::lcd(0, F("Ack Retry=%d"), p[2]); // <D ACK RETRY 2> LCD(0, F("Ack Retry=%d"), p[2]); // <D ACK RETRY 2>
} }
} else { } else {
StringFormatter::send(stream, F("Ack diag %S\n"), onOff ? F("on") : F("off")); StringFormatter::send(stream, F("Ack diag %S\n"), onOff ? F("on") : F("off"));