mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-11-24 16:46:13 +01:00
Merge c989a36e21
into 387ea019bd
This commit is contained in:
commit
ee3d963e37
|
@ -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);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user