Begin work on 0.2.0 version

Author: serhmarch

bin/Windows/x64/Qt5Network.dll

@@ -6,7 +6,7 @@ CONFIG += no_keywords
 
 DESTDIR  = ../bin
 
-QT = core gui widgets network serialport xml
+QT = core gui widgets xml
 
 unix:QMAKE_RPATHDIR += .
 

bin/Windows/x64/Qt5SerialPort.dll

@@ -50,9 +50,9 @@ QWidget *mbClientDataViewDelegate::createEditor(QWidget *parent, const QStyleOpt
     case mbClientDataViewModel::Column_Format:
     {
         QComboBox *cmb = new QComboBox(parent);
-        QMetaEnum formats = QMetaEnum::fromType<mb::Format>();
-        for (int i = 0; i < formats.keyCount(); i++)
-            cmb->addItem(formats.key(i));
+        QStringList ls = mb::enumFormatKeyList();
+        Q_FOREACH (const QString &s, ls)
+            cmb->addItem(s);
         return cmb;
     }
     default:

bin/Windows/x64/client.exe

@@ -24,12 +24,10 @@
 #include "ui_client_dialogdevice.h"
 
 #include <QMetaEnum>
-#include <QSerialPort>
-#include <QSerialPortInfo>
 #include <QIntValidator>
 
-#include <ModbusPortTCP.h>
-#include <ModbusPortSerial.h>
+#include <ModbusQt.h>
+
 #include <client.h>
 #include <project/client_project.h>
 #include <project/client_port.h>
@@ -53,13 +51,12 @@ mbClientDialogDevice::mbClientDialogDevice(QWidget *parent) :
 {
     ui->setupUi(this);
 
-    QMetaEnum e;
+    QStringList ls;
 
     mbClientPort::Defaults dPort = mbClientPort::Defaults::instance();
     mbClientDevice::Defaults dDevice = mbClientDevice::Defaults::instance();
 
-    Modbus::PortTCP::Defaults    td = Modbus::PortTCP::Defaults::instance();
-    Modbus::PortSerial::Defaults sd = Modbus::PortSerial::Defaults::instance();
+    Modbus::Defaults d = Modbus::Defaults::instance();
 
     QSpinBox* sp;
     QLineEdit* ln;
@@ -76,103 +73,87 @@ mbClientDialogDevice::mbClientDialogDevice(QWidget *parent) :
     sp->setMaximum(255);
     sp->setValue(dDevice.unit); // default unit address
     // Port
-    connect(ui->cmbPortType, SIGNAL(currentIndexChanged(int)), this, SLOT(setPortType(int)));
+    connect(ui->cmbPort, SIGNAL(currentIndexChanged(int)), this, SLOT(setPort(int)));
 
     // Port Name
     ln = ui->lnPortName;
     ln->setText(dPort.name);
     // Type
     cmb = ui->cmbPortType;
-    e = QMetaEnum::fromType<Modbus::Type>();
-    for (int i = 0; i < e.keyCount(); i++)
-        cmb->addItem(QString(e.key(i)));
-    cmb->setCurrentText(e.valueToKey(Modbus::TCP));
+    cmb->addItem(Modbus::toString(Modbus::ASC));
+    cmb->addItem(Modbus::toString(Modbus::RTU));
+    cmb->addItem(Modbus::toString(Modbus::TCP));
+    cmb->setCurrentText(Modbus::toString(Modbus::TCP));
     ui->stackedWidget->setCurrentWidget(ui->pgTCP);
-    connect(ui->cmbPort, SIGNAL(currentIndexChanged(int)), this, SLOT(setPort(int)));
+    connect(cmb, SIGNAL(currentIndexChanged(int)), this, SLOT(setPortType(int)));
 
     //--------------------- SERIAL ---------------------
     // Serial Port
     cmb = ui->cmbSerialPortName;
-    QList<QSerialPortInfo> ports = QSerialPortInfo::availablePorts();
-    Q_FOREACH(QSerialPortInfo port, ports)
-        cmb->addItem(port.portName());
+    QStringList ports = Modbus::availableSerialPortList();
+    Q_FOREACH(const QString &port, ports)
+        cmb->addItem(port);
 
     // Baud Rate
     cmb = ui->cmbBaudRate;
-    e = QMetaEnum::fromType<QSerialPort::BaudRate>();
-    for (int i = 0; i < e.keyCount(); i++)
-    {
-        if (e.value(i) != QSerialPort::UnknownBaud)
-            cmb->addItem(QString::number(e.value(i)));
-    }
-    cmb->setCurrentText(QString::number(sd.baudRate));
+    Modbus::List<int32_t> baudRates = Modbus::availableBaudRate();
+    for (int32_t v : baudRates)
+        cmb->addItem(QString::number(v));
+    cmb->setCurrentText(QString::number(d.baudRate));
 
     // Data Bits
     cmb = ui->cmbDataBits;
-    e = QMetaEnum::fromType<QSerialPort::DataBits>();
-    for (int i = 0; i < e.keyCount(); i++)
-    {
-        if (e.value(i) != QSerialPort::UnknownDataBits)
-            cmb->addItem(e.key(i));
-    }
-    cmb->setCurrentText(mb::enumKeyTypeStr<QSerialPort::DataBits>(sd.dataBits));
+    Modbus::List<int8_t> dataBits = Modbus::availableDataBits();
+    for (int8_t v : dataBits)
+        cmb->addItem(QString::number(v));
+    cmb->setCurrentText(QString::number(d.dataBits));
 
     // Parity
     cmb = ui->cmbParity;
-    e = QMetaEnum::fromType<QSerialPort::Parity>();
-    for (int i = 0; i < e.keyCount(); i++)
-    {
-        if (e.value(i) != QSerialPort::UnknownParity)
-            cmb->addItem(QString(e.key(i)));
-    }
-    cmb->setCurrentText(mb::enumKeyTypeStr<QSerialPort::Parity>(sd.parity));
+    Modbus::List<Modbus::Parity> parity = Modbus::availableParity();
+    for (Modbus::Parity v : parity)
+        cmb->addItem(Modbus::toString(v));
+    cmb->setCurrentText(Modbus::toString(d.parity));
 
     // Stop Bits
     cmb = ui->cmbStopBits;
-    e = QMetaEnum::fromType<QSerialPort::StopBits>();
-    for (int i = 0; i < e.keyCount(); i++)
-    {
-        if (e.value(i) != QSerialPort::UnknownStopBits)
-            cmb->addItem(QString(e.key(i)));
-    }
-    cmb->setCurrentText(mb::enumKeyTypeStr<QSerialPort::StopBits>(sd.stopBits));
+    Modbus::List<Modbus::StopBits> stopBits = Modbus::availableStopBits();
+    for (Modbus::StopBits v : stopBits)
+        cmb->addItem(Modbus::toString(v));
+    cmb->setCurrentText(Modbus::toString(d.stopBits));
 
     // Flow Control
     cmb = ui->cmbFlowControl;
-    e = QMetaEnum::fromType<QSerialPort::FlowControl>();
-    for (int i = 0; i < e.keyCount(); i++)
-    {
-        if (e.value(i) != QSerialPort::UnknownFlowControl)
-            cmb->addItem(QString(e.key(i)));
-    }
-    cmb->setCurrentText(mb::enumKeyTypeStr<QSerialPort::FlowControl>(sd.flowControl));
+    Modbus::List<Modbus::FlowControl> flowControl = Modbus::availableFlowControl();
+    for (Modbus::FlowControl v : flowControl)
+        cmb->addItem(Modbus::toString(v));
+    cmb->setCurrentText(Modbus::toString(d.flowControl));
 
     // Timeout first byte
     sp = ui->spTimeoutFB;
     sp->setMinimum(0);
     sp->setMaximum(INT_MAX);
-    sp->setValue(sd.timeoutFirstByte); // default unit address
-
+    sp->setValue(d.timeoutFirstByte); // default slave address
     // Timeout first byte
     sp = ui->spTimeoutIB;
     sp->setMinimum(0);
     sp->setMaximum(INT_MAX);
-    sp->setValue(sd.timeoutInterByte); // default unit address
+    sp->setValue(d.timeoutInterByte); // default slave address
 
     //--------------------- TCP ---------------------
     // Host
     ln = ui->lnHost;
-    ln->setText(td.host);
+    ln->setText(d.host);
     // Port
     sp = ui->spPort;
     sp->setMinimum(0);
     sp->setMaximum(USHRT_MAX);
-    sp->setValue(td.port);
+    sp->setValue(d.port);
     // Timeout
     sp = ui->spTimeout;
     sp->setMinimum(0);
     sp->setMaximum(INT_MAX);
-    sp->setValue(td.timeout);
+    sp->setValue(d.timeout);
 
     //--------------------- ADVANCED ---------------------
     // Max Read Coils
@@ -213,31 +194,31 @@ mbClientDialogDevice::mbClientDialogDevice(QWidget *parent) :
 
     // Register Order
     cmb = ui->cmbRegisterOrder;
-    e = mb::metaEnum<mb::DataOrder>();
-    for (int i = 1 ; i < e.keyCount(); i++) // pass 'DefaultOrder' for device
-        cmb->addItem(QString(e.key(i)));
+    ls = mb::enumDataOrderKeyList();
+    for (int i = 1 ; i < ls.count(); i++) // pass 'DefaultOrder' for device
+        cmb->addItem(QString(ls.at(i)));
 
     // ByteArray format
     cmb = ui->cmbByteArrayFormat;
-    e = mb::metaEnum<mb::DigitalFormat>();
-    for (int i = 1 ; i < e.keyCount(); i++) // pass 'DefaultDigitalFormat' for device
-        cmb->addItem(QString(e.key(i)));
+    ls = mb::enumDigitalFormatKeyList();
+    for (int i = 1 ; i < ls.count(); i++) // pass 'DefaultDigitalFormat' for device
+        cmb->addItem(QString(ls.at(i)));
 
     // ByteArray separator
     ln = ui->lnByteArraySeparator;
     ln->setText(mb::makeEscapeSequnces(dDevice.byteArraySeparator));
 
     // String Length Type
     cmb = ui->cmbStringLengthType;
-    e = mb::metaEnum<mb::StringLengthType>();
-    for (int i = 1 ; i < e.keyCount(); i++) // pass 'DefaultStringLengthType' for device
-        cmb->addItem(QString(e.key(i)));
+    ls = mb::enumStringLengthTypeKeyList();
+    for (int i = 1 ; i < ls.count(); i++) // pass 'DefaultStringLengthType' for device
+        cmb->addItem(QString(ls.at(i)));
 
     // String Encoding
     cmb = ui->cmbStringEncoding;
-    e = mb::metaEnum<mb::StringEncoding>();
-    for (int i = 1 ; i < e.keyCount(); i++) // pass 'DefaultStringEncoding' for device
-        cmb->addItem(QString(e.key(i)));
+    ls = mb::enumStringEncodingKeyList();
+    for (int i = 1 ; i < ls.count(); i++) // pass 'DefaultStringEncoding' for device
+        cmb->addItem(QString(ls.at(i)));
 
     connect(ui->buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
     connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
@@ -361,8 +342,7 @@ void mbClientDialogDevice::setPortName(const QString &portName)
 void mbClientDialogDevice::fillPortForm(const MBSETTINGS &m)
 {
     mbClientPort::Strings       ms = mbClientPort::Strings();
-    Modbus::PortTCP::Strings    ts = Modbus::PortTCP::Strings::instance();
-    Modbus::PortSerial::Strings ss = Modbus::PortSerial::Strings::instance();
+    Modbus::Strings ss = Modbus::Strings::instance();
 
     QString portName = m.value(ms.name).toString();
     //ui->cmbPort->setCurrentText(portName);
@@ -378,16 +358,15 @@ void mbClientDialogDevice::fillPortForm(const MBSETTINGS &m)
     ui->spTimeoutFB->setValue(m.value(ss.timeoutFirstByte).toInt());
     ui->spTimeoutIB->setValue(m.value(ss.timeoutInterByte).toInt());
     //--------------------- TCP ---------------------
-    ui->lnHost   ->setText (m.value(ts.host   ).toString());
-    ui->spPort   ->setValue(m.value(ts.port   ).toInt());
-    ui->spTimeout->setValue(m.value(ts.timeout).toInt());
+    ui->lnHost   ->setText (m.value(ss.host   ).toString());
+    ui->spPort   ->setValue(m.value(ss.port   ).toInt());
+    ui->spTimeout->setValue(m.value(ss.timeout).toInt());
 }
 
 void mbClientDialogDevice::fillPortData(MBSETTINGS &m)
 {
     mbClientPort::Strings       ms = mbClientPort::Strings();
-    Modbus::PortTCP::Strings    ts = Modbus::PortTCP::Strings::instance();
-    Modbus::PortSerial::Strings ss = Modbus::PortSerial::Strings::instance();
+    Modbus::Strings ss = Modbus::Strings::instance();
 
     m[ms.name] = ui->lnPortName->text();
     m[ms.type] = ui->cmbPortType->currentText();
@@ -401,9 +380,9 @@ void mbClientDialogDevice::fillPortData(MBSETTINGS &m)
     m[ss.timeoutFirstByte] = ui->spTimeoutFB      ->value();
     m[ss.timeoutInterByte] = ui->spTimeoutIB      ->value();
     //--------------------- TCP ---------------------
-    m[ts.host   ] = ui->lnHost   ->text();
-    m[ts.port   ] = ui->spPort   ->value();
-    m[ts.timeout] = ui->spTimeout->value();
+    m[ss.host   ] = ui->lnHost   ->text();
+    m[ss.port   ] = ui->spPort   ->value();
+    m[ss.timeout] = ui->spTimeout->value();
 }
 
 void mbClientDialogDevice::setPort(int i)