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);