ETM-Schurig
/
powersync-plugins-modbus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #88: Add a parameter to write registers to the cli

master
jenkins 2022-10-27 12:03:49 +02:00
parent 844fa67714 f852393bb4
commit 3e71df5d90
1 changed files with 79 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
nymea-modbus-cli/main.cpp
View File

@ -74,6 +74,9 @@ int main(int argc, char *argv[])
lengthOption.setDefaultValue("1"); lengthOption.setDefaultValue("1");
parser.addOption(lengthOption); parser.addOption(lengthOption);
QCommandLineOption writeOption(QStringList() << "w" << "write", QString("The data to be written to the given register."), "data");
parser.addOption(writeOption);
QCommandLineOption debugOption(QStringList() << "d" << "debug", QString("Print more information.")); QCommandLineOption debugOption(QStringList() << "d" << "debug", QString("Print more information."));
parser.addOption(debugOption); parser.addOption(debugOption);
@ -121,6 +124,12 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
QByteArray writeData;
if (parser.isSet(writeOption)) {
writeData = parser.value(writeOption).toLocal8Bit();
qDebug() << "Write data:" << writeData;
}
// TCP connection // TCP connection
QHostAddress address = QHostAddress(parser.value(addressOption)); QHostAddress address = QHostAddress(parser.value(addressOption));
if (address.isNull()) { if (address.isNull()) {
@ -142,40 +151,82 @@ int main(int argc, char *argv[])
if (state == QModbusDevice::ConnectedState) { if (state == QModbusDevice::ConnectedState) {
qDebug() << "Connected successfully to" << QString("%1:%2").arg(address.toString()).arg(port); qDebug() << "Connected successfully to" << QString("%1:%2").arg(address.toString()).arg(port);
qDebug() << "Start reading from modbus server address" << modbusServerAddress << registerTypeString << "register:" << registerAddress << "Length:" << length; if (writeData.isEmpty()) {
QModbusDataUnit request = QModbusDataUnit(registerType, registerAddress, length); qDebug() << "Reading from modbus server address" << modbusServerAddress << registerTypeString << "register:" << registerAddress << "Length:" << length;
QModbusReply *reply = client->sendReadRequest(request, modbusServerAddress); QModbusDataUnit request = QModbusDataUnit(registerType, registerAddress, length);
if (!reply) { QModbusReply *reply = client->sendReadRequest(request, modbusServerAddress);
qCritical() << "Failed to read register" << client->errorString(); if (!reply) {
exit(EXIT_FAILURE); qCritical() << "Failed to read register" << client->errorString();
}
if (reply->isFinished()) {
reply->deleteLater(); // broadcast replies return immediately
qCritical() << "Reply finished immediatly. Something might have gone wrong:" << reply->errorString();
exit(EXIT_FAILURE);
}
QObject::connect(reply, &QModbusReply::finished, reply, &QModbusReply::deleteLater);
QObject::connect(reply, &QModbusReply::finished, client, [=]() {
if (reply->error() != QModbusDevice::NoError) {
qCritical() << "Reply finished with error:" << reply->errorString();
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
const QModbusDataUnit unit = reply->result(); if (reply->isFinished()) {
for (uint i = 0; i < unit.valueCount(); i++) { reply->deleteLater(); // broadcast replies return immediately
quint16 registerValue = unit.values().at(i); qCritical() << "Reply finished immediatly. Something might have gone wrong:" << reply->errorString();
quint16 registerNumber = unit.startAddress() + i; exit(EXIT_FAILURE);
qInfo() << "-->" << registerNumber << ":" << QString("0x%1").arg(registerValue, 4, 16, QLatin1Char('0')) << registerValue;
} }
exit(EXIT_SUCCESS); QObject::connect(reply, &QModbusReply::finished, reply, &QModbusReply::deleteLater);
}); QObject::connect(reply, &QModbusReply::finished, client, [=]() {
if (reply->error() != QModbusDevice::NoError) {
qCritical() << "Reply finished with error:" << reply->errorString();
exit(EXIT_FAILURE);
}
QObject::connect(reply, &QModbusReply::errorOccurred, client, [=] (QModbusDevice::Error error){ const QModbusDataUnit unit = reply->result();
qCritical() << "Modbus reply error occurred:" << error << reply->errorString(); for (uint i = 0; i < unit.valueCount(); i++) {
}); quint16 registerValue = unit.values().at(i);
quint16 registerNumber = unit.startAddress() + i;
qInfo() << "-->" << registerNumber << ":" << QString("0x%1").arg(registerValue, 4, 16, QLatin1Char('0')) << registerValue;
}
exit(EXIT_SUCCESS);
});
QObject::connect(reply, &QModbusReply::errorOccurred, client, [=] (QModbusDevice::Error error){
qCritical() << "Modbus reply error occurred:" << error << reply->errorString();
});
} else {
QModbusDataUnit request = QModbusDataUnit(registerType, registerAddress, length);
QDataStream stream(writeData);
qDebug() << "Reading write data" << writeData;
quint16 data = writeData.toUInt();
request.setValues({data});
qDebug() << "Writing" << request.values();
QModbusReply *reply = client->sendWriteRequest(request, modbusServerAddress);
if (!reply) {
qCritical() << "Failed to read register" << client->errorString();
exit(EXIT_FAILURE);
}
if (reply->isFinished()) {
reply->deleteLater(); // broadcast replies return immediately
qCritical() << "Reply finished immediatly. Something might have gone wrong:" << reply->errorString();
exit(EXIT_FAILURE);
}
QObject::connect(reply, &QModbusReply::finished, reply, &QModbusReply::deleteLater);
QObject::connect(reply, &QModbusReply::finished, client, [=]() {
if (reply->error() != QModbusDevice::NoError) {
qCritical() << "Reply finished with error:" << reply->errorString();
exit(EXIT_FAILURE);
}
const QModbusDataUnit unit = reply->result();
for (uint i = 0; i < unit.valueCount(); i++) {
quint16 registerValue = unit.values().at(i);
quint16 registerNumber = unit.startAddress() + i;
qInfo() << "-->" << registerNumber << ":" << QString("0x%1").arg(registerValue, 4, 16, QLatin1Char('0')) << registerValue;
}
exit(EXIT_SUCCESS);
});
QObject::connect(reply, &QModbusReply::errorOccurred, client, [=] (QModbusDevice::Error error){
qCritical() << "Modbus reply error occurred:" << error << reply->errorString();
});
}
} }
}); });