Add client scanner support for FC43/14

Author: serhmarch

src/client/core/client_global.cpp

@@ -6,235 +6,6 @@ int id_mbClientMessageParams = qRegisterMetaType<mbClientMessageParams>();
 
 namespace mb {
 
-QStringList saveClientMessages(const QList<mbClientMessageParamsOLD> messages)
-{
-    QStringList res;
-    Q_FOREACH(const mbClientMessageParamsOLD &p, messages)
-    {
-        res.append(saveClientMessageParams(p));
-    }
-    return res;
-}
-
-QList<mbClientMessageParamsOLD> restoreClientMessages(const QStringList &messages)
-{
-    QList<mbClientMessageParamsOLD> res;
-    bool ok = false;
-    Q_FOREACH(const QString &s, messages)
-    {
-        auto p = restoreClientMessageParams(s, &ok);
-        if (ok)
-            res.append(p);
-    }
-    return res;
-}
-
-QString saveClientMessageParams(const mbClientMessageParamsOLD &params, bool useFunc, bool useData)
-{
-    QString res;
-    switch(params.func)
-    {
-    case MBF_READ_COILS:
-    case MBF_READ_DISCRETE_INPUTS:
-    case MBF_READ_HOLDING_REGISTERS:
-    case MBF_READ_INPUT_REGISTERS:
-        if (useData)
-            res = QString("offset=%1;count=%2;format=%3").arg(params.offset).arg(params.count).arg(mb::enumFormatKey(params.format));
-        else
-            res = QString("offset=%1;count=%2").arg(params.offset).arg(params.count);
-        break;
-    case MBF_WRITE_SINGLE_COIL:
-    case MBF_WRITE_SINGLE_REGISTER:
-        if (useData)
-            res = QString("offset=%1;format=%2;data=%3").arg(params.offset).arg(mb::enumFormatKey(params.format), params.data.toString());
-        else
-            res = QString("offset=%1").arg(params.offset);
-        break;
-    case MBF_READ_EXCEPTION_STATUS:
-    case MBF_REPORT_SERVER_ID:
-        if (useData)
-            res = QString("format=%1").arg(mb::enumFormatKey(params.format));
-        break;
-    case MBF_DIAGNOSTICS:
-        if (useData)
-            res = QString("subfunc=%1;format=%2;data=%3").arg(params.subfunc).arg(mb::enumFormatKey(params.format), params.data.toString());
-        else
-            res = QString("subfunc=%1").arg(params.subfunc);
-        break;
-    case MBF_WRITE_MULTIPLE_COILS:
-    case MBF_WRITE_MULTIPLE_REGISTERS:
-        if (useData)
-            res = QString("offset=%1;count=%2;format=%3;data=%4")
-                  .arg(params.offset).arg(params.count).arg(mb::enumFormatKey(params.format), params.data.toString());
-        else
-            res = QString("offset=%1;count=%2")
-                  .arg(params.offset).arg(params.count);
-        break;
-    case MBF_MASK_WRITE_REGISTER:
-        res += QString("offset=%1;and=%2;or=%3").arg(params.offset).arg(params.andMask).arg(params.orMask);
-        break;
-    case MBF_READ_WRITE_MULTIPLE_REGISTERS:
-        if (useData)
-            res += QString("readoffset=%1;readcount=%2;readformat=%3;writeoffset=%4;writecount=%5;writeformat=%6;data=%7")
-                   .arg(params.offset)
-                   .arg(params.count)
-                   .arg(mb::enumFormatKey(params.format))
-                   .arg(params.writeOffset)
-                   .arg(params.writeCount)
-                   .arg(mb::enumFormatKey(params.writeFormat), params.data.toString());
-        else
-            res += QString("readoffset=%1;readcount=%2;writeoffset=%3;writecount=%5")
-                       .arg(params.offset)
-                       .arg(params.count)
-                       .arg(params.writeOffset)
-                       .arg(params.writeCount);
-        break;
-    case MBF_READ_FIFO_QUEUE:
-        if (useData)
-            res += QString("offset=%1;format=%2").arg(params.offset).arg(mb::enumFormatKey(params.format));
-        else
-            res += QString("offset=%1").arg(params.offset);
-        break;
-    case MBF_ENCAPSULATED_INTERFACE_TRANSPORT:
-        if (useData)
-            res += QString("deviceId=%1;objectId=%2;format=%3").arg(params.deviceId).arg(params.objectId).arg(mb::enumFormatKey(params.format));
-        else
-            res += QString("deviceId=%1;objectId=%2").arg(params.deviceId).arg(params.objectId);
-        break;
-    default:
-        break;
-    }
-    if (useFunc)
-    {
-        if (res.isEmpty())
-            res = QString("FC%1").arg(params.func, 2, 10, QLatin1Char('0'));
-        else
-            res = QString("FC%1;%2").arg(params.func, 2, 10, QLatin1Char('0')).arg(res);
-    }
-    return res;
-}
-
-mbClientMessageParamsOLD restoreClientMessageParams(const QString &params, bool *ok, uint8_t func)
-{
-    mbClientMessageParamsOLD res;
-    QHash<QString, QString> map = getClientParamMap(params);
-    if (func == 0)
-    {
-        bool funcOk = false;
-        Q_FOREACH(const QString &key, map.keys())
-        {
-            if (key.startsWith(QLatin1String("FC")))
-            {
-                func = static_cast<uint8_t>(key.midRef(2).toInt(&funcOk));
-                if (!funcOk)
-                {
-                    if (ok)
-                        *ok = false;
-                    return res;
-                }
-                break;
-            }
-        }
-        if (!funcOk)
-        {
-            // Support old format where func was a separate parameter
-            func = static_cast<uint8_t>(map.value(QStringLiteral("func")).toInt(&funcOk));
-            if (!funcOk)
-            {
-                if (ok)
-                    *ok = false;
-                return res;
-            }
-        }
-    }
-    res.func = func;
-    switch (func)
-    {
-    case MBF_READ_COILS:
-    case MBF_READ_DISCRETE_INPUTS:
-    case MBF_READ_HOLDING_REGISTERS:
-    case MBF_READ_INPUT_REGISTERS:
-        res.offset = static_cast<uint16_t>(map.value(QStringLiteral("offset"), "0").toInt());
-        res.count = static_cast<uint16_t>(map.value(QStringLiteral("count"), "1").toInt());
-        res.format = mb::enumFormatValue(map.value(QStringLiteral("format"), "Dec16"));
-        return res;
-    case MBF_WRITE_SINGLE_COIL:
-    case MBF_WRITE_SINGLE_REGISTER:
-        res.offset = static_cast<uint16_t>(map.value(QStringLiteral("offset"), "0").toInt());
-        res.format = mb::enumFormatValue(map.value(QStringLiteral("format"), "Dec16"));
-        res.data = map.value(QStringLiteral("data"));
-        return res;
-    case MBF_READ_EXCEPTION_STATUS:
-    case MBF_REPORT_SERVER_ID:
-        res.format = mb::enumFormatValue(map.value(QStringLiteral("format"), "Dec16"));
-        return res;
-    case MBF_DIAGNOSTICS:
-        res.subfunc = static_cast<uint16_t>(map.value(QStringLiteral("subfunc"), "0").toInt());
-        res.format = mb::enumFormatValue(map.value(QStringLiteral("format"), "Dec16"));
-        res.data = map.value(QStringLiteral("data"));
-        return res;
-    case MBF_GET_COMM_EVENT_COUNTER:
-    case MBF_GET_COMM_EVENT_LOG:
-        return res;
-    case MBF_WRITE_MULTIPLE_COILS:
-    case MBF_WRITE_MULTIPLE_REGISTERS:
-        res.offset = static_cast<uint16_t>(map.value(QStringLiteral("offset"), "0").toInt());
-        res.count = static_cast<uint16_t>(map.value(QStringLiteral("count"), "1").toInt());
-        res.format = mb::enumFormatValue(map.value(QStringLiteral("format"), "Dec16"));
-        res.data = map.value(QStringLiteral("data"));
-        return res;
-    case MBF_MASK_WRITE_REGISTER:
-        res.offset = static_cast<uint16_t>(map.value(QStringLiteral("offset"), "0").toInt());
-        res.andMask = static_cast<uint16_t>(map.value(QStringLiteral("and"), "0").toInt());
-        res.orMask = static_cast<uint16_t>(map.value(QStringLiteral("or"), "0").toInt());
-        return res;
-    case MBF_READ_WRITE_MULTIPLE_REGISTERS:
-        res.offset = static_cast<uint16_t>(map.value(QStringLiteral("readoffset"), "0").toInt());
-        res.count = static_cast<uint16_t>(map.value(QStringLiteral("readcount"), "1").toInt());
-        res.format = mb::enumFormatValue(map.value(QStringLiteral("readformat"), "Dec16"));
-        res.writeOffset = static_cast<uint16_t>(map.value(QStringLiteral("writeoffset"), "0").toInt());
-        res.writeCount = static_cast<uint16_t>(map.value(QStringLiteral("writecount"), "1").toInt());
-        res.writeFormat = mb::enumFormatValue(map.value(QStringLiteral("writeformat"), "Dec16"));
-        res.data = map.value(QStringLiteral("data"));
-        return res;
-    case MBF_READ_FIFO_QUEUE:
-        res.offset = static_cast<uint16_t>(map.value(QStringLiteral("offset"), "0").toInt());
-        res.format = mb::enumFormatValue(map.value(QStringLiteral("format"), "Dec16"));
-        return res;
-    case MBF_ENCAPSULATED_INTERFACE_TRANSPORT:
-        res.deviceId = static_cast<uint16_t>(map.value(QStringLiteral("deviceId"), "1").toInt());
-        res.objectId = static_cast<uint16_t>(map.value(QStringLiteral("objectId"), "0").toInt());
-        res.format = mb::enumFormatValue(map.value(QStringLiteral("format"), "String"));
-        return res;
-    default:
-        if (ok)
-            *ok = false;
-        return res;
-    }
-    if (ok)
-        *ok = true;
-    return res;
-}
-
-QHash<QString, QString> getClientParamMap(const QString &params)
-{
-    QHash<QString, QString> map;
-    QStringList parts = params.split(QLatin1Char(';'), Qt::SkipEmptyParts);
-    Q_FOREACH (const QString &part, parts)
-    {
-        QStringList keyValue = part.split(QLatin1Char('='), Qt::KeepEmptyParts);
-        if (keyValue.size() == 2)
-        {
-            map.insert(keyValue.at(0), keyValue.at(1));
-        }
-        else
-        {
-            map.insert(part, QString());
-        }
-    }
-    return map;
-}
-
 } // namespace mb
 
 mbClientMessageConverter::mbClientMessageConverter()

