only update if changed

DCCWaveform.cpp

@@ -34,6 +34,9 @@ int  DCCWaveform::progTripValue=0;
 volatile uint8_t DCCWaveform::numAckGaps=0;
 volatile uint8_t DCCWaveform::numAckSamples=0;
 uint8_t DCCWaveform::trailingEdgeCounter=0;
+static unsigned long lastLCDCurrentDisplay=0;
+#define LCD_SAMPLE_PERIOD 2000 // milliseconds
+static uint16_t lastLCDCurrent=0xFFFF;
 
 void DCCWaveform::begin(MotorDriver * mainDriver, MotorDriver * progDriver) {
   mainTrack.motorDriver=mainDriver;
@@ -119,8 +122,9 @@ void DCCWaveform::setPowerMode(POWERMODE mode) {
 
 
 void DCCWaveform::checkPowerOverload(bool ackManagerActive) {
-  if (millis() - lastSampleTaken  < sampleDelay) return;
-  lastSampleTaken = millis();
+  unsigned long now = millis();
+  if (now - lastSampleTaken  < sampleDelay) return;
+  lastSampleTaken = now;
   int tripValue= motorDriver->getRawCurrentTripValue();
   if (!isMainTrack && !ackManagerActive && !progTrackSyncMain && !progTrackBoosted)
     tripValue=progTripValue;
@@ -181,6 +185,14 @@ void DCCWaveform::checkPowerOverload(bool ackManagerActive) {
     default:
       sampleDelay = 999; // cant get here..meaningless statement to avoid compiler warning.
   }
+  if (isMainTrack && now - lastLCDCurrentDisplay > LCD_SAMPLE_PERIOD) {
+    lastLCDCurrentDisplay=now;
+    uint16_t c=mainTrack.getCurrentmA();
+    if (c != lastLCDCurrent) {
+      lastLCDCurrent=c;
+      LCD(2,F("I=%dmA"), c);
+    }
+  }
 }
 // For each state of the wave  nextState=stateTransform[currentState] 
 const WAVE_STATE DCCWaveform::stateTransform[]={

GITHUB_SHA.h

@@ -1 +1 @@
-#define GITHUB_SHA "ee5db61"
+#define GITHUB_SHA "LDC-show-current 2021114-20:14"

StringFormatter.cpp

@@ -50,12 +50,13 @@ void StringFormatter::lcd(byte row, const FSH* input...) {
   va_list args;
 
   // Issue the LCD as a diag first
-  send(diagSerial,F("<* LCD%d:"),row);
-  va_start(args, input);
-  send2(diagSerial,input,args);
-  send(diagSerial,F(" *>\n"));
-  
-  if (!LCDDisplay::lcdDisplay) return;
+  if (!LCDDisplay::lcdDisplay) {
+    send(diagSerial,F("<* LCD%d:"),row);
+    va_start(args, input);
+    send2(diagSerial,input,args);
+    send(diagSerial,F(" *>\n"));
+    return;
+  }
   LCDDisplay::lcdDisplay->setRow(row);    
   va_start(args, input);
   send2(LCDDisplay::lcdDisplay,input,args);