DCCEXParser.cpp

@@ -847,14 +847,13 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
     case 'L': // LCC interface implemented in EXRAIL parser
         break; // Will <X> if not intercepted by EXRAIL 
 
-#ifndef DISABLE_VDPY
     case '@': // JMRI saying "give me virtual LCD msgs"
         CommandDistributor::setVirtualLCDSerial(stream);
         StringFormatter::send(stream,
             F("<@ 0 0 \"DCC-EX v" VERSION "\">\n"
                "<@ 0 1 \"Lic GPLv3\">\n"));
         return; 
-#endif
+
     default: //anything else will diagnose and drop out to <X>
       if (opcode >= ' ' && opcode <= '~') {
         DIAG(F("Opcode=%c params=%d"), opcode, params);
@@ -1065,7 +1064,6 @@ bool DCCEXParser::parseS(Print *stream, int16_t params, int16_t p[])
 }
 
 bool DCCEXParser::parseC(Print *stream, int16_t params, int16_t p[]) {
-    (void)stream; // arg not used, maybe later?
     if (params == 0)
         return false;
     switch (p[0])

GITHUB_SHA.h

@@ -1 +1 @@
-#define GITHUB_SHA "devel-202311232114Z"
+#define GITHUB_SHA "devel-202311230948Z"

StringFormatter.cpp

@@ -39,11 +39,8 @@ void StringFormatter::diag( const FSH* input...) {
 
 void StringFormatter::lcd(byte row, const FSH* input...) {
   va_list args;
-#ifndef DISABLE_VDPY
   Print * virtualLCD=CommandDistributor::getVirtualLCDSerial(0,row);
-#else
-  Print * virtualLCD=NULL;
-#endif
+  
   // Issue the LCD as a diag first
   // Unless the same serial is asking for the virtual @ respomnse
   if (virtualLCD!=&USB_SERIAL) {
@@ -53,14 +50,13 @@ void StringFormatter::lcd(byte row, const FSH* input...) {
     send(&USB_SERIAL,F(" *>\n"));
   }
   
-#ifndef DISABLE_VDPY
   // send to virtual LCD collector (if any) 
   if (virtualLCD) {
     va_start(args, input);
     send2(virtualLCD,input,args);
     CommandDistributor::commitVirtualLCDSerial();
   }
-#endif
+
   DisplayInterface::setRow(row);    
   va_start(args, input);
   send2(DisplayInterface::getDisplayHandler(),input,args);
@@ -70,14 +66,12 @@ void StringFormatter::lcd2(uint8_t display, byte row, const FSH* input...) {
   va_list args;
   
    // send to virtual LCD collector (if any) 
-#ifndef DISABLE_VDPY
   Print * virtualLCD=CommandDistributor::getVirtualLCDSerial(display,row);
   if (virtualLCD) {
     va_start(args, input);
     send2(virtualLCD,input,args);
     CommandDistributor::commitVirtualLCDSerial();
   }
-#endif
 
   DisplayInterface::setRow(display, row);    
   va_start(args, input);
@@ -256,3 +250,4 @@ void StringFormatter::printHex(Print * stream,uint16_t value) {
     result[4]='\0';
      stream->print(result);
 }
+ 

TrackManager.cpp

@@ -532,6 +532,15 @@ void TrackManager::setTrackPower(POWERMODE powermode, byte t) {
   driver->setPower(powermode);
 }
 
+void TrackManager::reportPowerChange(Print* stream, byte thistrack) {
+  // This function is for backward JMRI compatibility only
+  // It reports the first track only, as main, regardless of track settings.
+  //  <c MeterName value C/V unit min max res warn>
+  int maxCurrent=track[0]->raw2mA(track[0]->getRawCurrentTripValue());
+  StringFormatter::send(stream, F("<c CurrentMAIN %d C Milli 0 %d 1 %d>\n"), 
+            track[0]->raw2mA(track[0]->getCurrentRaw(false)), maxCurrent, maxCurrent);                  
+}
+
 // returns state of the one and only prog track
 POWERMODE TrackManager::getProgPower() {
   FOR_EACH_TRACK(t)

TrackManager.h

@@ -88,6 +88,7 @@ class TrackManager {
     static void sampleCurrent();
     static void reportGauges(Print* stream);
     static void reportCurrent(Print* stream);
+    static void reportPowerChange(Print* stream, byte thistrack);
     static void reportObsoleteCurrent(Print* stream); 
     static void streamTrackState(Print* stream, byte t);
     static bool isPowerOn(byte t);

config.example.h

@@ -199,18 +199,6 @@ The configuration file for DCC-EX Command Station
 //
 // #define DISABLE_PROG
 
-/////////////////////////////////////////////////////////////////////////////////////
-// DISABLE / ENABLE VDPY
-//
-// The Virtual display "VDPY" feature is by default enabled everywhere
-// but on Uno and Nano. If you think you can fit it (for example
-// having disabled some of the features above) you can enable it with
-// ENABLE_VDPY. You can even disable it on all other CPUs with
-// DISABLE_VDPY
-//
-// #define DISABLE_VDPY
-// #define ENABLE_VDPY
-
 /////////////////////////////////////////////////////////////////////////////////////
 // REDEFINE WHERE SHORT/LONG ADDR break is. According to NMRA the last short address
 // is 127 and the first long address is 128. There are manufacturers which have

defines.h

@@ -219,9 +219,10 @@
 // The HAL is disabled by default on Nano and Uno platforms, because of limited flash space.
 // 
 #if defined(ARDUINO_AVR_NANO) || defined(ARDUINO_AVR_UNO)
-#define IO_NO_HAL // HAL too big whatever you disable otherwise
-#ifndef ENABLE_VDPY
-#define DISABLE_VDPY
+  #if defined(DISABLE_DIAG) && defined(DISABLE_EEPROM) && defined(DISABLE_PROG)
+    #warning you have sacrificed DIAG for HAL
+  #else
+    #define IO_NO_HAL
   #endif
 #endif