Sternenlabor/nuki_hub
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace millis() with esp_timer_get_time() (#423)

Browse Source
This commit is contained in:
iranl
2024-07-15 17:16:43 +02:00
committed by GitHub
parent 8e5e47b102
commit 77ddef76af
22 changed files with 171 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/WebCfgServer.cpp
View File

@@ -377,7 +377,7 @@ void WebCfgServer::initialize()
void WebCfgServer::update()
{
if(_otaStartTs > 0 && (millis() - _otaStartTs) > 120000)
if(_otaStartTs > 0 && ((esp_timer_get_time() / 1000) - _otaStartTs) > 120000)
{
Log->println(F("OTA time out, restarting"));
delay(200);
@@ -479,13 +479,13 @@ void WebCfgServer::buildHtmlHeader(String &response, String additionalHeader)
response.concat("<link rel='stylesheet' href='/style.css'>");
response.concat("<title>Nuki Hub</title></head><body>");
srand(millis());
srand(esp_timer_get_time() / 1000);
}
void WebCfgServer::waitAndProcess(const bool blocking, const uint32_t duration)
{
unsigned long timeout = millis() + duration;
while(millis() < timeout)
int64_t timeout = esp_timer_get_time() + (duration * 1000);
while(esp_timer_get_time() < timeout)
{
_server.handleClient();
if(blocking)
@@ -532,7 +532,7 @@ void WebCfgServer::handleOtaUpload()
{
filename = "/" + filename;
}
_otaStartTs = millis();
_otaStartTs = esp_timer_get_time() / 1000;
#if (ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0))
esp_task_wdt_init(30, false);
#else
@@ -2792,7 +2792,7 @@ void WebCfgServer::buildInfoHtml(String &response)
}
response.concat("Uptime: ");
response.concat(millis() / 1000 / 60);
response.concat(esp_timer_get_time() / 1000 / 1000 / 60);
response.concat(" minutes\n");
response.concat("Heap: ");