DCCRMT.h

@@ -44,12 +44,6 @@ class RMTChannel {
       return true;
     return dataReady;
   };
-  inline void waitForDataCopy() {
-    while(1) { // do nothing and wait for interrupt clearing dataReady to happen
-      if (dataReady == false)
-	break;
-    }
-  };
   inline uint32_t packetCount() { return packetCounter; };
   
  private:

DCCWaveformRMT.cpp

@@ -70,11 +70,7 @@ void DCCWaveform::begin() {
 
 void DCCWaveform::schedulePacket(const byte buffer[], byte byteCount, byte repeats) {
   if (byteCount > MAX_PACKET_SIZE) return; // allow for chksum
-  RMTChannel *rmtchannel = (isMainTrack ? rmtMainChannel : rmtProgChannel);
-  if (rmtchannel == NULL)
-    return; // no idea to prepare packet if we can not send it anyway
   
-  rmtchannel->waitForDataCopy(); // blocking wait so we can write into buffer
   byte checksum = 0;
   for (byte b = 0; b < byteCount; b++) {
     checksum ^= buffer[b];
@@ -92,7 +88,13 @@ void DCCWaveform::schedulePacket(const byte buffer[], byte byteCount, byte repea
   {
     int ret = 0;
     do {
-      ret = rmtchannel->RMTfillData(pendingPacket, pendingLength, pendingRepeats);
+      if(isMainTrack) {
+	if (rmtMainChannel != NULL)
+	  ret = rmtMainChannel->RMTfillData(pendingPacket, pendingLength, pendingRepeats);
+      } else {
+	if (rmtProgChannel != NULL)
+	  ret = rmtProgChannel->RMTfillData(pendingPacket, pendingLength, pendingRepeats);
+      }
     } while(ret > 0);
   }
 }

GITHUB_SHA.h

@@ -1 +1 @@
-#define GITHUB_SHA "devel-202501171827Z"
+#define GITHUB_SHA "devel-202501092043Z"

version.h

@@ -3,8 +3,7 @@
 
 #include "StringFormatter.h"
 
-#define VERSION "5.5.7"
+#define VERSION "5.5.6"
-// 5.5.7  - ESP32 bugfix packet buffer race (as 5.4.1)
 // 5.5.6  - Fix ESP32 build bug caused by include reference loop
 // 5.5.5  - Railcom implementation with IO_I2CRailcom driver
 //        - response analysis and block management.