Separate <L> polling cycle

DCCTimerESP.cpp

@@ -76,8 +76,13 @@ int DCCTimer::freeMemory() {
 #endif
 
 ////////////////////////////////////////////////////////////////////////
-
 #ifdef ARDUINO_ARCH_ESP32
+
+#include "esp_idf_version.h"
+#if ESP_IDF_VERSION_MAJOR > 4
+#error "DCC-EX does not support compiling with IDF version 5.0 or later. Downgrade your ESP32 library to a version that contains IDE version 4. Arduino ESP32 library 3.0.0 is too new. Downgrade to one of 2.0.9 to 2.0.17"
+#endif
+
 #include "DIAG.h"
 #include <driver/adc.h>
 #include <soc/sens_reg.h>

EXRAIL2Parser.cpp

@@ -61,61 +61,82 @@ void RMFT2::ComandFilter(Print * stream, byte & opcode, byte & paramCount, int16
   case 'L':
     // This entire code block is compiled out if LLC macros not used 
     if (!(compileFeatures & FEATURE_LCC)) return;
-
+    static int lccProgCounter=0;
+    static int lccEventIndex=0;
+      
     if (paramCount==0) {  //<L>  LCC adapter introducing self
       LCCSerial=stream;   // now we know where to send events we raise
+      opcode=0;  // flag command as intercepted
 
-      // loop through all possible sent events 
-      for (int progCounter=0;; SKIPOP) {
-        byte opcode=GET_OPCODE;
-        if (opcode==OPCODE_ENDEXRAIL) break;
-        if (opcode==OPCODE_LCC)  StringFormatter::send(stream,F("<LS x%h>\n"),getOperand(progCounter,0));   
-        if (opcode==OPCODE_LCCX) { // long form LCC
-           StringFormatter::send(stream,F("<LS x%h%h%h%h>\n"),
+      // loop through all possible sent/waited events 
+      for (int progCounter=lccProgCounter;; SKIPOP) {
+        byte exrailOpcode=GET_OPCODE;
+        switch (exrailOpcode) {
+          case OPCODE_ENDEXRAIL:
+               stream->print(F("<LR>\n")); // ready to roll
+               lccProgCounter=0; // allow a second pass
+               lccEventIndex=0;
+               return;
+
+          case OPCODE_LCC:  
+               StringFormatter::send(stream,F("<LS x%h>\n"),getOperand(progCounter,0));
+               SKIPOP;
+               lccProgCounter=progCounter; 
+               return;
+
+          case OPCODE_LCCX:  // long form LCC
+               StringFormatter::send(stream,F("<LS x%h%h%h%h>\n"),
                  getOperand(progCounter,1),
                  getOperand(progCounter,2),
                  getOperand(progCounter,3),
                  getOperand(progCounter,0)
-                 );        
-        }
-        if (opcode==OPCODE_ACON)  StringFormatter::send(stream,F("<LS x0%h%h>\n"),
-           getOperand(progCounter,0),getOperand(progCounter,1));   
-        if (opcode==OPCODE_ACOF)  StringFormatter::send(stream,F("<LS x1%h%h>\n"),
-           getOperand(progCounter,0),getOperand(progCounter,1));   
-      }
+                 );
+               SKIPOP;SKIPOP;SKIPOP;SKIPOP;          
+               lccProgCounter=progCounter; 
+               return;
+
+          case OPCODE_ACON:  // CBUS ACON 
+          case OPCODE_ACOF:  // CBUS ACON 
+                StringFormatter::send(stream,F("<LS x%c%h%h>\n"),
+                  exrailOpcode==OPCODE_ACOF?'1':'0',
+                  getOperand(progCounter,0),getOperand(progCounter,1)); 
+               SKIPOP;SKIPOP;
+               lccProgCounter=progCounter; 
+               return;
       
       // we stream the hex events we wish to listen to
       // and at the same time build the event index looku.
       
-      
-      int eventIndex=0;
-      for (int progCounter=0;; SKIPOP) {
-        byte opcode=GET_OPCODE;
-        if (opcode==OPCODE_ENDEXRAIL) break;
-        if (opcode==OPCODE_ONLCC) {
-           onLCCLookup[eventIndex]=progCounter; // TODO skip...
+        case OPCODE_ONLCC:
+           onLCCLookup[lccEventIndex]=progCounter; 
            StringFormatter::send(stream,F("<LL %d x%h%h%h:%h>\n"),
-                 eventIndex,
+                 lccEventIndex,
                  getOperand(progCounter,1),
                  getOperand(progCounter,2),
                  getOperand(progCounter,3),
                  getOperand(progCounter,0)
                  );   
-           eventIndex++;      
-        }
-        if (opcode==OPCODE_ONACON || opcode==OPCODE_ONACOF) {
-           onLCCLookup[eventIndex]=progCounter; // TODO skip...
+           lccEventIndex++;
+           SKIPOP;SKIPOP;SKIPOP;SKIPOP;      
+           lccProgCounter=progCounter; 
+           return;
+
+        case OPCODE_ONACON:
+        case OPCODE_ONACOF:
+           onLCCLookup[lccEventIndex]=progCounter; 
            StringFormatter::send(stream,F("<LL %d x%c%h%h>\n"),
-                 eventIndex,
-                 opcode==OPCODE_ONACON?'0':'1',
+                 lccEventIndex,
+                 exrailOpcode==OPCODE_ONACOF?'1':'0',
                  getOperand(progCounter,0),getOperand(progCounter,1)
-                 );   
-           eventIndex++;      
-        }
+                 ); 
+           lccEventIndex++;        
+           SKIPOP;SKIPOP;      
+           lccProgCounter=progCounter; 
+           return;
+         default:
+           break;
+        }  
       }
-      StringFormatter::send(stream,F("<LR>\n")); // Ready to rumble
-      opcode=0;
-      break;
     }
     if (paramCount==1) {  // <L eventid> LCC event arrived from adapter
         int16_t eventid=p[0];

GITHUB_SHA.h

@@ -1 +1 @@
-#define GITHUB_SHA "devel-202405232026Z"
+#define GITHUB_SHA "devel-202406021945Z"

platformio.ini

@@ -164,7 +164,11 @@ monitor_echo = yes
 build_flags = -mcall-prologues
 
 [env:ESP32]
-platform = espressif32
+; Lock version to 6.7.0 as that is
+; Arduino v2.0.16 (based on IDF v4.4.7)
+; which is the latest version based
+; on IDF v4. We can not use IDF v5.
+platform = espressif32 @ 6.7.0
 board = esp32dev
 framework = arduino
 lib_deps = ${env.lib_deps}