Merge branch 'tinker2-mega' into mergefix-2

Conflicts:
	Config.h
	DCCEXParser.cpp
	DCCWaveform.cpp
	DCCWaveform.h
	Hardware.cpp

Config.h

@@ -6,23 +6,27 @@
 
 // This hardware configuration would normally be setup using a bunch of #ifdefs.
 
-const byte MAIN_POWER_PIN = 3;
+const byte UNUSED_PIN = 255;
-const byte MAIN_SIGNAL_PIN = 12;
+
-const byte MAIN_SIGNAL_PIN_ALT = 0;  // for hardware that flipflops signal pins 
+const byte MAIN_POWER_PIN = 4;
+const byte MAIN_SIGNAL_PIN = 7;
+const byte MAIN_SIGNAL_PIN_ALT = UNUSED_PIN;  // for hardware that flipflops signal pins 
 const byte MAIN_SENSE_PIN = A0;   
 const byte MAIN_BRAKE_PIN = 9;
+const byte MAIN_FAULT_PIN = 12;
 
 const int   MAIN_MAX_MILLIAMPS=2000;
-const float MAIN_SENSE_FACTOR=1.717; //  analgRead(MAIN_SENSE_PIN) * MAIN_SENSE_FACTOR = milliamps 
+const float MAIN_SENSE_FACTOR=18; //  analgRead(MAIN_SENSE_PIN) * MAIN_SENSE_FACTOR = milliamps 
 
-const byte PROG_POWER_PIN = 11;
+const byte PROG_POWER_PIN = 2;
-const byte PROG_SIGNAL_PIN = 13;
+const byte PROG_SIGNAL_PIN = 8;
-const byte PROG_SIGNAL_PIN_ALT = 0;  // for hardware that flipflops signal pins 
+const byte PROG_SIGNAL_PIN_ALT = UNUSED_PIN;  // for hardware that flipflops signal pins 
 const byte PROG_SENSE_PIN = A1;
-const byte PROG_BRAKE_PIN = 8;
+const byte PROG_BRAKE_PIN = 10;
+const byte PROG_FAULT_PIN = UNUSED_PIN;
 
 const int   PROG_MAX_MILLIAMPS=250;
-const float PROG_SENSE_FACTOR=1.717; //  analgRead(PROG_SENSE_PIN) * PROG_SENSE_FACTOR = milliamps 
+const float PROG_SENSE_FACTOR=18; //  analgRead(PROG_SENSE_PIN) * PROG_SENSE_FACTOR = milliamps 
 
 // Allocations with memory implications..!
 // Base system takes approx 900 bytes + 8 per loco. Turnouts, Sensors etc are dynamically created

DCCWaveform.cpp

