Obbart/ETcontroller_PRO
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improved bus wait with raii class that updates last access

Browse Source
This commit is contained in:
Emanuele Trabattoni
2025-07-25 10:57:17 +02:00
parent bb0832ad4f
commit 31c6cd9606
14 changed files with 173 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/TEMP/R4DCB08_Driver.cpp
View File

@@ -1,4 +1,7 @@
#include <R4DCB08_Driver.h>
#include <busdelay.h>
#define BUS_DELAY drivers::BusDelay(m_lastRequest, c_minDelay, "R4DCB08")
namespace drivers
{
@@ -12,17 +15,6 @@ namespace drivers
{
}
void R4DCB08::delayRequest()
{
auto now = millis();
if ((now - m_lastRequest) < c_minDelay)
{ // minimum m_lastRequest between requests
LOG_DEBUG("R4DCB08 delay request", (now-m_lastRequest));
delay(now - m_lastRequest);
}
m_lastRequest = millis();
}
const float R4DCB08::getTemp(const uint8_t ch)
{
uint8_t retries(0);
@@ -35,12 +27,12 @@ namespace drivers
std::lock_guard<std::mutex> lock(m_bus.getMutex());
while (retries++ < c_maxRetries)
{
delayRequest();
BUS_DELAY;
if (m_bus.readHoldingRegisters(m_address, REG_TEMP + ch, 1, rawT) && !rawT.empty())
{
return rawT.front() / 10.0f;
}
LOG_ERROR("Failed to Read Temperature, device", m_address, "channel", ch);
LOG_ERROR("Failed to Read Temperature, device", printHex(m_address).c_str(), "channel", ch);
rawT.clear();
}
return MAXFLOAT;
@@ -54,7 +46,7 @@ namespace drivers
std::lock_guard<std::mutex> lock(m_bus.getMutex());
while (retries++ < c_maxRetries)
{
delayRequest();
BUS_DELAY;
if (m_bus.readHoldingRegisters(m_address, REG_TEMP, getNum(), rawT) && !rawT.empty())
{
out.reserve(rawT.size());
@@ -64,7 +56,7 @@ namespace drivers
}
return out;
}
LOG_ERROR("Failed to Read All Temperature, device", m_address);
LOG_ERROR("Failed to Read All Temperature, device", printHex(m_address).c_str());
rawT.clear();
}
out.clear();
@@ -81,13 +73,13 @@ namespace drivers
{
while (retries++ < c_maxRetries)
{
delayRequest();
BUS_DELAY;
if (m_bus.writeRegister(m_address, REG_TEMPCORR + channel, v * 10)) // convert to decimal degreees to register value
{
channel++;
break;
}
LOG_ERROR("Failed to Set Temperature Correction, device", m_address);
LOG_ERROR("Failed to Set Temperature Correction, device", printHex(m_address).c_str());
}
}
}
@@ -102,7 +94,7 @@ namespace drivers
std::lock_guard<std::mutex> lock(m_bus.getMutex());
while (retries++ < c_maxRetries)
{
delayRequest();
BUS_DELAY;
if (m_bus.readHoldingRegisters(m_address, REG_TEMPCORR, getNum(), rawV))
{
out.reserve(rawV.size());
@@ -112,7 +104,7 @@ namespace drivers
}
return out;
}
LOG_ERROR("Failed to Get Temperature Correction, device", m_address);
LOG_ERROR("Failed to Get Temperature Correction, device", printHex(m_address).c_str());
rawV.clear();
}
out.clear();
@@ -129,7 +121,7 @@ namespace drivers
std::lock_guard<std::mutex> lock(m_bus.getMutex());
while (retries++ < c_maxRetries)
{
delayRequest();
BUS_DELAY;
if (m_bus.readHoldingRegisters(m_address, REG_TEMP, T_MAX, rawT))
{
for (auto v : rawT)
@@ -140,9 +132,11 @@ namespace drivers
m_sensors = sensors;
return m_sensors;
}
LOG_ERROR("Failed to Get Sensor Number, device", m_address);
LOG_ERROR("Failed to Get Sensor Number, device", printHex(m_address).c_str());
}
LOG_ERROR("No Temperature Sensors Detected, device", m_address);
LOG_ERROR("No Temperature Sensors Detected, device", printHex(m_address).c_str());
return 0;
}
}
#undef BUS_DELAY