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 logging categories

pull/1/head
Michael Zanetti 2020-10-22 21:54:39 +02:00
parent befc4a1fdc
commit 0b0955f050
4 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
*.pro.user
builddir
doc/html
*.qm

1
drexelundweiss/translations/68d78ce6-82d0-4a5b-b901-7c3b843ef63c-en_US.qm
View File

@ -1 +0,0 @@
<ｸdﾊ<>箆!ｿ`｡ｽﾝ

6
modbus/modbusrtumaster.cpp
View File

@ -31,8 +31,10 @@
#include "modbusrtumaster.h"
#include <QSerialPortInfo>
#include <QLoggingCategory>
Q_DECLARE_LOGGING_CATEGORY(dcModbusRTU)
#include <loggingcategories.h>
NYMEA_LOGGING_CATEGORY(dcModbusRTU, "ModbusRTU")
ModbusRTUMaster::ModbusRTUMaster(QString serialPort, uint baudrate, QSerialPort::Parity parity, uint dataBits, uint stopBits, QObject *parent) :
QObject(parent)

44
modbus/modbustcpmaster.cpp
View File

@ -29,8 +29,8 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "modbustcpmaster.h"
#include <QLoggingCategory>
Q_DECLARE_LOGGING_CATEGORY(dcModbus)
#include <loggingcategories.h>
NYMEA_LOGGING_CATEGORY(dcModbusTCP, "ModbusTCP")
ModbusTCPMaster::ModbusTCPMaster(const QHostAddress &hostAddress, uint port, QObject *parent) :
QObject(parent)
@ -63,7 +63,7 @@ ModbusTCPMaster::~ModbusTCPMaster()
bool ModbusTCPMaster::connectDevice() {
// TCP connction to target device
qCDebug(dcModbus()) << "Setting up TCP connecion";
qCDebug(dcModbusTCP()) << "Setting up TCP connecion";
if (!m_modbusTcpClient)
return false;
@ -132,12 +132,12 @@ QUuid ModbusTCPMaster::readCoil(uint slaveAddress, uint registerAddress, uint si
} else {
writeRequestExecuted(requestId, false);
qCWarning(dcModbus()) << "Read response error:" << reply->error();
qCWarning(dcModbusTCP()) << "Read response error:" << reply->error();
}
});
connect(reply, &QModbusReply::errorOccurred, this, [reply, requestId, this] (QModbusDevice::Error error){
qCWarning(dcModbus()) << "Modbus reply error:" << error;
qCWarning(dcModbusTCP()) << "Modbus reply error:" << error;
emit writeRequestError(requestId, reply->errorString());
reply->finished(); // To make sure it will be deleted
});
@ -147,7 +147,7 @@ QUuid ModbusTCPMaster::readCoil(uint slaveAddress, uint registerAddress, uint si
return "";
}
} else {
qCWarning(dcModbus()) << "Read error: " << m_modbusTcpClient->errorString();
qCWarning(dcModbusTCP()) << "Read error: " << m_modbusTcpClient->errorString();
return "";
}
return requestId;
@ -175,13 +175,13 @@ QUuid ModbusTCPMaster::writeHoldingRegisters(uint slaveAddress, uint registerAdd
} else {
writeRequestExecuted(requestId, false);
qCWarning(dcModbus()) << "Read response error:" << reply->error();
qCWarning(dcModbusTCP()) << "Read response error:" << reply->error();
}
reply->deleteLater();
});
connect(reply, &QModbusReply::errorOccurred, this, [reply, requestId, this] (QModbusDevice::Error error){
qCWarning(dcModbus()) << "Modbus replay error:" << error;
qCWarning(dcModbusTCP()) << "Modbus replay error:" << error;
emit writeRequestError(requestId, reply->errorString());
reply->finished(); // To make sure it will be deleted
});
@ -191,7 +191,7 @@ QUuid ModbusTCPMaster::writeHoldingRegisters(uint slaveAddress, uint registerAdd
return "";
}
} else {
qCWarning(dcModbus()) << "Read error: " << m_modbusTcpClient->errorString();
qCWarning(dcModbusTCP()) << "Read error: " << m_modbusTcpClient->errorString();
return "";
}
return requestId;
@ -219,12 +219,12 @@ QUuid ModbusTCPMaster::readDiscreteInput(uint slaveAddress, uint registerAddress
} else {
writeRequestExecuted(requestId, false);
qCWarning(dcModbus()) << "Read response error:" << reply->error();
qCWarning(dcModbusTCP()) << "Read response error:" << reply->error();
}
});
connect(reply, &QModbusReply::errorOccurred, this, [requestId, this] (QModbusDevice::Error error){
qCWarning(dcModbus()) << "Modbus replay error:" << error;
qCWarning(dcModbusTCP()) << "Modbus replay error:" << error;
QModbusReply *reply = qobject_cast<QModbusReply *>(sender());
emit writeRequestError(requestId, reply->errorString());
reply->finished(); // To make sure it will be deleted
@ -235,7 +235,7 @@ QUuid ModbusTCPMaster::readDiscreteInput(uint slaveAddress, uint registerAddress
return "";
}
} else {
qCWarning(dcModbus()) << "Read error: " << m_modbusTcpClient->errorString();
qCWarning(dcModbusTCP()) << "Read error: " << m_modbusTcpClient->errorString();
return "";
}
return requestId;
@ -263,12 +263,12 @@ QUuid ModbusTCPMaster::readInputRegister(uint slaveAddress, uint registerAddress
} else {
writeRequestExecuted(requestId, false);
qCWarning(dcModbus()) << "Read response error:" << reply->error();
qCWarning(dcModbusTCP()) << "Read response error:" << reply->error();
}
});
connect(reply, &QModbusReply::errorOccurred, this, [reply, requestId, this] (QModbusDevice::Error error){
qCWarning(dcModbus()) << "Modbus reply error:" << error;
qCWarning(dcModbusTCP()) << "Modbus reply error:" << error;
emit writeRequestError(requestId, reply->errorString());
reply->finished(); // To make sure it will be deleted
});
@ -278,7 +278,7 @@ QUuid ModbusTCPMaster::readInputRegister(uint slaveAddress, uint registerAddress
return "";
}
} else {
qCWarning(dcModbus()) << "Read error: " << m_modbusTcpClient->errorString();
qCWarning(dcModbusTCP()) << "Read error: " << m_modbusTcpClient->errorString();
return "";
}
return requestId;
@ -306,13 +306,13 @@ QUuid ModbusTCPMaster::readHoldingRegister(uint slaveAddress, uint registerAddre
} else {
writeRequestExecuted(requestId, false);
qCWarning(dcModbus()) << "Read response error:" << reply->error();
qCWarning(dcModbusTCP()) << "Read response error:" << reply->error();
}
reply->deleteLater();
});
connect(reply, &QModbusReply::errorOccurred, this, [reply, requestId, this] (QModbusDevice::Error error){
qCWarning(dcModbus()) << "Modbus replay error:" << error;
qCWarning(dcModbusTCP()) << "Modbus replay error:" << error;
emit writeRequestError(requestId, reply->errorString());
reply->finished(); // To make sure it will be deleted
});
@ -322,7 +322,7 @@ QUuid ModbusTCPMaster::readHoldingRegister(uint slaveAddress, uint registerAddre
return "";
}
} else {
qCWarning(dcModbus()) << "Read error: " << m_modbusTcpClient->errorString();
qCWarning(dcModbusTCP()) << "Read error: " << m_modbusTcpClient->errorString();
return "";
}
return requestId;
@ -356,13 +356,13 @@ QUuid ModbusTCPMaster::writeCoils(uint slaveAddress, uint registerAddress, const
} else {
writeRequestExecuted(requestId, false);
qCWarning(dcModbus()) << "Read response error:" << reply->error();
qCWarning(dcModbusTCP()) << "Read response error:" << reply->error();
}
reply->deleteLater();
});
connect(reply, &QModbusReply::errorOccurred, this, [reply, requestId, this] (QModbusDevice::Error error){
qCWarning(dcModbus()) << "Modbus reply error:" << error;
qCWarning(dcModbusTCP()) << "Modbus reply error:" << error;
emit writeRequestError(requestId, reply->errorString());
reply->finished(); // To make sure it will be deleted
});
@ -372,7 +372,7 @@ QUuid ModbusTCPMaster::writeCoils(uint slaveAddress, uint registerAddress, const
return "";
}
} else {
qCWarning(dcModbus()) << "Read error: " << m_modbusTcpClient->errorString();
qCWarning(dcModbusTCP()) << "Read error: " << m_modbusTcpClient->errorString();
return "";
}
return requestId;
@ -386,7 +386,7 @@ QUuid ModbusTCPMaster::writeHoldingRegister(uint slaveAddress, uint registerAddr
void ModbusTCPMaster::onModbusErrorOccurred(QModbusDevice::Error error)
{
qCWarning(dcModbus()) << "An error occured" << error;
qCWarning(dcModbusTCP()) << "An error occured" << error;
}