From 1c2df3fe22478bf10f20134f52d7e779c9bab04d Mon Sep 17 00:00:00 2001
From: Harald Barth <haba@kth.se>
Date: Thu, 8 Oct 2020 23:39:04 +0200
Subject: [PATCH] Ack current setable by debug statement D ACK LIMIT n

---
 DCCEXParser.cpp |  7 ++++++-
 DCCWaveform.cpp | 11 +++++++----
 DCCWaveform.h   |  4 ++++
 MotorDriver.h   | 14 +++++++++-----
 4 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/DCCEXParser.cpp b/DCCEXParser.cpp
index 4f4030c..5a7c4fc 100644
--- a/DCCEXParser.cpp
+++ b/DCCEXParser.cpp
@@ -47,6 +47,7 @@ const int HASH_KEYWORD_DCC = 6436;
 const int HASH_KEYWORD_SLOW = -17209;
 const int HASH_KEYWORD_PROGBOOST = -6353;
 const int HASH_KEYWORD_EEPROM = -7168;
+const int HASH_KEYWORD_LIMIT = 27413;
 
 int DCCEXParser::stashP[MAX_PARAMS];
 bool DCCEXParser::stashBusy;
@@ -586,7 +587,11 @@ bool DCCEXParser::parseD(Print *stream, int params, int p[])
         break;
 
     case HASH_KEYWORD_ACK: // <D ACK ON/OFF>
-        Diag::ACK = onOff;
+	if (params >= 2 && p[1] == HASH_KEYWORD_LIMIT) {
+	  DCCWaveform::progTrack.setAckLimit(p[2]);
+          StringFormatter::send(stream, F("\nAck limit=%dmA\n"), p[2]);
+	} else
+	  Diag::ACK = onOff;
         return true;
 
     case HASH_KEYWORD_CMD: // <D CMD ON/OFF>
diff --git a/DCCWaveform.cpp b/DCCWaveform.cpp
index a70ab16..bec16b3 100644
--- a/DCCWaveform.cpp
+++ b/DCCWaveform.cpp
@@ -128,7 +128,7 @@ void DCCWaveform::checkPowerOverload() {
 
   if (millis() - lastSampleTaken  < sampleDelay) return;
   lastSampleTaken = millis();
-  int tripValue= motorDriver->rawCurrentTripValue;
+  int tripValue= motorDriver->getRawCurrentTripValue();
   if (!isMainTrack && !ackPending && !progTrackSyncMain && !progTrackBoosted)
     tripValue=progTripValue;
   
@@ -292,9 +292,12 @@ int DCCWaveform::getLastCurrent() {
 // (yes I know I could have subclassed the main track but...) 
 
 void DCCWaveform::setAckBaseline() {
-      if (isMainTrack) return; 
-      ackThreshold=motorDriver->getCurrentRaw() + (int)(65 / motorDriver->senseFactor);
-      if (Diag::ACK) DIAG(F("\nACK-BASELINE %d/%dmA"),ackThreshold,motorDriver->raw2mA(ackThreshold));
+      if (isMainTrack) return;
+      int baseline = motorDriver->getCurrentRaw();
+      ackThreshold= baseline + motorDriver->mA2raw(ackLimitmA);
+      if (Diag::ACK) DIAG(F("\nACK baseline=%d/%dmA threshold=%d/%dmA"),
+			  baseline,motorDriver->raw2mA(baseline),
+			  ackThreshold,motorDriver->raw2mA(ackThreshold));
 }
 
 void DCCWaveform::setAckPending() {
diff --git a/DCCWaveform.h b/DCCWaveform.h
index d607420..507cc3d 100644
--- a/DCCWaveform.h
+++ b/DCCWaveform.h
@@ -76,6 +76,9 @@ class DCCWaveform {
 	    autoPowerOff=false;
 	}
     };
+    inline void setAckLimit(int mA) {
+	ackLimitmA = mA;
+    }
      
   private:
     static VirtualTimer * interruptTimer;      
@@ -118,6 +121,7 @@ class DCCWaveform {
     bool ackPending;    
     bool ackDetected;   
     int  ackThreshold; 
+    int  ackLimitmA = 60;
     int ackMaxCurrent;
     unsigned long ackCheckStart; // millis
     unsigned int ackCheckDuration; // millis       
diff --git a/MotorDriver.h b/MotorDriver.h
index cce07ad..cbc09cc 100644
--- a/MotorDriver.h
+++ b/MotorDriver.h
@@ -29,12 +29,16 @@ class MotorDriver {
     virtual int  getCurrentRaw();
     virtual unsigned int raw2mA( int raw);
     virtual int mA2raw( unsigned int mA);
-  
+    inline int getRawCurrentTripValue() {
+	return rawCurrentTripValue;
+    }
+
+  private:
     byte powerPin, signalPin, signalPin2, brakePin,currentPin,faultPin;
-   float senseFactor;
-   unsigned int tripMilliamps;
-   int rawCurrentTripValue;
-   const byte UNUSED_PIN = 255;
+    float senseFactor;
+    unsigned int tripMilliamps;
+    int rawCurrentTripValue;
+    const byte UNUSED_PIN = 255;
     
 };
 #endif