Skip to content

Commit 1f9b804

Browse files
committed
Revert removal of PolledTimeout::alwaysExpired
1 parent 25c6b37 commit 1f9b804

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

cores/esp8266/PolledTimeout.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ class timeoutTemplate
146146
using timeType = typename TimePolicyT::timeType;
147147
static_assert(std::is_unsigned<timeType>::value == true, "timeType must be unsigned");
148148

149+
static constexpr timeType alwaysExpired = 0;
149150
static constexpr timeType neverExpires = std::numeric_limits<timeType>::max();
150151
static constexpr timeType rangeCompensate = TimePolicyT::rangeCompensate; //debug
151152

@@ -176,7 +177,7 @@ class timeoutTemplate
176177

177178
bool canWait () const
178179
{
179-
return _timeout != 0;
180+
return _timeout != alwaysExpired;
180181
}
181182

182183
// Resets, will trigger after this new timeout.
@@ -214,7 +215,7 @@ class timeoutTemplate
214215

215216
void resetToNeverExpires ()
216217
{
217-
_timeout = 1; // because canWait() has precedence
218+
_timeout = alwaysExpired + 1; // because canWait() has precedence
218219
_neverExpires = true;
219220
}
220221

cores/esp8266/Stream.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ class Stream: public Print {
171171

172172
// transfers already buffered / immediately available data (no timeout)
173173
// returns number of transferred bytes
174-
[[deprecated]] size_t sendAvailable (Print* to) { return sendGeneric(to, -1, -1, 0); }
174+
[[deprecated]] size_t sendAvailable (Print* to) { return sendGeneric(to, -1, -1, oneShotMs::alwaysExpired); }
175175
[[deprecated]] size_t sendAvailable (Print& to) { return sendAvailable(&to); }
176176

177177
// transfers data until timeout

0 commit comments

Comments
 (0)