Fix one-shot mode in resetToNeverExpires(). Add convenient stop() syn…

…onym for same function.

cores/esp8266/PolledTimeout.h

@@ -175,7 +175,7 @@ class timeoutTemplate
 
  bool canWait () const
  {
- return !(_timeout == 0 || _oneShotExpired);
+ return _timeout != 0 && (PeriodicT || !_oneShotExpired);
  }
 
  // Resets, will trigger after this new timeout.
@@ -192,7 +192,7 @@ class timeoutTemplate
  void reset()
  {
  _start = TimePolicyT::time();
- _oneShotExpired = false;
+ if (!PeriodicT) _oneShotExpired = false;
  }
 
  // Resets to just expired so that on next poll the check will immediately trigger for the user,
@@ -216,6 +216,12 @@ class timeoutTemplate
  {
  _timeout = 1; // because canWait() has precedence
  _neverExpires = true;
+ if (!PeriodicT) _oneShotExpired = false;
+ }
+
+ void stop()
+ {
+ resetToNeverExpires();
  }
 
  timeType getTimeout() const
@@ -246,7 +252,7 @@ class timeoutTemplate
  {
  // canWait() is not checked here
  // returns "oneshot has expired", otherwise returns "can expire" and "time has expired"
- return _oneShotExpired || (!_neverExpires && ((internalUnit - _start) >= _timeout));
+ return !_neverExpires && ((!PeriodicT && _oneShotExpired) || ((internalUnit - _start) >= _timeout));
  }
 
 protected:
@@ -274,7 +280,7 @@ class timeoutTemplate
  if (!canWait()) return true;
  if (checkExpired(TimePolicyT::time()))
  {
- _oneShotExpired = true;
+ if (!PeriodicT) _oneShotExpired = true;
  return true;
  }
  return false;