DCCRMT.cpp

@@ -194,10 +194,8 @@ int RMTChannel::RMTfillData(const byte buffer[], byte byteCount, byte repeatCoun
   setDCCBit1(data + bitcounter-1);     // overwrite previous zero bit with one bit
   setEOT(data + bitcounter++);         // EOT marker
   dataLen = bitcounter;
-  noInterrupts();                      // keep dataReady and dataRepeat consistnet to each other
   dataReady = true;
   dataRepeat = repeatCount+1;         // repeatCount of 0 means send once
-  interrupts();
   return 0;
 }
 
@@ -214,8 +212,6 @@ void IRAM_ATTR RMTChannel::RMTinterrupt() {
   if (dataReady) {            // if we have new data, fill while preamble is running
     rmt_fill_tx_items(channel, data, dataLen, preambleLen-1);
     dataReady = false;
-    if (dataRepeat == 0)       // all data should go out at least once
-      DIAG(F("Channel %d DCC signal lost data"), channel);
   }
   if (dataRepeat > 0)         // if a repeat count was specified, work on that
     dataRepeat--;

DCCWaveform.cpp

@@ -247,9 +247,6 @@ void DCCWaveform::schedulePacket(const byte buffer[], byte byteCount, byte repea
   pendingPacket[byteCount] = checksum;
   pendingLength = byteCount + 1;
   pendingRepeats = repeats;
-// DIAG repeated commands (accesories)
-//  if (pendingRepeats > 0)
-//    DIAG(F("Repeats=%d on %s track"), pendingRepeats, isMainTrack ? "MAIN" : "PROG");
   // The resets will be zero not only now but as well repeats packets into the future
   clearResets(repeats+1);
   {

GITHUB_SHA.h

@@ -1 +1 @@
-#define GITHUB_SHA "devel-overcurrent-202307061457Z"
+#define GITHUB_SHA "devel-overcurrent-202307041424Z"

installer.sh

@@ -38,11 +38,6 @@ function need () {
 
 need git
 
-if cat /etc/issue | egrep '^Raspbian' 2>&1 >/dev/null ; then
-    # we are on a raspi where we do not support graphical
-    unset DISPLAY
-fi
-
 if [ x$DISPLAY != x ] ; then
     # we have DISPLAY, do the graphic thing
     need python3-tk

version.h

@@ -4,9 +4,8 @@
 #include "StringFormatter.h"
 
 
-#define VERSION "4.2.62pre3"
+#define VERSION "4.2.62pre2"
 // 4.2.62 - completely new overcurrent detection
-//        - ESP32 protect from race in RMT code
 // 4.2.61 - MAX_CURRENT restriction (caps motor shield value)
 // 4.2.60 - Add mDNS capability to ESP32 for autodiscovery
 // 4.2.59 - Fix: AP SSID was DCC_ instead of DCCEX_