src/client/core/client_global.h

@@ -39,51 +39,6 @@ class mbClientRunMessageRaw;
 typedef mb::SharedPointer<mbClientRunMessage> mbClientRunMessagePtr;
 typedef mb::SharedPointer<mbClientRunMessageRaw> mbClientRunMessageRawPtr;
 
-struct mbClientMessageParamsOLD
-{
-    mbClientMessageParamsOLD()
-    {
-        func = MBF_READ_HOLDING_REGISTERS;
-        offset = 0;
-        count = 0;
-        format = mb::Dec16;
-        writeOffset = 0;
-        writeCount = 0;
-        writeFormat = mb::Dec16;
-    }
-
-    int func;
-    union
-    {
-        uint16_t offset;
-        uint16_t subfunc;
-        struct 
-        {
-            uint8_t deviceId;
-            uint8_t objectId;
-        };
-    };
-    uint16_t count;
-    mb::Format format;
-
-    union
-    {
-        uint16_t writeOffset;
-        uint16_t andMask;
-    };
-
-    union
-    {
-        uint16_t writeCount;
-        uint16_t orMask;
-    };
-
-    mb::Format writeFormat;
-    QVector<Modbus::FileRecord> fileRecords;
-    QVariant data;
-
-};
-Q_DECLARE_METATYPE(mbClientMessageParamsOLD)
 
 // Note: Memento class for Client messages
 class mbClientMessageParams
