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

Adjusted mutex lock and delay for modbus

Browse Source
This commit is contained in:
Emanuele Trabattoni
2025-07-24 16:18:42 +02:00
parent 07dd200de8
commit cdbc904bec
11 changed files with 130 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/RS485/RS485_Driver.cpp
View File

@@ -66,6 +66,18 @@ namespace drivers
LOG_INFO("Init MODBUS Master Mode");
m_crc.reset(CRC16_MODBUS_POLYNOME, CRC16_MODBUS_INITIAL, CRC16_MODBUS_XOR_OUT, CRC16_MODBUS_REV_IN, CRC16_MAXIM_REV_OUT);
m_lastAccess = millis();
m_lastDevice = 0;
}
// Get transaction lock
std::unique_lock<std::mutex> MODBUS::getLock()
{
return std::unique_lock<std::mutex>(m_mutex);
}
std::mutex &MODBUS::getMutex()
{
return m_mutex;
}
void MODBUS::delayAccess(const uint8_t device)
@@ -74,12 +86,12 @@ namespace drivers
return;
auto now = millis();
if ((now - m_lastAccess) < c_minDelay) // fixed milliseconds delay between commands to different devices
{ // minimum m_lastRequest between requests
LOG_WARN("MODBUS access delay", now - m_lastAccess, "device", device);
{
LOG_WARN("MODBUS access delay", (now - m_lastAccess), "device", device);
delay(now - m_lastAccess);
}
m_lastAccess = millis();
m_lastDevice = device;
m_lastAccess = millis();
}
// Func 0x01

7
lib/RS485/RS485_Driver.h
View File

