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

variables name refactoring

Browse Source
This commit is contained in:
Emanuele Trabattoni
2025-07-23 22:39:40 +02:00
parent 8f5615a034
commit 59d8c2c2d4
12 changed files with 98 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/SENECA/S50140_Driver.cpp
View File

@@ -9,7 +9,7 @@ namespace drivers
S50140::~S50140()
{
}
const S50140::powerinfo_t S50140::getAll()
{
powerinfo_t info{MAXFLOAT};
@@ -24,54 +24,63 @@ 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) < minDelay)
if ((now - m_lastRequest) < c_minDelay)
{ // minimum m_lastRequest between requests
vTaskDelay(pdMS_TO_TICKS(now - m_lastRequest));
delay(now - m_lastRequest);
}
m_lastRequest = now;
}
const uint8_t S50140::getRegset()
{
std::vector<uint16_t> value;
@@ -79,7 +88,7 @@ namespace drivers
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();
}
@@ -101,7 +110,7 @@ namespace drivers
constexpr uint16_t resetAll = 0x0A03;
constexpr uint16_t stopAll = 0x0A02;
constexpr uint16_t startAll = 0x0A01;
while (retries++ < maxRetries)
while (retries++ < c_maxRetries)
{
bool ok(true);
delayRequest();
@@ -126,11 +135,10 @@ namespace drivers
uint8_t retries(0);
std::vector<uint16_t> values;
while (retries++ < maxRetries)
while (retries++ < c_maxRetries)
{
delayRequest();
auto lock = m_bus.getLock();
if (m_bus.readHoldingRegisters(m_address, reg, dataWords, values) && values.size() == dataWords)
if (m_bus.readHoldingRegisters(m_address, reg, c_dataWords, values) && values.size() == c_dataWords)
{
floatval_t fv; // potrebbe essere il contrario, vedremo
fv.words.lo = values[0]; // magari va invertita ancora l'endianness

6
lib/SENECA/S50140_Driver.h
View File

@@ -11,9 +11,9 @@ namespace drivers
class S50140
{
private:
const uint8_t maxRetries = 5;
const uint8_t dataWords = 2;
const uint16_t minDelay = 500;
const uint8_t c_maxRetries = 5;
const uint8_t c_dataWords = 2;
const uint16_t c_minDelay = 200;
const uint16_t REG_V = 0x100C;
const uint16_t REG_A = 0x1016;