Merge branch 'devel' into devel-mcpwm

Author: habazut

CommandStation-EX.ino

@@ -154,8 +154,11 @@ void setup()
 
 void loop()
 {
+  #ifdef ENABLE_SERIAL_LOG
+    SerialLog.loop();
+  #endif
+
 #ifdef ARDUINO_ARCH_ESP32
-USB_SERIAL_WEB     // optional web server loop polling
 
 #ifdef BOOSTER_INPUT
   static bool oldactive = false;

DCC.cpp

@@ -1239,47 +1239,3 @@ void DCC::displayCabList(Print * stream) {
      StringFormatter::send(stream,F("<* Default momentum=%d/%d *>\n"),
               DCC::defaultMomentumA,DCC::defaultMomentumD);
 }
-
-void DCC::setLocoInBlock(uint16_t loco, uint16_t blockid, bool exclusive) {
-  // avoid unused warnings when EXRAIL not active
-  (void)loco; (void)blockid; (void)exclusive;
-  
-  // update block loco is in, tell exrail leaving old block, and entering new.
-
-  // NOTE: The loco table scanning is really inefficient and needs rewriting
-  //   This was done once in the momentum poc.  
-  #ifdef EXRAIL_ACTIVE
-  auto slot=LocoSlot::getSlot(loco,true);
-  if (!slot) return; // loco not known, nothing to do
-  
-  auto oldBlock=slot->getBlockOccupied(); 
-  if (oldBlock==blockid) return; 
-  if (oldBlock) RMFT2::blockEvent(oldBlock,loco,false);
-  slot->setBlockOccupied(blockid);
-  if (blockid) RMFT2::blockEvent(blockid,loco,true);
-
-  if (exclusive) {
-    SLOTLOOP {
-          if (slot->getLoco()!=loco &&  slot->getBlockOccupied()==blockid) {
-            RMFT2::blockEvent(blockid,slot->getLoco(),false);
-            slot->setBlockOccupied(0);
-          }
-      }
-    }
-  
-  #endif 
-}
-
-void DCC::clearBlock(uint16_t blockid) {
-  (void)blockid; // avoid unused warning when EXRAIL not active
-  // clear block occupied by loco, tell exrail about all leavers
-  #ifdef EXRAIL_ACTIVE
-  SLOTLOOP {
-       
-        if (slot->getBlockOccupied()==blockid) {
-        RMFT2::blockEvent(blockid,slot->getLoco(),false);
-        slot->setBlockOccupied(0);
-        }
-      }
-  #endif
-}

DCC.h

@@ -83,8 +83,6 @@ class DCC
   static void verifyCVByte(int16_t cv, byte byteValue, ACK_CALLBACK callback);
   static void verifyCVBit(int16_t cv, byte bitNum, bool bitValue, ACK_CALLBACK callback);
   static bool setTime(uint16_t minutes,uint8_t speed, bool suddenChange);
-  static void setLocoInBlock(uint16_t loco, uint16_t blockid, bool exclusive);
-  static void clearBlock(uint16_t blockid);
   static void getDriveawayLocoId(ACK_CALLBACK callback);
   static void getLocoId(ACK_CALLBACK callback);
   static void getConsistId(ACK_CALLBACK callback);

DCCTimerAVR.cpp

@@ -72,44 +72,44 @@ void DCCTimer::startRailcomTimer(byte brakePin) {
      - Sets the Railcom pin high at first tick and subsequent ticks 
        until its reset to setting pin 9 low at next tick.
         
-     - Cycles at 436uS so the second tick is the 
+     - Cycles at cutoutDuration so the second tick is the 
         correct distance from the cutout.
         
      - Waveform code is responsible for resetting 
        any time between the first and second tick.
        (there will be 7 DCC timer1 ticks in which to do this.)
     
     */
-  const int cutoutDuration = 430; // Desired interval in microseconds
-  const int cycle=cutoutDuration/2;
+  const int Tcs=(26+32)/2;   // half way spec Desired time from idealised setup call (at previous DCC timer interrupt) to the cutout.  
+  const int Tce=(454+488)/2; // half way spec (460..480uS) Time from start of cutout to end of cutout.
+  const int cutoutDuration = Tce-Tcs; // Desired interval in microseconds
+  const int cycle=(cutoutDuration+1)/2; // 
 
-  const byte RailcomFudge0=58+58+29;
+  const byte delayBeforeCutout=58+58+Tcs; // Expected time from idealised setup call (at previous DCC timer interrupt) to the cutout. This is the time we need to wait before we can set pin 9 high. We will then set pin 9 low at the next tick which is cutoutDuration later. This value should be reduced to reflect the Timer1 value measuring the time since the previous hardware interrupt.
 
   // Set Timer2 to CTC mode with set on compare match
   TCCR2A = (1 << WGM21) | (1 << COM2B0) | (1 << COM2B1);
   // Prescaler of 32
   TCCR2B =  (1 << CS21) | (1 << CS20); 
-  OCR2A = cycle-1; // Compare match value for 430 uS
+  OCR2A = cycle; // Compare match value for cutout duration
   // Enable Timer2 output on pin 9 (OC2B)
   DDRB |= (1 << DDB1);
 
-  // RailcomFudge2 is the expected time from idealised 
+  // timeSlip is the expected time from idealised 
   // setup call (at previous DCC timer interrupt) to the cutout. 
   // This value should be reduced to reflect the Timer1 value
   // measuring the time since the previous hardware interrupt
-  byte tcfudge=TCNT1/16; 
-  TCNT2=cycle-RailcomFudge0/2+tcfudge/2;
 
-  
- // Previous TIMER1 Tick was at rising end-of-packet bit
- // Cutout starts half way through first preamble
- // that is 2.5 * 58uS later.
-  }
+  // tcnt1 = prescaler 64,  tcnt2 prescaler=32
+  noInterrupts();
+  uint16_t timeSlip=(TCNT1/64)*32; 
+  TCNT2=cycle-timeSlip/2-delayBeforeCutout/2;
+  interrupts();
+}
 
 void DCCTimer::ackRailcomTimer() {
   // Change Timer2 to CTC mode with RESET pin 9 on next compare match
   TCCR2A = (1 << WGM21) | (1 << COM2B1);
-  // diagnostic digitalWrite(4,LOW);
 }
 
 

