DCCEXParser.cpp

@@ -219,9 +219,6 @@ void DCCEXParser::parse(Print *stream,  byte *com,  RingStream *ringStream) {
 
 void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
 {
-#ifdef DISABLE_PROG
-    (void)ringStream;
-#endif
 #ifndef DISABLE_EEPROM
     (void)EEPROM; // tell compiler not to warn this is unused
 #endif

GITHUB_SHA.h

@@ -1 +1 @@
-#define GITHUB_SHA "devel-202308012308Z"
+#define GITHUB_SHA "devel-202307250927Z"

MotorDriver.cpp

@@ -291,39 +291,14 @@ uint16_t taurustones[28] = { 165, 175, 196, 220,
 void MotorDriver::setDCSignal(byte speedcode) {
   if (brakePin == UNUSED_PIN)
     return;
-  switch(brakePin) {
 #if defined(ARDUINO_AVR_UNO)
-    // Not worth doin something here as:
-    // If we are on pin 9 or 10 we are on Timer1 and we can not touch Timer1 as that is our DCC source.
-    // If we are on pin 5 or 6 we are on Timer 0 ad we can not touch Timer0 as that is millis() etc.
-    // We are most likely not on pin 3 or 11 as no known motor shield has that as brake.
+  TCCR2B = (TCCR2B & B11111000) | B00000110; // set divisor on timer 2 to result in (approx) 122.55Hz
 #endif
 #if defined(ARDUINO_AVR_MEGA) || defined(ARDUINO_AVR_MEGA2560)
-  case 9:
-  case 10:
-    // Timer2 (is differnet)
-    TCCR2A = (TCCR2A & B11111100) | B00000001; // set WGM1=0 and WGM0=1 phase correct PWM
-    TCCR2B = (TCCR2B & B11110000) | B00000110; // set WGM2=0 ; set divisor on timer 2 to 1/256 for 122.55Hz
-    //DIAG(F("2 A=%x B=%x"), TCCR2A, TCCR2B);
-    break;
-  case 6:
-  case 7:
-  case 8:
-    // Timer4
-    TCCR4A = (TCCR4A & B11111100) | B00000001; // set WGM0=1 and WGM1=0 for normal PWM 8-bit
-    TCCR4B = (TCCR4B & B11100000) | B00000100; // set WGM2=0 and WGM3=0 for normal PWM 8 bit and div 1/256 for 122.55Hz
-    break;
-  case 46:
-  case 45:
-  case 44:
-    // Timer5
-    TCCR5A = (TCCR5A & B11111100) | B00000001; // set WGM0=1 and WGM1=0 for normal PWM 8-bit
-    TCCR5B = (TCCR5B & B11100000) | B00000100; // set WGM2=0 and WGM3=0 for normal PWM 8 bit and div 1/256 for 122.55Hz
-    break;
+  TCCR2B = (TCCR2B & B11111000) | B00000110; // set divisor on timer 2 to result in (approx) 122.55Hz
+  TCCR4B = (TCCR4B & B11111000) | B00000100; // same for timer 4 but maxcount and thus divisor differs
+  TCCR5B = (TCCR5B & B11111000) | B00000100; // same for timer 5 which is like timer 4
 #endif
-  default:
-    break;
-  }
   // spedcoode is a dcc speed & direction
   byte tSpeed=speedcode & 0x7F; // DCC Speed with 0,1 stop and speed steps 2 to 127
   byte tDir=speedcode & 0x80;
@@ -393,39 +368,14 @@ void MotorDriver::throttleInrush(bool on) {
   }
 #else
   if(on){
-    switch(brakePin) {
 #if defined(ARDUINO_AVR_UNO)
-      // Not worth doin something here as:
-      // If we are on pin 9 or 10 we are on Timer1 and we can not touch Timer1 as that is our DCC source.
-      // If we are on pin 5 or 6 we are on Timer 0 ad we can not touch Timer0 as that is millis() etc.
-      // We are most likely not on pin 3 or 11 as no known motor shield has that as brake.
+  TCCR2B = (TCCR2B & B11111000) | B00000001; // div 1 is max
 #endif
 #if defined(ARDUINO_AVR_MEGA) || defined(ARDUINO_AVR_MEGA2560)
-    case 9:
-    case 10:
-      // Timer2 (is different)
-      TCCR2A = (TCCR2A & B11111100) | B00000011; // set WGM0=1 and WGM1=1 for fast PWM
-      TCCR2B = (TCCR2B & B11110000) | B00000001; // set WGM2=0 and prescaler div=1 (max)
-      DIAG(F("2 A=%x B=%x"), TCCR2A, TCCR2B);
-      break;
-    case 6:
-    case 7:
-    case 8:
-      // Timer4
-      TCCR4A = (TCCR4A & B11111100) | B00000001; // set WGM0=1 and WGM1=0 for fast PWM 8-bit
-      TCCR4B = (TCCR4B & B11100000) | B00001001; // set WGM2=1 and WGM3=0 for fast PWM 8 bit and div=1 (max)
-      break;
-    case 46:
-    case 45:
-    case 44:
-      // Timer5
-      TCCR5A = (TCCR5A & B11111100) | B00000001; // set WGM0=1 and WGM1=0 for fast PWM 8-bit
-      TCCR5B = (TCCR5B & B11100000) | B00001001; // set WGM2=1 and WGM3=0 for fast PWM 8 bit and div=1 (max)
-      break;
+  TCCR2B = (TCCR2B & B11111000) | B00000001; // div 1 is max
+  TCCR4B = (TCCR4B & B11111000) | B00000001; // div 1 is max
+  TCCR5B = (TCCR5B & B11111000) | B00000001; // div 1 is max
 #endif
-    default:
-      break;
-    }
   }
   analogWrite(brakePin,duty);
 #endif

TrackManager.cpp

@@ -192,16 +192,11 @@ bool TrackManager::setTrackMode(byte trackToSet, TRACK_MODE mode, int16_t dcAddr
 
     //DIAG(F("Track=%c Mode=%d"),trackToSet+'A', mode);
     // DC tracks require a motorDriver that can set brake!
-    if (mode==TRACK_MODE_DC || mode==TRACK_MODE_DCX) {
-#if defined(ARDUINO_AVR_UNO)
-      DIAG(F("Uno has no PWM timers available for DC"));
-      return false;
-#endif
-      if (!track[trackToSet]->brakeCanPWM()) {
-	DIAG(F("Brake pin can't PWM: No DC"));
-	return false;
-      }
-    }
+    if ((mode==TRACK_MODE_DC || mode==TRACK_MODE_DCX)
+         && !track[trackToSet]->brakeCanPWM()) {
+             DIAG(F("Brake pin can't PWM: No DC"));
+             return false; 
+         }
 
 #ifdef ARDUINO_ARCH_ESP32
     // remove pin from MUX matrix and turn it off

version.h

@@ -3,11 +3,7 @@
 
 #include "StringFormatter.h"
 
-#define VERSION "4.2.67"
-// 4.2.67 - AVR: Pin specific timer register seting
-//        - Protect Uno user from choosing DC(X)
-//        - More Nucleo variant defines
-//        - GPIO PCA9555 / TCA9555 support
+#define VERSION "4.2.66"
 // 4.2.66 - Throttle inrush current by applying PWM to brake pin when
 //          fault pin goes active
 // 4.2.65 - new config WIFI_FORCE_AP option