@@ -93,7 +93,9 @@ POWERMODE DCCWaveform::getPowerMode() {
 
 void DCCWaveform::setPowerMode(POWERMODE mode) {
   powerMode = mode;
-  Hardware::setPower(isMainTrack, mode == POWERMODE::ON);
+  bool ison = (mode == POWERMODE::ON);
+  Hardware::setPower(isMainTrack, ison);
+  Hardware::setBrake(isMainTrack, !ison);
   if (mode == POWERMODE::ON) delay(200);
 }
 
@@ -112,13 +114,20 @@ void DCCWaveform::checkPowerOverload() {
     case POWERMODE::ON:
       // Check current
       lastCurrent = Hardware::getCurrentRaw(isMainTrack);
-      if (lastCurrent <= tripValue)  sampleDelay = POWER_SAMPLE_ON_WAIT;
+      if (lastCurrent <= tripValue) {
-      else {
+        sampleDelay = POWER_SAMPLE_ON_WAIT;
+	if(power_good_counter<100)
+	  power_good_counter++;
+	else
+	  if (power_sample_overload_wait>POWER_SAMPLE_OVERLOAD_WAIT) power_sample_overload_wait=POWER_SAMPLE_OVERLOAD_WAIT;
+      } else {
         setPowerMode(POWERMODE::OVERLOAD);
         unsigned int mA=Hardware::getCurrentMilliamps(isMainTrack,lastCurrent);
         unsigned int maxmA=Hardware::getCurrentMilliamps(isMainTrack,tripValue);
-        DIAG(F("\n*** %S TRACK POWER OVERLOAD current=%d max=%d ***\n"), isMainTrack ? F("MAIN") : F("PROG"), mA, maxmA);
+        DIAG(F("\n*** %S TRACK POWER OVERLOAD current=%d max=%d  offtime=%l ***\n"), isMainTrack ? F("MAIN") : F("PROG"), mA, maxmA, power_sample_overload_wait);
-        sampleDelay = POWER_SAMPLE_OVERLOAD_WAIT;
+	power_good_counter=0;
+        sampleDelay = power_sample_overload_wait;
+	power_sample_overload_wait *= 2;
       }
       break;
     case POWERMODE::OVERLOAD:

DCCWaveform.h

@@ -22,7 +22,7 @@
 
 const int  POWER_SAMPLE_ON_WAIT = 100;
 const int  POWER_SAMPLE_OFF_WAIT = 1000;
-const int  POWER_SAMPLE_OVERLOAD_WAIT = 4000;
+const int  POWER_SAMPLE_OVERLOAD_WAIT = 20;
 
 const int  MIN_ACK_PULSE_DURATION = 3000;
 const int  MAX_ACK_PULSE_DURATION = 8500;
@@ -97,7 +97,9 @@ class DCCWaveform {
     unsigned int sampleDelay;
     int rawCurrentTripValue;
     static const int ACK_CURRENT_TRIP=1000; // During ACK processing limit can be higher
-    
+    unsigned long power_sample_overload_wait = POWER_SAMPLE_OVERLOAD_WAIT;
+    unsigned int power_good_counter = 0;
+
     // ACK management (Prog track only)  
     bool ackPending;    
     bool ackDetected;   

Hardware.cpp

@@ -33,14 +33,18 @@
     
 void Hardware::init() {
   pinMode(MAIN_POWER_PIN, OUTPUT);
+  pinMode(MAIN_BRAKE_PIN, OUTPUT);
   pinMode(MAIN_SIGNAL_PIN, OUTPUT);
-  if (MAIN_SIGNAL_PIN_ALT) pinMode(MAIN_SIGNAL_PIN_ALT, OUTPUT);
+  if (MAIN_SIGNAL_PIN_ALT != UNUSED_PIN) pinMode(MAIN_SIGNAL_PIN_ALT, OUTPUT);
   pinMode(MAIN_SENSE_PIN, INPUT);
+  if (MAIN_FAULT_PIN != UNUSED_PIN) pinMode(MAIN_FAULT_PIN, INPUT);
 
   pinMode(PROG_POWER_PIN, OUTPUT);
+  pinMode(PROG_BRAKE_PIN, OUTPUT);
   pinMode(PROG_SIGNAL_PIN, OUTPUT);
-  if (PROG_SIGNAL_PIN_ALT) pinMode(PROG_SIGNAL_PIN_ALT, OUTPUT);
+  if (PROG_SIGNAL_PIN_ALT != UNUSED_PIN) pinMode(PROG_SIGNAL_PIN_ALT, OUTPUT);
   pinMode(PROG_SENSE_PIN, INPUT);
+  if (PROG_FAULT_PIN != UNUSED_PIN) pinMode(PROG_FAULT_PIN, INPUT);
 }
 
 void Hardware::setPower(bool isMainTrack, bool on) {
@@ -54,10 +58,16 @@ void Hardware::setSignal(bool isMainTrack, bool high) {
   byte pin = isMainTrack ? MAIN_SIGNAL_PIN : PROG_SIGNAL_PIN;
   byte pin2 = isMainTrack ? MAIN_SIGNAL_PIN_ALT : PROG_SIGNAL_PIN_ALT;
   WritePin(pin, high ? HIGH : LOW);
-  if (pin2) WritePin(pin2, high ? LOW : HIGH);
+  if (pin2 != UNUSED_PIN) WritePin(pin2, high ? LOW : HIGH);
 }
 
 int Hardware::getCurrentRaw(bool isMainTrack) {
+  // tooo much crap for a interrupt routine. Will see how that goes.
+  byte faultpin = isMainTrack ? MAIN_FAULT_PIN : PROG_FAULT_PIN;
+  byte signalpin = isMainTrack ? MAIN_SIGNAL_PIN : PROG_SIGNAL_PIN;
+
+  if (faultpin != UNUSED_PIN && digitalRead(faultpin) == LOW && digitalRead(signalpin) == HIGH)
+      return 32767; // MAXINT because we don't know the actual current, return as high as we can
   // IMPORTANT:  This function can be called in Interrupt() time within the 56uS timer
   //             The default analogRead takes ~100uS which is catastrphic
   //             so analogReadFast is used here. (-2uS) 

StringFormatter.cpp

@@ -51,6 +51,7 @@ void StringFormatter::send2(Print & stream,const __FlashStringHelper* format, va
       case 'E': printEscapes(stream,(const __FlashStringHelper*)va_arg(args, char*)); break;
       case 'S': stream.print((const __FlashStringHelper*)va_arg(args, char*)); break;
       case 'd': stream.print(va_arg(args, int), DEC); break;
+      case 'l': stream.print(va_arg(args, long), DEC); break;
       case 'b': stream.print(va_arg(args, int), BIN); break;
       case 'o': stream.print(va_arg(args, int), OCT); break;
       case 'x': stream.print(va_arg(args, int), HEX); break;