EXRAIL2.cpp

@@ -1761,4 +1761,24 @@ void RMFT2::manageRouteCaption(int16_t id,const FSH* caption) {
     CommandDistributor::broadcastRouteCaption(id,caption);
   }
 }
+
+void RMFT2::ifAnyFunc(const int16_t * vpinList, int16_t count) {
+  // Sets skipIf if none found
+  skipIf=false; 
+  for (int v=0;v<count;v++) {
+    int16_t vpin=vpinList[v];
+    if (vpin<0 && IODevice::read(-vpin)==0) return;
+    if (IODevice::read(vpin)>0) return;
+  }
+  skipIf=true; // none found 
+}
 
+void RMFT2::ifAllFunc(const int16_t * vpinList, int16_t count) {
+  skipIf=true; // return skipping if any are wrong
+  for (int v=0;v<count;v++) {
+    int16_t vpin=vpinList[v];
+    if (vpin<0 && IODevice::read(-vpin)>0) return;
+    if (IODevice::read(vpin)==0) return;
+  }
+  skipIf=false; // no failures found 
+}

EXRAIL2.h

@@ -245,6 +245,8 @@ class LookList {
                       OPCODE op2=OPCODE_ENDEXRAIL,OPCODE op3=OPCODE_ENDEXRAIL);
     static uint16_t getOperand(int progCounter,byte n);
     static void killBlinkOnVpin(VPIN pin,uint16_t count=1);
+    static void ifAllFunc(const int16_t * vpinList, int16_t count); 
+    static void ifAnyFunc(const int16_t * vpinList, int16_t count);
     static RMFT2 * loopTask;
     static RMFT2 * pausingTask;
     void delayMe(long millisecs);

EXRAIL2MacroBase.h

@@ -272,6 +272,14 @@
 ///brief Checks sensor state, If false jumps to matching nested ELSE or ENDIF
 ///param vpin  VPIN of sensor. Negative VPIN will invert sensor state.
 
+#define IF_ALL(vpinList...)
+///brief Checks sensor state, If any are false, it jumps to matching nested ELSE or ENDIF
+///param vpinlist  comma separated list of VPINs of sensors. Negative VPIN will invert sensor state.
+
+#define IF_ANY(vpinList...)
+///brief Checks sensor state, If all are false jumps to matching nested ELSE or ENDIF
+///param vpinlist  comma separated list of VPINs of sensors. Negative VPIN will invert sensor state.
+
 #define IFAMBER(signal_id)
 ///brief Checks if signal is in AMBER state.
 ///see IF

EXRAIL2MacroReset.h

@@ -82,6 +82,8 @@
 #undef HAL
 #undef HAL_IGNORE_DEFAULTS
 #undef IF 
+#undef IF_ALL
+#undef IF_ANY
 #undef IFAMBER
 #undef IFCLOSED
 #undef IFGREEN

EXRAILMacros.h

