ETM-Schurig
/
nymea-plugins-modbus
mirror of https://github.com/nymea/nymea-plugins-modbus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix modbus tcp master code errors from rebase

pull/21/head
Simon Stürz 2021-05-12 10:31:07 +02:00 committed by Michael Zanetti
parent 621c98369e
commit a71b86f82e
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modbus/modbustcpmaster.cpp
View File

@ -154,6 +154,11 @@ void ModbusTCPMaster::setTimeout(int timeout)
m_modbusTcpClient->setTimeout(timeout); m_modbusTcpClient->setTimeout(timeout);
} }
int ModbusTCPMaster::timeout()
{
return m_modbusTcpClient->timeout();
}
QString ModbusTCPMaster::errorString() const QString ModbusTCPMaster::errorString() const
{ {
return m_modbusTcpClient->errorString(); return m_modbusTcpClient->errorString();

1
modbus/modbustcpmaster.h
View File

@ -108,7 +108,6 @@ signals:
void readRequestError(const QUuid &requestId, const QString &error); void readRequestError(const QUuid &requestId, const QString &error);
void readRequestExecuted(const QUuid &requestId, bool success); void readRequestExecuted(const QUuid &requestId, bool success);
void readRequestError(const QUuid &requestId, const QString &error);
void receivedCoil(uint slaveAddress, uint modbusRegister, const QVector<quint16> &values); void receivedCoil(uint slaveAddress, uint modbusRegister, const QVector<quint16> &values);
void receivedDiscreteInput(uint slaveAddress, uint modbusRegister, const QVector<quint16> &values); void receivedDiscreteInput(uint slaveAddress, uint modbusRegister, const QVector<quint16> &values);