Fix expiredOneShot to properly stay expired forever unless reset.

dok-net · dok-net · commit 074368456514 · 2021-04-05T17:32:15.000+02:00
diff --git a/cores/esp8266/PolledTimeout.h b/cores/esp8266/PolledTimeout.h
@@ -268,10 +268,16 @@ class timeoutTemplate
   }
 
   IRAM_ATTR // fast
-  bool expiredOneShot() const
+  bool expiredOneShot()
   {
     // returns "always expired" or "has expired"
-    return !canWait() || checkExpired(TimePolicyT::time());
+    return !canWait();
+    if (checkExpired(TimePolicyT::time()))
+    {
+      _timeout = alwaysExpired;
+      return true;
+    }
+    return false;
   }
 
   timeType _timeout;

Original file line number	Diff line number	Diff line change
`@@ -268,10 +268,16 @@ class timeoutTemplate`
`268`	`268`	`}`
`269`	`269`
`270`	`270`	`IRAM_ATTR // fast`
`271`		`- bool expiredOneShot() const`
	`271`	`+ bool expiredOneShot()`
`272`	`272`	`{`
`273`	`273`	`// returns "always expired" or "has expired"`
`274`		`- return !canWait() \|\| checkExpired(TimePolicyT::time());`
	`274`	`+ return !canWait();`
	`275`	`+ if (checkExpired(TimePolicyT::time()))`
	`276`	`+ {`
	`277`	`+ _timeout = alwaysExpired;`
	`278`	`+ return true;`
	`279`	`+ }`
	`280`	`+ return false;`
`275`	`281`	`}`
`276`	`282`
`277`	`283`	`timeType _timeout;`