share cutout info

Author: Asbelos

DCCRMT.cpp

@@ -167,6 +167,7 @@ static void IRAM_ATTR mcpwmIsrHandler(void* arg) {
     if (cutoutCounter == 2) {      
       __digitalWrite(13 /*BRKA*/, 0);
       cutoutCounter++;
+      DCCWaveform::incCutoutCounter();
     } else if (cutoutCounter == 3) {      
       __digitalWrite(13 /*BRKA*/, 1);
       cutoutCounter++;
@@ -192,7 +193,7 @@ static void IRAM_ATTR mcpwmPulseOn() {
   //gpio_set_direction((gpio_num_t)13, GPIO_MODE_OUTPUT);
   pinMode(13, OUTPUT);
   digitalWrite(13, 1);
-
+  DCCWaveform::setRailcomPossible(true);
   mcpwm_config_t pwm_config = {
     .frequency = CUTOUT_BASE_FREQ,      // calculation see above
     .cmpr_a = CUTOUT_OFFSET_IN_PERCENT, // duty cycle of PWMxA (float in %)

DCCWaveform.cpp

@@ -132,18 +132,6 @@ volatile byte DCCWaveform::railcomCutoutCounter=0;    // cyclic cutout
 volatile byte DCCWaveform::railcomLastAddressHigh=0;
 volatile byte DCCWaveform::railcomLastAddressLow=0;
 
-bool DCCWaveform::setRailcom(bool on, bool debug) {
-  if (on && railcomPossible) {
-    railcomActive=true;
-    railcomDebug=debug;
-  }
-  else {
-    railcomActive=false;
-    railcomDebug=false;
-    railcomSampleWindow=false;
-  } 
-  return railcomActive;
-}
 
 #pragma GCC push_options
 #pragma GCC optimize ("-O3")

DCCWaveform.h

@@ -82,13 +82,28 @@ class DCCWaveform {
     void schedulePacket(const byte buffer[], byte byteCount, byte repeats);
     bool isReminderWindowOpen();
     void promotePendingPacket();
-    static bool setRailcom(bool on, bool debug);
+        static bool setRailcom(bool on, bool debug) {
+      if (on && railcomPossible) {
+        railcomActive=true;
+        railcomDebug=debug;
+      }
+      else {
+        railcomActive=false;
+        railcomDebug=false;
+        railcomSampleWindow=false;
+      } 
+      return railcomActive;
+  }
+
     inline static bool isRailcom() {
       return railcomActive;
     };
     inline static byte getRailcomCutoutCounter() {
       return railcomCutoutCounter;
     };
+    inline static void incCutoutCounter() {
+      railcomCutoutCounter++;
+    }
     inline static bool isRailcomSampleWindow() {
       return railcomSampleWindow;
     };
@@ -138,6 +153,8 @@ class DCCWaveform {
     static volatile byte railcomCutoutCounter; // incremented for each cutout
     static volatile byte railcomLastAddressHigh,railcomLastAddressLow;
     static bool cutoutNextTime;   // railcom
+    
+
 #ifdef ARDUINO_ARCH_ESP32
   static RMTChannel *rmtMainChannel;
   static RMTChannel *rmtProgChannel;

DCCWaveformRMT.cpp

@@ -115,9 +115,4 @@ void IRAM_ATTR DCCWaveform::loop() {
   DCCACK::checkAck(progTrack.getResets());
 }
 
-bool DCCWaveform::setRailcom(bool on, bool debug) {
-  // TODO... ESP32 railcom waveform
-  return false;
-}
-
 #endif