Fix modbus tcp master code errors from rebase
parent
621c98369e
commit
a71b86f82e
|
|
@ -154,6 +154,11 @@ void ModbusTCPMaster::setTimeout(int timeout)
|
|||
m_modbusTcpClient->setTimeout(timeout);
|
||||
}
|
||||
|
||||
int ModbusTCPMaster::timeout()
|
||||
{
|
||||
return m_modbusTcpClient->timeout();
|
||||
}
|
||||
|
||||
QString ModbusTCPMaster::errorString() const
|
||||
{
|
||||
return m_modbusTcpClient->errorString();
|
||||
|
|
|
|||
|
|
@ -108,7 +108,6 @@ signals:
|
|||
void readRequestError(const QUuid &requestId, const QString &error);
|
||||
|
||||
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 receivedDiscreteInput(uint slaveAddress, uint modbusRegister, const QVector<quint16> &values);
|
||||
|
|
|
|||
Loading…
Reference in New Issue