1
0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2025-02-22 00:36:04 +01:00

patching in PR # 366

This commit is contained in:
travis-farmer 2023-11-19 16:55:06 -05:00
parent 1a4fff8924
commit 5906735c56
No known key found for this signature in database
GPG Key ID: 0BC296791D14CB35

View File

@ -39,11 +39,11 @@ void StringFormatter::diag( const FSH* input...) {
void StringFormatter::lcd(byte row, const FSH* input...) { void StringFormatter::lcd(byte row, const FSH* input...) {
va_list args; va_list args;
// Issue the LCD as a diag first // Copy to serial client for display 0 <@ display# line# "message">
send(&USB_SERIAL,F("<* LCD%d:"),row); send(&USB_SERIAL,F("<@ 0 %d \""),row);
va_start(args, input); va_start(args, input);
send2(&USB_SERIAL,input,args); send2(&USB_SERIAL,input,args);
send(&USB_SERIAL,F(" *>\n")); send(&USB_SERIAL,F("\">\n"));
DisplayInterface::setRow(row); DisplayInterface::setRow(row);
va_start(args, input); va_start(args, input);
@ -53,6 +53,12 @@ void StringFormatter::lcd(byte row, const FSH* input...) {
void StringFormatter::lcd2(uint8_t display, byte row, const FSH* input...) { void StringFormatter::lcd2(uint8_t display, byte row, const FSH* input...) {
va_list args; va_list args;
// Copy to serial client <@ display# line# "message">
send(&USB_SERIAL,F("<@ %d %d \""),display,row);
va_start(args, input);
send2(&USB_SERIAL,input,args);
send(&USB_SERIAL,F("\">\n"));
DisplayInterface::setRow(display, row); DisplayInterface::setRow(display, row);
va_start(args, input); va_start(args, input);
send2(DisplayInterface::getDisplayHandler(),input,args); send2(DisplayInterface::getDisplayHandler(),input,args);