@@ -305,12 +305,30 @@ case (__COUNTER__ - StringMacroTracker1) : {\
 #define IFLOCO(locolist...) \
   case (__COUNTER__ - StringMacroTracker1) : \
   { \
-   const int16_t loco_id_list[]={locolist}; \
+   const int16_t temp[]={locolist}; \
    skipIf=true; \
-   for (size_t i=0; i<sizeof(loco_id_list)/sizeof(loco_id_list[0]); i++) { \
-      if (loco==(uint16_t)loco_id_list[i]) { skipIf=false; break;} \
+   for (size_t i=0; i<sizeof(temp)/sizeof(temp[0]); i++) { \
+      if (loco==(uint16_t)temp[i]) { skipIf=false; break;} \
     } \
-    break;\
+    return;\
+  }
+
+#undef IF_ALL
+#define IF_ALL(vpinList...) \
+  case (__COUNTER__ - StringMacroTracker1) : \
+  { \
+   const int16_t temp[]={vpinList}; \
+   ifAllFunc(temp,sizeof(temp)/sizeof(temp[0])); \
+   return;\
+  }
+
+#undef IF_ANY  
+#define IF_ANY(vpinList...) \
+  case (__COUNTER__ - StringMacroTracker1) : \
+  { \
+   const int16_t temp[]={vpinList}; \
+   ifAnyFunc(temp,sizeof(temp)/sizeof(temp[0])); \
+   return;\
   }
 
 #undef LCD
@@ -563,6 +581,8 @@ int RMFT2::onLCCLookup[RMFT2::countLCCLookup];
 #define IFGREEN(signal_id) OPCODE_IFGREEN,V(signal_id),
 #define IFGTE(sensor_id,value) OPCODE_IFGTE,V(sensor_id),OPCODE_PAD,V(value),
 #define IFLOCO(loco_list...) OPCODE_IFLOCO,V(__COUNTER__ - StringMacroTracker2),
+#define IF_ALL(vpinlist...) OPCODE_IFLOCO,V(__COUNTER__ - StringMacroTracker2),
+#define IF_ANY(vpinlist...) OPCODE_IFLOCO,V(__COUNTER__ - StringMacroTracker2),
 #define IFLT(sensor_id,value) OPCODE_IFLT,V(sensor_id),OPCODE_PAD,V(value),
 #define IFNOT(sensor_id) OPCODE_IFNOT,V(sensor_id),
 #define IFRANDOM(percent) OPCODE_IFRANDOM,V(percent),

EXRAILTest.h

@@ -201,5 +201,81 @@ ROUTE(1771,"1771 Test IFLOCO with multiple loco ids")
     PRINT("IFLOCO 1,2,4 test failed")
   ELSE
     PRINT("IFLOCO 1,2,4 test passed")
-  DONE
-  
+  ENDIF
+
+  HAL(Bitmap,1700,10)
+  SET(1702) SET(1703) SET(1704)
+  
+  IF_ANY(1700,1701,1702) 
+    PRINT("IF_ANY 0,1,2 test OK")
+  ELSE
+    PRINT("IF_ANY 0,1,2 test failed")
+  ENDIF
+  
+  IF_ANY(1700,1701,1706) 
+    PRINT("IF_ANY 0,1,6 test failed")
+  ELSE
+    PRINT("IF_ANY 0,1,6 test passed")
+  ENDIF
+  
+  IF_ALL(1702,1703,1704) 
+    PRINT("IF_ALL 2,3,4 test OK")
+  ELSE
+    PRINT("IF_ALL 2,3,4 test failed")
+  ENDIF
+  
+  IF_ALL(1702,1703,1706) 
+    PRINT("IF_ALL 2,3,6 test failed")
+  ELSE
+    PRINT("IF_ALL 2,3,6 test passed")
+  ENDIF
+
+  IF_ANY(1701,-1706)
+    PRINT("IF_ANY 1,-1706 test passed")
+  ELSE
+    PRINT("IF_ANY 1,-1706 test failed")
+  ENDIF
+
+  IF_ALL(1701,-1706)
+    PRINT("IF_ALL 1,-1706 test failed")
+  ELSE
+    PRINT("IF_ALL 1,-1706 test passed")
+  ENDIF
+
+    DONE
+  
+
+
+// Speedometer example
+// Track is =TS1===TS2===TS3= timing between S2 and S3.
+
+ALIAS(TS1,181) ALIAS(TS2,182) ALIAS(TS3,183)
+STEALTH_GLOBAL(
+  byte testStartSpeed=2;
+  byte testEndSpeed=100;
+  byte testStep=10;
+  byte testSpeed;
+  unsigned long testStartTime;
+)
+
+AUTOMATION(9000,"Run Speed Test") // speed test setup
+  STEALTH(testSpeed=testStartSpeed;)
+  PRINT("Starting speed test")
+  REV(20) // reverse loco to start point
+
+SEQUENCE(9001)
+  // make sure loco is at start point
+  AT(TS1) ESTOP
+  // drive loco fwd at testSpeed 
+  STEALTH(DCC::setThrottle(loco,testSpeed,true);)
+  // At timing-start sensor(s2) record time
+  AT(TS2) STEALTH(testStartTime=millis();)
+ // at timing-end sensor(s3) stop and calculate and print speed
+ AT(TS3) ESTOP STEALTH(
+    StringFormatter::send(&USB_SERIAL, 
+       F("Speed %d Time %l\n"), testSpeed, millis()-testStartTime);
+    testSpeed+=testStep;
+    if (testSpeed>testEndSpeed) kill(); // test complete =DONE
+    )
+// Reverse back to start, and test again
+REV(127) FOLLOW(9001)