Merge 5aca3a62d8 into d46a6f092a

DCC.h

@@ -43,11 +43,7 @@ const uint16_t LONG_ADDR_MARKER = 0x4000;
 // Allocations with memory implications..!
 // Base system takes approx 900 bytes + 8 per loco. Turnouts, Sensors etc are dynamically created
 #if defined(HAS_ENOUGH_MEMORY)
-#if defined(ARDUINO_GIGA) // yes giga
-const byte MAX_LOCOS = 100;
-#else // no giga
 const byte MAX_LOCOS = 50;
-#endif // giga
 #else
 const byte MAX_LOCOS = 30;
 #endif

StringFormatter.cpp

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