Due to review and discussion, _oneShotExpired removed again.

Author: dok-net

cores/esp8266/PolledTimeout.h

@@ -176,7 +176,7 @@ class timeoutTemplate
 
   bool canWait () const
   {
-    return _timeout != 0 && (PeriodicT || !_oneShotExpired);
+    return _timeout != 0;
   }
 
   // Resets, will trigger after this new timeout.
@@ -185,15 +185,14 @@ class timeoutTemplate
   {
     reset();
     _timeout = TimePolicyT::toTimeTypeUnit(newUserTimeout);
-    _neverExpires = (newUserTimeout < 0) || (newUserTimeout > timeMax());
+    _neverExpires = newUserTimeout > timeMax();
   }
 
   // Resets, will trigger after the timeout previously set.
   IRAM_ATTR // called from ISR
   void reset()
   {
     _start = TimePolicyT::time();
-    if (!PeriodicT) _oneShotExpired = false;
   }
 
   // Resets to just expired so that on next poll the check will immediately trigger for the user,
@@ -217,7 +216,6 @@ class timeoutTemplate
   {
     _timeout = 1; // because canWait() has precedence
     _neverExpires = true;
-    if (!PeriodicT) _oneShotExpired = false;
   }
 
   void stop()
@@ -252,8 +250,8 @@ class timeoutTemplate
   bool checkExpired(const timeType internalUnit) const
   {
     // canWait() is not checked here
-    // returns "oneshot has expired", otherwise returns "can expire" and "time has expired"
-    return !_neverExpires && ((!PeriodicT && _oneShotExpired) || ((internalUnit - _start) >= _timeout));
+    // returns "can expire" and "time has expired"
+    return (!_neverExpires) && ((internalUnit - _start) >= _timeout);
   }
 
 protected:
@@ -278,19 +276,12 @@ class timeoutTemplate
   bool expiredOneShot() const
   {
     // returns "always expired" or "has expired"
-    if (!canWait()) return true;
-    if (checkExpired(TimePolicyT::time()))
-    {
-      if (!PeriodicT) _oneShotExpired = true;
-      return true;
-    }
-    return false;
+    return !canWait() || checkExpired(TimePolicyT::time());
   }
 
   timeType _timeout;
   timeType _start;
   bool _neverExpires;
-  mutable bool _oneShotExpired;
 };
 
 // legacy type names, deprecated (unit is milliseconds)