@@ -360,16 +315,6 @@ typedef mbClientDataViewItem* ItemHandle_t;
 
 } // namespace Client
 
-QStringList saveClientMessages(const QList<mbClientMessageParamsOLD> messages);
-
-QList<mbClientMessageParamsOLD> restoreClientMessages(const QStringList &messages);
-
-QString saveClientMessageParams(const mbClientMessageParamsOLD &params, bool useFunc = true, bool useData = true);
-
-mbClientMessageParamsOLD restoreClientMessageParams(const QString &params, bool *ok = nullptr, uint8_t func = 0);
-
-QHash<QString, QString> getClientParamMap(const QString &params);
-
 } // namespace mb
 
 #endif // CLIENT_GLOBAL_H

src/client/gui/scanner/client_dialogscannerrequest.cpp

@@ -51,6 +51,18 @@ mbClientDialogScannerRequest::mbClientDialogScannerRequest(QWidget *parent) :
     sp->setMaximum(USHRT_MAX);
     sp->setValue(1);
 
+    // device id
+    sp = ui->spDeviceId;
+    sp->setMinimum(0);
+    sp->setMaximum(UINT8_MAX);
+    sp->setValue(1);
+
+    // object id
+    sp = ui->spObjectId;
+    sp->setMinimum(0);
+    sp->setMaximum(UINT8_MAX);
+    sp->setValue(0);
+
     m_funcNums.append(MBF_READ_COILS                   );
     m_funcNums.append(MBF_READ_DISCRETE_INPUTS         );
     m_funcNums.append(MBF_READ_HOLDING_REGISTERS       );