@@ -34,7 +34,7 @@ namespace drivers
const uint8_t c_respHeaderSize = 3;
const uint8_t c_respCrcSize = 2;
const uint16_t c_minDelay = 10;
const uint32_t c_minDelay = 500;
typedef struct
{
@@ -62,9 +62,8 @@ namespace drivers
MODBUS &operator=(const MODBUS &) = delete;
// Get transaction lock
std::unique_lock<std::mutex> getLock() {
return std::unique_lock<std::mutex>(m_mutex);
}
std::unique_lock<std::mutex> getLock();
std::mutex &getMutex();
// Func 0x01
const bool readCoils(const uint8_t device, const uint16_t reg, const uint16_t num, std::vector<bool> &coils);

27
lib/SENECA/S50140_Driver.cpp
View File

@@ -9,10 +9,11 @@ namespace drivers
S50140::~S50140()
{
}
const S50140::powerinfo_t S50140::getAll()
{
powerinfo_t info{MAXFLOAT};
std::lock_guard<std::mutex> lock(m_bus.getMutex());
info.v = getV();
info.a = getA();
info.pAct = getPact();
@@ -24,79 +25,71 @@ namespace drivers
info.whPar = getWhPar();
return info;
}
const float_t S50140::getV()
{
auto lock = m_bus.getLock();
return readFloatReg(REG_V);
}
const float_t S50140::getA()
{
auto lock = m_bus.getLock();
return readFloatReg(REG_A);
}
const float_t S50140::getPact()
{
auto lock = m_bus.getLock();
return readFloatReg(REG_Pact);
}
const float_t S50140::getPapp()
{
auto lock = m_bus.getLock();
return readFloatReg(REG_Papp);
}
const float_t S50140::getPrea()
{
auto lock = m_bus.getLock();
return readFloatReg(REG_Prea);
}
const float_t S50140::getPf()
{
auto lock = m_bus.getLock();
return readFloatReg(REG_Pf);
}
const float_t S50140::getF()
{
auto lock = m_bus.getLock();
return readFloatReg(REG_Freq);
}
const float_t S50140::getWhTot()
{
auto lock = m_bus.getLock();
return readFloatReg(REG_WhTot);
}
const float_t S50140::getWhPar()
{
auto lock = m_bus.getLock();
return readFloatReg(REG_WhPart);
}
void S50140::delayRequest()
{
auto now = millis();
if ((now - m_lastRequest) < c_minDelay)
{ // minimum m_lastRequest between requests
LOG_DEBUG("S50140 delay request", (now-m_lastRequest));
delay(now - m_lastRequest);
}
m_lastRequest = millis();
}
const uint8_t S50140::getRegset()
{
std::vector<uint16_t> value;
std::lock_guard<std::mutex> lock(m_bus.getMutex());
delayRequest();
auto lock = m_bus.getLock();
m_bus.readHoldingRegisters(m_address, REG_Regset, 2, value);
if (value.empty())
return UINT8_MAX;
return UINT8_MAX;
return value.front() + value.back();
}
const uint16_t S50140::getCounterStatus()
{
std::vector<uint16_t> value;
std::lock_guard<std::mutex> lock(m_bus.getMutex());
delayRequest();
auto lock = m_bus.getLock();
m_bus.readHoldingRegisters(m_address, REG_PartCount, 2, value);
if (value.empty())
return UINT16_MAX;
@@ -110,11 +103,11 @@ namespace drivers
constexpr uint16_t resetAll = 0x0A03;
constexpr uint16_t stopAll = 0x0A02;
constexpr uint16_t startAll = 0x0A01;
std::lock_guard<std::mutex> lock(m_bus.getMutex());
while (retries++ < c_maxRetries)
{
bool ok(true);
delayRequest();
auto lock = m_bus.getLock();
LOG_WARN("Powermeter Counter STOP");
ok &= m_bus.writeRegisters(m_address, REG_PartCount, {nullVal, stopAll});
delayRequest();

4
lib/SENECA/S50140_Driver.h
View File

@@ -13,7 +13,7 @@ namespace drivers
private:
const uint8_t c_maxRetries = 5;
const uint8_t c_dataWords = 2;
const uint16_t c_minDelay = 500;
const uint32_t c_minDelay = 500;
const uint16_t REG_V = 0x100C;
const uint16_t REG_A = 0x1016;
@@ -80,6 +80,6 @@ namespace drivers
private:
const uint8_t m_address;
drivers::MODBUS &m_bus;
uint64_t m_lastRequest;
uint32_t m_lastRequest;
};
}

44
lib/TEMP/R4DCB08_Driver.cpp
View File

@@ -5,12 +5,24 @@ namespace drivers
R4DCB08::R4DCB08(drivers::MODBUS &bus, const uint8_t address) : m_address(address), m_bus(bus), m_sensors(0)
{
m_sensors = getNum();
m_lastRequest = millis();
}
R4DCB08::~R4DCB08()
{
}
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);
@@ -20,16 +32,16 @@ namespace drivers
LOG_ERROR("Invalid Temperature Channel number", ch);
return MAXFLOAT;
}
auto lock = m_bus.getLock();
while (retries++ < maxRetries)
std::lock_guard<std::mutex> lock(m_bus.getMutex());
while (retries++ < c_maxRetries)
{
delayRequest();
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);
rawT.clear();
delay(50);
}
return MAXFLOAT;
}
@@ -39,9 +51,10 @@ namespace drivers
uint8_t retries(0);
std::vector<uint16_t> rawT;
std::vector<float> out;
auto lock = m_bus.getLock();
while (retries++ < maxRetries)
std::lock_guard<std::mutex> lock(m_bus.getMutex());
while (retries++ < c_maxRetries)
{
delayRequest();
if (m_bus.readHoldingRegisters(m_address, REG_TEMP, getNum(), rawT) && !rawT.empty())
{
out.reserve(rawT.size());
@@ -53,7 +66,6 @@ namespace drivers
}
LOG_ERROR("Failed to Read All Temperature, device", m_address);
rawT.clear();
delay(50);
}
out.clear();
return out;
@@ -64,20 +76,18 @@ namespace drivers
uint8_t retries(0);
uint8_t channel(0);
corr.resize(getNum()); // max number of temperature correction values is equal to number of sensors
auto lock = m_bus.getLock();
std::lock_guard<std::mutex> lock(m_bus.getMutex());
for (auto v : corr)
{
while (retries++ < maxRetries)
while (retries++ < c_maxRetries)
{
delayRequest();
if (m_bus.writeRegister(m_address, REG_TEMPCORR + channel, v * 10)) // convert to decimal degreees to register value
{
channel++;
delay(50);
break;
}
LOG_ERROR("Failed to Set Temperature Correction, device", m_address);
delay(50);
}
}
}
@@ -89,9 +99,10 @@ namespace drivers
std::vector<float> out;
rawV.reserve(getNum());
while (retries++ < maxRetries)
std::lock_guard<std::mutex> lock(m_bus.getMutex());
while (retries++ < c_maxRetries)
{
auto lock = m_bus.getLock();
delayRequest();
if (m_bus.readHoldingRegisters(m_address, REG_TEMPCORR, getNum(), rawV))
{
out.reserve(rawV.size());
@@ -103,7 +114,6 @@ namespace drivers
}
LOG_ERROR("Failed to Get Temperature Correction, device", m_address);
rawV.clear();
delay(50);
}
out.clear();
return out;
@@ -116,9 +126,10 @@ namespace drivers
uint8_t retries(0);
uint8_t sensors(0);
std::vector<uint16_t> rawT;
while (retries++ < maxRetries)
std::lock_guard<std::mutex> lock(m_bus.getMutex());
while (retries++ < c_maxRetries)
{
auto lock = m_bus.getLock();
delayRequest();
if (m_bus.readHoldingRegisters(m_address, REG_TEMP, T_MAX, rawT))
{
for (auto v : rawT)
@@ -130,7 +141,6 @@ namespace drivers
return m_sensors;
}
LOG_ERROR("Failed to Get Sensor Number, device", m_address);
delay(50);
}
LOG_ERROR("No Temperature Sensors Detected, device", m_address);
return 0;

8
lib/TEMP/R4DCB08_Driver.h
View File

@@ -25,7 +25,9 @@ namespace drivers
T_MAX
};
const uint8_t maxRetries = 5;
private:
const uint8_t c_maxRetries = 5;
const uint32_t c_minDelay = 500;
const uint16_t REG_TEMP = 0x0000;
const uint16_t REG_TEMPCORR = 0x0008;
@@ -41,9 +43,13 @@ namespace drivers
const uint8_t getNum();
private:
void delayRequest();
private:
const uint8_t m_address;
uint8_t m_sensors;
MODBUS &m_bus;
uint32_t m_lastRequest;
};
}