1
0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-12-24 13:21:23 +01:00
This commit is contained in:
Asbelos 2021-12-28 19:06:47 +00:00
parent 7fc2d32ad3
commit a003d54fdd

View File

@ -85,8 +85,7 @@ const int StringMacroTracker1=__COUNTER__;
void RMFT2::printMessage(uint16_t id) { void RMFT2::printMessage(uint16_t id) {
switch(id) { switch(id) {
#include "myAutomation.h" #include "myAutomation.h"
default: DIAG(F("printMessage error %d %d"),id,StringMacroTracker1); default: break ;
break ;
} }
} }
@ -104,8 +103,7 @@ void RMFT2::emitTurnoutDescription(Print* stream,int16_t turnoutid) {
const FSH * desc=F(""); const FSH * desc=F("");
switch (turnoutid) { switch (turnoutid) {
#include "myAutomation.h" #include "myAutomation.h"
default: default: break;
break;
} }
if (GETFLASH(desc)=='\0') desc=F("%d"); if (GETFLASH(desc)=='\0') desc=F("%d");
StringFormatter::send(stream,desc,turnoutid); StringFormatter::send(stream,desc,turnoutid);
@ -125,7 +123,7 @@ const byte RMFT2::rosterNameCount=0
#undef ROSTER #undef ROSTER
#define ROSTER(cabid,name,funcmap...) StringFormatter::send(stream,(FSH *)format,F(name),cabid,cabid<128?'S':'L'); #define ROSTER(cabid,name,funcmap...) StringFormatter::send(stream,(FSH *)format,F(name),cabid,cabid<128?'S':'L');
void RMFT2::emitWithrottleRoster(Print * stream) { void RMFT2::emitWithrottleRoster(Print * stream) {
static const char format[] PROGMEM ="]\\[%S}|{%d}|{%c"; static const char format[] FLASH ="]\\[%S}|{%d}|{%c";
StringFormatter::send(stream,F("RL%d"), rosterNameCount); StringFormatter::send(stream,F("RL%d"), rosterNameCount);
#include "myAutomation.h" #include "myAutomation.h"
stream->write('\n'); stream->write('\n');