@@ -95,6 +107,10 @@ mbClientDialogScannerRequest::mbClientDialogScannerRequest(QWidget *parent) :
                     .arg(mb::ModbusFunctionString(funcNum))
                     );
     }
+    m_funcNums.append(MBF_ENCAPSULATED_INTERFACE_TRANSPORT);
+    cmb->addItem(QString("%1/%2 - ReadDeviceIdentification")
+                     .arg(MBF_ENCAPSULATED_INTERFACE_TRANSPORT, 2, 10, QChar('0'))
+                     .arg(MBF_MEI_READ_DEVICE_ID, 2, 10, QChar('0')));
     cmb->setCurrentIndex(2);
 
     cmb = ui->cmbDiagnSubfunction;
@@ -345,6 +361,11 @@ mbClientMessageParams mbClientDialogScannerRequest::getCurrentFunc() const
         func.setFileRecords(getCurrentFileRecords());
     }
         break;
+    case MBF_ENCAPSULATED_INTERFACE_TRANSPORT:
+        func.setFunction(funcNum);
+        func.setDeviceId(static_cast<uint8_t>(ui->spDeviceId->value()));
+        func.setObjectId(static_cast<uint8_t>(ui->spObjectId->value()));
+        break;
     }
     return func;
 }
@@ -384,6 +405,10 @@ void mbClientDialogScannerRequest::setCurrentFunc(const mbClientMessageParams &f
     case MBF_WRITE_FILE_RECORD:
         setCurrentFileRecords(f.fileRecords());
         break;
+    case MBF_ENCAPSULATED_INTERFACE_TRANSPORT:
+        ui->spDeviceId->setValue(f.deviceId());
+        ui->spObjectId->setValue(f.objectId());
+        break;
     default:
         return;
     }
@@ -433,6 +458,9 @@ void mbClientDialogScannerRequest::setCurrentFuncNum(uint8_t funcNum)
     case MBF_WRITE_FILE_RECORD:
         ui->swFuncParams->setCurrentWidget(ui->pgFileRecord);
         break;
+    case MBF_ENCAPSULATED_INTERFACE_TRANSPORT:
+        ui->swFuncParams->setCurrentWidget(ui->pgReadDeviceId);
+        break;
     default:
         ui->swFuncParams->setCurrentWidget(ui->pgEmpty);
         break;