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