mirror of
https://github.com/esp8266/Arduino.git
synced 2025-04-22 21:23:07 +03:00
- Ensure espnowDelay and floodingMeshDelay always performs maintenance. - Rework MutexTracker to use shared_ptr. - Change enums to enum class. - Change typedef to using. - Add HeapMonitor class. - Make _messageIDs be a map instead of an unordered_map to reduce heap usage. - Use the possibly broken wifi_country ESP8266 API to check for legal WiFi channels when setting WiFi channels. - Make MessageData, RequestData and ResponseData contain a TimeTracker rather than inherit from TimeTracker. - Add deprecated attribute to TransmissionResult. - Remove superfluous elses. - Reduce cyclomatic complexity. - Change postfix ++ and -- to prefix. - Generalize getEncryptedConnectionIterator method. - Increase code NRVO compatibility. - Change _connectionAttemptTimeoutMs type from int32_t to uint32_t. - Add deprecated attribute to ESP8266WiFiMesh. - Add some constness to TypeConversionFunctions. - Move base36 arrays to PROGMEM in TypeConversionFunctions.cpp. - Add deprecated atttribute to SHA1 and MD5 hashes. - Remove _warningsEnabled in CryptoInterface since this has been replaced by the deprecated attribute. - Prefix all TypeConversion getters with "get". - Improve comments. - Fix merge conflict.
125 lines
3.5 KiB
C++
125 lines
3.5 KiB
C++
/*
|
|
* Copyright (C) 2019 Anders Löfgren
|
|
*
|
|
* License (MIT license):
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include "ExpiringTimeTracker.h"
|
|
|
|
ExpiringTimeTracker::ExpiringTimeTracker(const uint32_t duration, const uint32_t creationTimeMs) :
|
|
timeoutTemplate(0)
|
|
{
|
|
setDuration(duration);
|
|
_start = creationTimeMs;
|
|
}
|
|
|
|
ExpiringTimeTracker::ExpiringTimeTracker(const calculatorType durationCalculator, const uint32_t creationTimeMs) :
|
|
timeoutTemplate(0)
|
|
{
|
|
setDuration(durationCalculator);
|
|
_start = creationTimeMs;
|
|
}
|
|
|
|
uint32_t ExpiringTimeTracker::duration() const
|
|
{
|
|
if(useCalculator)
|
|
return _durationCalculator();
|
|
|
|
return getTimeout();
|
|
}
|
|
|
|
IRAM_ATTR // called from ISR
|
|
void ExpiringTimeTracker::setTimeout(const uint32_t newUserTimeout)
|
|
{
|
|
_timeout = newUserTimeout;
|
|
_neverExpires = (newUserTimeout > timeMax()); // newUserTimeout < 0 is always false for uint32_t
|
|
}
|
|
|
|
void ExpiringTimeTracker::setDuration(const uint32_t duration)
|
|
{
|
|
setTimeout(duration);
|
|
useCalculator = false;
|
|
}
|
|
|
|
void ExpiringTimeTracker::setDuration(const calculatorType durationCalculator)
|
|
{
|
|
_durationCalculator = durationCalculator;
|
|
useCalculator = true;
|
|
}
|
|
|
|
void ExpiringTimeTracker::setRemainingDuration(const uint32_t remainingDuration)
|
|
{
|
|
setDuration(elapsedTime() + remainingDuration);
|
|
}
|
|
|
|
void ExpiringTimeTracker::setRemainingDuration(const calculatorType remainingDurationCalculator)
|
|
{
|
|
uint32_t currentElapsedTime = elapsedTime();
|
|
setDuration([remainingDurationCalculator, currentElapsedTime](){ return currentElapsedTime + remainingDurationCalculator(); });
|
|
}
|
|
|
|
uint32_t ExpiringTimeTracker::remainingDuration() const
|
|
{
|
|
uint32_t remainingDuration = 0;
|
|
|
|
if(!expired()) // If expired, overflow will probably occur for remainingDuration calculation.
|
|
{
|
|
remainingDuration = duration() - elapsedTime();
|
|
}
|
|
|
|
return remainingDuration;
|
|
}
|
|
|
|
uint32_t ExpiringTimeTracker::elapsedTime() const
|
|
{
|
|
return millis() - _start;
|
|
}
|
|
|
|
bool ExpiringTimeTracker::expired() const
|
|
{
|
|
if(useCalculator)
|
|
return elapsedTime() >= duration();
|
|
|
|
return expiredOneShot();
|
|
}
|
|
|
|
void ExpiringTimeTracker::reset()
|
|
{
|
|
timeoutTemplate::reset();
|
|
}
|
|
|
|
void ExpiringTimeTracker::reset(const uint32_t newDuration)
|
|
{
|
|
setDuration(newDuration);
|
|
ExpiringTimeTracker::reset();
|
|
}
|
|
|
|
void ExpiringTimeTracker::reset(const calculatorType newDurationCalculator)
|
|
{
|
|
setDuration(newDurationCalculator);
|
|
ExpiringTimeTracker::reset();
|
|
}
|
|
|
|
ExpiringTimeTracker::operator bool() const
|
|
{
|
|
return ExpiringTimeTracker::expired();
|
|
}
|